[network-manager-applet] editor: add roaming control and unhide network mode preference
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] editor: add roaming control and unhide network mode preference
- Date: Wed, 17 Mar 2010 07:00:31 +0000 (UTC)
commit c585266dacd4fa548d784267600021e36cec1f95
Author: Dan Williams <dcbw redhat com>
Date: Tue Mar 16 23:59:58 2010 -0700
editor: add roaming control and unhide network mode preference
src/connection-editor/ce-page-mobile.glade | 90 ++++++++++++++--------------
src/connection-editor/page-mobile.c | 36 +++++------
2 files changed, 62 insertions(+), 64 deletions(-)
---
diff --git a/src/connection-editor/ce-page-mobile.glade b/src/connection-editor/ce-page-mobile.glade
index 386c69f..6eb3e01 100644
--- a/src/connection-editor/ce-page-mobile.glade
+++ b/src/connection-editor/ce-page-mobile.glade
@@ -8,10 +8,12 @@
<widget class="GtkVBox" id="MobilePage">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<widget class="GtkVBox" id="mobile_basic_vbox">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="mobile_basic_label">
@@ -137,6 +139,7 @@
<child>
<widget class="GtkVBox" id="mobile_advanced_vbox">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="mobile_advanced_label">
@@ -179,7 +182,7 @@
<widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">N_etwork:</property>
+ <property name="label" translatable="yes">N_etwork ID:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mobile_network_id</property>
</widget>
@@ -236,30 +239,35 @@ Prefer 2G (GPRS/EDGE)</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="band_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Band:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">mobile_band</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="mobile_band">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkEntry" id="mobile_apn">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="mobile_apn_button">
+ <property name="label" translatable="yes">Change...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_EXPAND</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -278,10 +286,20 @@ Prefer 2G (GPRS/EDGE)</property>
</packing>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkEntry" id="mobile_pin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
+ <property name="invisible_char">●</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -292,35 +310,19 @@ Prefer 2G (GPRS/EDGE)</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkCheckButton" id="mobile_roaming_allowed">
+ <property name="label" translatable="yes">Allow roaming if home network is not available</property>
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkEntry" id="mobile_apn">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="mobile_apn_button">
- <property name="label" translatable="yes">Change...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
</widget>
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index bdec3e5..f75086c 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -17,7 +17,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * (C) Copyright 2008 Red Hat, Inc.
+ * (C) Copyright 2008 - 2010 Red Hat, Inc.
*/
#include <string.h>
@@ -53,7 +53,7 @@ typedef struct {
GtkButton *apn_button;
GtkEntry *network_id;
GtkComboBox *network_type;
- GtkComboBox *band;
+ GtkToggleButton *roaming_allowed;
GtkEntry *pin;
GtkWindowGroup *window_group;
@@ -84,7 +84,7 @@ mobile_private_init (CEPageMobile *self)
priv->apn_button = GTK_BUTTON (glade_xml_get_widget (xml, "mobile_apn_button"));
priv->network_id = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_network_id"));
priv->network_type = GTK_COMBO_BOX (glade_xml_get_widget (xml, "mobile_network_type"));
- priv->band = GTK_COMBO_BOX (glade_xml_get_widget (xml, "mobile_band"));
+ priv->roaming_allowed = GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "mobile_roaming_allowed"));
priv->pin = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_pin"));
@@ -97,7 +97,6 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
CEPageMobilePrivate *priv = CE_PAGE_MOBILE_GET_PRIVATE (self);
NMSettingGsm *setting = NM_SETTING_GSM (priv->setting);
int type_idx;
- GtkWidget *widget;
const char *s;
s = nm_setting_gsm_get_number (setting);
@@ -136,16 +135,8 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
}
gtk_combo_box_set_active (priv->network_type, type_idx);
- /* Hide network type widgets; not supported yet */
- gtk_widget_hide (GTK_WIDGET (priv->network_type));
- widget = glade_xml_get_widget (CE_PAGE (self)->xml, "type_label");
- gtk_widget_hide (widget);
-
- /* Hide Band widgets; not supported yet */
- widget = glade_xml_get_widget (CE_PAGE (self)->xml, "mobile_band");
- gtk_widget_hide (widget);
- widget = glade_xml_get_widget (CE_PAGE (self)->xml, "band_label");
- gtk_widget_hide (widget);
+ gtk_toggle_button_set_active (priv->roaming_allowed,
+ !nm_setting_gsm_get_home_only (setting));
s = nm_setting_gsm_get_password (setting);
if (s)
@@ -285,6 +276,7 @@ finish_setup (CEPageMobile *self, gpointer unused, GError *error, gpointer user_
g_signal_connect (priv->network_id, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->network_type, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->pin, "changed", G_CALLBACK (stuff_changed), self);
+ g_signal_connect (priv->roaming_allowed, "toggled", G_CALLBACK (stuff_changed), self);
g_signal_connect (glade_xml_get_widget (parent->xml, "mobile_show_passwords"),
"toggled",
@@ -365,6 +357,7 @@ gsm_ui_to_setting (CEPageMobile *self)
{
CEPageMobilePrivate *priv = CE_PAGE_MOBILE_GET_PRIVATE (self);
int net_type;
+ gboolean roaming_allowed;
switch (gtk_combo_box_get_active (priv->network_type)) {
case NET_TYPE_3G:
@@ -385,14 +378,17 @@ gsm_ui_to_setting (CEPageMobile *self)
break;
}
+ roaming_allowed = gtk_toggle_button_get_active (priv->roaming_allowed);
+
g_object_set (priv->setting,
- NM_SETTING_GSM_NUMBER, nm_entry_get_text (priv->number),
- NM_SETTING_GSM_USERNAME, nm_entry_get_text (priv->username),
- NM_SETTING_GSM_PASSWORD, nm_entry_get_text (priv->password),
- NM_SETTING_GSM_APN, nm_entry_get_text (priv->apn),
- NM_SETTING_GSM_NETWORK_ID, nm_entry_get_text (priv->network_id),
+ NM_SETTING_GSM_NUMBER, nm_entry_get_text (priv->number),
+ NM_SETTING_GSM_USERNAME, nm_entry_get_text (priv->username),
+ NM_SETTING_GSM_PASSWORD, nm_entry_get_text (priv->password),
+ NM_SETTING_GSM_APN, nm_entry_get_text (priv->apn),
+ NM_SETTING_GSM_NETWORK_ID, nm_entry_get_text (priv->network_id),
NM_SETTING_GSM_NETWORK_TYPE, net_type,
- NM_SETTING_GSM_PIN, nm_entry_get_text (priv->pin),
+ NM_SETTING_GSM_PIN, nm_entry_get_text (priv->pin),
+ NM_SETTING_GSM_HOME_ONLY, !roaming_allowed,
NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
