diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-07 17:28:04 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-07 17:28:04 +0200 |
| commit | 9a64dafeba402704227aad9a02e6c0e24056f6dc (patch) | |
| tree | 55a2cc4a7d90dae16f3dab294608590097e5c84e | |
| parent | 98dc7a7657b2609fcac05134db99455a9de6610a (diff) | |
| parent | 27d483f822a5708d0ea8c36b0cf01460bf6996f5 (diff) | |
| download | network-manager-applet-9a64dafeba402704227aad9a02e6c0e24056f6dc.tar.gz | |
ui: merge branch 'lr/gtk-deprecations'
https://bugzilla.gnome.org/show_bug.cgi?id=745020
21 files changed, 1607 insertions, 1721 deletions
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c index 86554ece..3122d0ae 100644 --- a/src/applet-dialogs.c +++ b/src/applet-dialogs.c @@ -1271,7 +1271,7 @@ void applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text) { GtkBuilder *builder; - GtkWidget *spinner, *widget, *hbox, *align; + GtkWidget *spinner, *widget, *hbox, *vbox; g_return_if_fail (dialog != NULL); g_return_if_fail (text != NULL); @@ -1283,8 +1283,9 @@ applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text) g_return_if_fail (spinner != NULL); g_object_set_data (G_OBJECT (dialog), "spinner", spinner); - align = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_alignment")); - gtk_container_add (GTK_CONTAINER (align), spinner); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), spinner); + gtk_widget_set_halign (spinner, GTK_ALIGN_FILL); gtk_spinner_start (GTK_SPINNER (spinner)); widget = GTK_WIDGET (gtk_builder_get_object (builder, "progress_label")); @@ -1314,7 +1315,7 @@ void applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text) { GtkBuilder *builder; - GtkWidget *spinner, *widget, *align; + GtkWidget *spinner, *widget, *vbox; g_return_if_fail (dialog != NULL); @@ -1326,9 +1327,9 @@ applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text) gtk_spinner_stop (GTK_SPINNER (spinner)); g_object_set_data (G_OBJECT (dialog), "spinner", NULL); - /* Remove it from the alignment */ - align = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_alignment")); - gtk_container_remove (GTK_CONTAINER (align), spinner); + /* Remove it from the vbox */ + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_vbox")); + gtk_container_remove (GTK_CONTAINER (vbox), spinner); widget = GTK_WIDGET (gtk_builder_get_object (builder, "progress_label")); if (text) { diff --git a/src/connection-editor/ce-page-dcb.ui b/src/connection-editor/ce-page-dcb.ui index f259272b..d91c6db4 100644 --- a/src/connection-editor/ce-page-dcb.ui +++ b/src/connection-editor/ce-page-dcb.ui @@ -24,562 +24,556 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="dcb_box"> + <property name="valign">start</property> + <property name="margin_start">6</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="left_padding">6</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="dcb_box"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="label62"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label62"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">FCoE</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label63"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">iSCSI</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label64"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">FIP</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label65"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Flow Control</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label66"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Feature</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label67"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="label" translatable="yes">Enable</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label68"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="label" translatable="yes">Advertise</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label69"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="label" translatable="yes">Willing</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label70"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="margin_right">16</property> - <property name="label" translatable="yes">Priority</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fcoe_advertise_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fcoe_willing_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="iscsi_enable_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="iscsi_advertise_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="iscsi_willing_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fip_enable_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fip_advertise_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fip_willing_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pfc_enable_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pfc_advertise_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pfc_willing_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="fcoe_enable_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="pfc_options_button"> - <property name="label" translatable="yes">Options...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label71"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Priority Groups</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pg_enable_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pg_advertise_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="pg_willing_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="pg_options_button"> - <property name="label" translatable="yes">Options...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fcoe_priority_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">16</property> - <property name="active_id">0</property> - <items> - <item id="0" translatable="yes">default</item> - <item id="1" translatable="yes">0</item> - <item id="2" translatable="yes">1</item> - <item id="3" translatable="yes">2</item> - <item id="4" translatable="yes">3</item> - <item id="5" translatable="yes">4</item> - <item id="6" translatable="yes">5</item> - <item id="7" translatable="yes">6</item> - <item id="8" translatable="yes">7</item> - </items> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="iscsi_priority_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">16</property> - <property name="active_id">0</property> - <items> - <item id="0" translatable="yes">default</item> - <item id="1" translatable="yes">0</item> - <item id="2" translatable="yes">1</item> - <item id="3" translatable="yes">2</item> - <item id="4" translatable="yes">3</item> - <item id="5" translatable="yes">4</item> - <item id="6" translatable="yes">5</item> - <item id="7" translatable="yes">6</item> - <item id="8" translatable="yes">7</item> - </items> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fip_priority_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">16</property> - <property name="active_id">0</property> - <items> - <item id="0" translatable="yes">default</item> - <item id="1" translatable="yes">0</item> - <item id="2" translatable="yes">1</item> - <item id="3" translatable="yes">2</item> - <item id="4" translatable="yes">3</item> - <item id="5" translatable="yes">4</item> - <item id="6" translatable="yes">5</item> - <item id="7" translatable="yes">6</item> - <item id="8" translatable="yes">7</item> - </items> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fcoe_mode_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active_id">0</property> - <items> - <item id="0" translatable="yes">Fabric</item> - <item id="1" translatable="yes">VN2VN</item> - </items> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes">FCoE</property> + <property name="use_markup">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label63"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">iSCSI</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label64"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">FIP</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label65"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Flow Control</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label66"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Feature</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label67"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> + <property name="label" translatable="yes">Enable</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label68"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> + <property name="label" translatable="yes">Advertise</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="label69"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> + <property name="label" translatable="yes">Willing</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label70"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="margin_end">16</property> + <property name="label" translatable="yes">Priority</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fcoe_advertise_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fcoe_willing_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="iscsi_enable_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="iscsi_advertise_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="iscsi_willing_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fip_enable_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fip_advertise_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fip_willing_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pfc_enable_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pfc_advertise_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pfc_willing_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fcoe_enable_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="pfc_options_button"> + <property name="label" translatable="yes">Options...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label71"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Priority Groups</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pg_enable_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pg_advertise_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="pg_willing_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="pg_options_button"> + <property name="label" translatable="yes">Options...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fcoe_priority_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_end">16</property> + <property name="active_id">0</property> + <items> + <item id="0" translatable="yes">default</item> + <item id="1" translatable="yes">0</item> + <item id="2" translatable="yes">1</item> + <item id="3" translatable="yes">2</item> + <item id="4" translatable="yes">3</item> + <item id="5" translatable="yes">4</item> + <item id="6" translatable="yes">5</item> + <item id="7" translatable="yes">6</item> + <item id="8" translatable="yes">7</item> + </items> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="iscsi_priority_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_end">16</property> + <property name="active_id">0</property> + <items> + <item id="0" translatable="yes">default</item> + <item id="1" translatable="yes">0</item> + <item id="2" translatable="yes">1</item> + <item id="3" translatable="yes">2</item> + <item id="4" translatable="yes">3</item> + <item id="5" translatable="yes">4</item> + <item id="6" translatable="yes">5</item> + <item id="7" translatable="yes">6</item> + <item id="8" translatable="yes">7</item> + </items> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fip_priority_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_end">16</property> + <property name="active_id">0</property> + <items> + <item id="0" translatable="yes">default</item> + <item id="1" translatable="yes">0</item> + <item id="2" translatable="yes">1</item> + <item id="3" translatable="yes">2</item> + <item id="4" translatable="yes">3</item> + <item id="5" translatable="yes">4</item> + <item id="6" translatable="yes">5</item> + <item id="7" translatable="yes">6</item> + <item id="8" translatable="yes">7</item> + </items> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fcoe_mode_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active_id">0</property> + <items> + <item id="0" translatable="yes">Fabric</item> + <item id="1" translatable="yes">VN2VN</item> + </items> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> <packing> @@ -621,8 +615,8 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> <property name="orientation">vertical</property> @@ -1062,8 +1056,8 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox3"> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> <property name="orientation">vertical</property> @@ -2983,21 +2977,15 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enter the priority group ID for each User Priority.</property> - <property name="wrap">True</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enter the priority group ID for each User Priority.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">0</property> @@ -3007,22 +2995,16 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkLabel" id="label22"> + <property name="margin_top">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">12</property> - <child> - <object class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enter the allowed link bandwidth percent each Priority Group may use. The sum of all groups must total 100%.</property> - <property name="wrap">True</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enter the allowed link bandwidth percent each Priority Group may use. The sum of all groups must total 100%.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">0</property> @@ -3032,22 +3014,16 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkLabel" id="label23"> + <property name="margin_top">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">12</property> - <child> - <object class="GtkLabel" id="label23"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enter the percentage of priority group bandwidth each user priority may use.</property> - <property name="wrap">True</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enter the percentage of priority group bandwidth each user priority may use.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">0</property> @@ -3057,22 +3033,16 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkLabel" id="label24"> + <property name="margin_top">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">12</property> - <child> - <object class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enable or disable strict bandwidth for each user priority.</property> - <property name="wrap">True</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enable or disable strict bandwidth for each user priority.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">0</property> @@ -3082,22 +3052,16 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment6"> + <object class="GtkLabel" id="label25"> + <property name="margin_top">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">12</property> - <child> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Enter the traffic class for each user priority.</property> - <property name="wrap">True</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Enter the traffic class for each user priority.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">0</property> diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui index 327a8e98..8e2fcb48 100644 --- a/src/connection-editor/ce-page-ethernet.ui +++ b/src/connection-editor/ce-page-ethernet.ui @@ -178,10 +178,9 @@ </packing> </child> <child> - <object class="GtkAlignment" id="ethernet_device_mac_alignment"> + <object class="GtkVBox" id="ethernet_device_mac_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <child> <placeholder/> </child> diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui index f273a530..c47b10eb 100644 --- a/src/connection-editor/ce-page-general.ui +++ b/src/connection-editor/ce-page-general.ui @@ -36,7 +36,7 @@ <object class="GtkComboBox" id="dependent_vpn_combo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">26</property> + <property name="margin_start">26</property> <property name="margin_bottom">12</property> <property name="model">dependent_vpn_model</property> <child> @@ -104,7 +104,7 @@ </packing> </child> <child> - <object class="GtkAlignment" id="firewall_zone_alignment"> + <object class="GtkVBox" id="firewall_zone_vbox"> <property name="visible">True</property> <property name="can_focus">True</property> </object> diff --git a/src/connection-editor/ce-page-infiniband.ui b/src/connection-editor/ce-page-infiniband.ui index 7773eee0..4bb2fba6 100644 --- a/src/connection-editor/ce-page-infiniband.ui +++ b/src/connection-editor/ce-page-infiniband.ui @@ -43,10 +43,9 @@ </packing> </child> <child> - <object class="GtkAlignment" id="infiniband_device_mac_alignment"> + <object class="GtkVBox" id="infiniband_device_mac_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <child> <placeholder/> </child> diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui index bfe242c0..d31f154e 100644 --- a/src/connection-editor/ce-page-ip4.ui +++ b/src/connection-editor/ce-page-ip4.ui @@ -96,87 +96,33 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkVBox" id="vbox1"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTreeView" id="ip4_addresses"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="ip4_addresses"> - <property name="height_request">100</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVButtonBox" id="vbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="ip4_addr_add_button"> - <property name="label" translatable="yes">_Add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ip4_addr_delete_button"> - <property name="label" translatable="yes">_Delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -186,100 +132,39 @@ </packing> </child> <child> - <object class="GtkTable" id="table8"> + <object class="GtkVButtonBox" id="vbuttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkEntry" id="ip4_dhcp_client_id_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">The DHCP client identifier allows the network administrator to customize your computer's configuration. If you wish to use a DHCP client identifier, enter it here.</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"/> - </packing> - </child> + <property name="spacing">6</property> + <property name="layout_style">start</property> <child> - <object class="GtkEntry" id="ip4_dns_searches_entry"> + <object class="GtkButton" id="ip4_addr_add_button"> + <property name="label" translatable="yes">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Domains used when resolving host names. Use commas to separate multiple domains.</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="ip4_dhcp_client_id_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">D_HCP client ID:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ip4_dhcp_client_id_entry</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="ip4_dns_searches_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">S_earch domains:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ip4_dns_searches_entry</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="ip4_dns_servers_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">DNS ser_vers:</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">ip4_dns_servers_entry</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkEntry" id="ip4_dns_servers_entry"> + <object class="GtkButton" id="ip4_addr_delete_button"> + <property name="label" translatable="yes">_Delete</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses.</property> - <property name="invisible_char">●</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"/> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -289,80 +174,189 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkCheckButton" id="ip4_required_checkbutton"> - <property name="label" translatable="yes">Require IPv_4 addressing for this connection to complete</property> + <object class="GtkEntry" id="ip4_dhcp_client_id_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration fails but IPv6 configuration succeeds.</property> + <property name="tooltip_text" translatable="yes">The DHCP client identifier allows the network administrator to customize your computer's configuration. If you wish to use a DHCP client identifier, enter it here.</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="ip4_dns_searches_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Domains used when resolving host names. Use commas to separate multiple domains.</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="ip4_dhcp_client_id_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">D_HCP client ID:</property> <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">ip4_dhcp_client_id_entry</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="ip4_dns_searches_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">S_earch domains:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ip4_dns_searches_entry</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkLabel" id="ip4_dns_servers_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">DNS ser_vers:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ip4_dns_servers_entry</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="ip4_dns_servers_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses.</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"/> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ip4_required_checkbutton"> + <property name="label" translatable="yes">Require IPv_4 addressing for this connection to complete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration fails but IPv6 configuration succeeds.</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ip4_routes_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <child> - <object class="GtkButton" id="ip4_routes_button"> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Routes…</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">_Routes…</property> + <property name="use_underline">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">6</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="padding">6</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> </child> </object> <packing> diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui index 7cc81c5e..85ad3df4 100644 --- a/src/connection-editor/ce-page-ip6.ui +++ b/src/connection-editor/ce-page-ip6.ui @@ -113,87 +113,33 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkVBox" id="vbox1"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTreeView" id="ip6_addresses"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="ip6_addresses"> - <property name="height_request">100</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVButtonBox" id="vbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="ip6_addr_add_button"> - <property name="label" translatable="yes">_Add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ip6_addr_delete_button"> - <property name="label" translatable="yes">_Delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -203,103 +149,39 @@ </packing> </child> <child> - <object class="GtkTable" id="table8"> + <object class="GtkVButtonBox" id="vbuttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> <child> - <object class="GtkEntry" id="ip6_dns_searches_entry"> + <object class="GtkButton" id="ip6_addr_add_button"> + <property name="label" translatable="yes">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Domains used when resolving host names. Use commas to separate multiple domains.</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="ip6_dns_searches_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">S_earch domains:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ip6_dns_searches_entry</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="ip6_dns_servers_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">DNS ser_vers:</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">ip6_dns_servers_entry</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkEntry" id="ip6_dns_servers_entry"> + <object class="GtkButton" id="ip6_addr_delete_button"> + <property name="label" translatable="yes">_Delete</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses. Link-local addresses will be automatically scoped to the connecting interface.</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="ip6_privacy_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">IPv6 _privacy extensions:</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">ip6_privacy_combo</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="ip6_privacy_combo"> - <property name="visible">True</property> - <property name="model">model2</property> - <child> - <object class="GtkCellRendererText" id="renderer2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -309,80 +191,192 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkCheckButton" id="ip6_required_checkbutton"> - <property name="label" translatable="yes">Require IPv_6 addressing for this connection to complete</property> + <object class="GtkEntry" id="ip6_dns_searches_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration fails but IPv4 configuration succeeds.</property> + <property name="tooltip_text" translatable="yes">Domains used when resolving host names. Use commas to separate multiple domains.</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="ip6_dns_searches_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">S_earch domains:</property> <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="mnemonic_widget">ip6_dns_searches_entry</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkLabel" id="ip6_dns_servers_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">DNS ser_vers:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ip6_dns_servers_entry</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="ip6_dns_servers_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses. Link-local addresses will be automatically scoped to the connecting interface.</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="ip6_privacy_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">IPv6 _privacy extensions:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ip6_privacy_combo</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="ip6_privacy_combo"> + <property name="visible">True</property> + <property name="model">model2</property> <child> - <object class="GtkButton" id="ip6_routes_button"> + <object class="GtkCellRendererText" id="renderer2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ip6_required_checkbutton"> + <property name="label" translatable="yes">Require IPv_6 addressing for this connection to complete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration fails but IPv4 configuration succeeds.</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ip6_routes_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_focus">False</property> + <property name="spacing">3</property> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Routes…</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Routes…</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">6</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="padding">6</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> </child> </object> <packing> diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui index df6168b7..ae334c55 100644 --- a/src/connection-editor/ce-page-mobile.ui +++ b/src/connection-editor/ce-page-mobile.ui @@ -29,103 +29,97 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkTable" id="table1"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label28"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Nu_mber:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mobile_number</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Username:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mobile_username</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mobile_password</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="mobile_number"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="mobile_username"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="mobile_password"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"/> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Nu_mber:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mobile_number</property> </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Username:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mobile_username</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Password:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mobile_password</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="mobile_number"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="mobile_username"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="mobile_password"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"/> + </packing> </child> </object> <packing> @@ -163,150 +157,144 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkTable" id="table2"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkTable" id="table2"> + <placeholder/> + </child> + <child> + <object class="GtkLabel" id="label29"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <placeholder/> - </child> - <child> - <object class="GtkLabel" id="label29"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_APN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mobile_apn</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label30"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">N_etwork ID:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mobile_network_id</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="mobile_network_id"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkEntry" id="mobile_apn"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object 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> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">P_IN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mobile_pin</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">_APN:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mobile_apn</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">N_etwork ID:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mobile_network_id</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="mobile_network_id"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkEntry" id="mobile_pin"> + <object class="GtkEntry" id="mobile_apn"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="visibility">False</property> <property name="invisible_char">●</property> </object> <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"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="mobile_roaming_allowed"> - <property name="label" translatable="yes">Allow _roaming if home network is not available</property> + <object 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">False</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="receives_default">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label33"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">P_IN:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mobile_pin</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object 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> + </object> + <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"/> + </packing> + </child> + <child> + <object 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="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> </child> </object> <packing> diff --git a/src/connection-editor/ce-page-ppp.ui b/src/connection-editor/ce-page-ppp.ui index cd2e0147..88597962 100644 --- a/src/connection-editor/ce-page-ppp.ui +++ b/src/connection-editor/ce-page-ppp.ui @@ -28,72 +28,35 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkVBox" id="vbox4"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Allowed methods:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="auth_methods_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Allowed methods:</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkLabel" id="auth_methods_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="auth_methods_button"> - <property name="label" translatable="yes">Configure _Methods…</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="selectable">True</property> </object> <packing> <property name="expand">True</property> @@ -102,6 +65,37 @@ </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="auth_methods_button"> + <property name="label" translatable="yes">Configure _Methods…</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> @@ -139,23 +133,40 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkVBox" id="vbox6"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox6"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox7"> + <object class="GtkCheckButton" id="ppp_use_mppe"> + <property name="label" translatable="yes">_Use point-to-point encryption (MPPE)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox8"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="ppp_use_mppe"> - <property name="label" translatable="yes">_Use point-to-point encryption (MPPE)</property> + <object class="GtkCheckButton" id="ppp_require_mppe_128"> + <property name="label" translatable="yes">_Require 128-bit encryption</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -169,107 +180,78 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkCheckButton" id="ppp_use_stateful_mppe"> + <property name="label" translatable="yes">Use _stateful MPPE</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="ppp_require_mppe_128"> - <property name="label" translatable="yes">_Require 128-bit encryption</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="ppp_use_stateful_mppe"> - <property name="label" translatable="yes">Use _stateful MPPE</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="ppp_allow_bsdcomp"> - <property name="label" translatable="yes">Allow _BSD data compression</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="ppp_allow_deflate"> - <property name="label" translatable="yes">Allow _Deflate data compression</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="ppp_usevj"> - <property name="label" translatable="yes">Use TCP _header compression</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ppp_allow_bsdcomp"> + <property name="label" translatable="yes">Allow _BSD data compression</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ppp_allow_deflate"> + <property name="label" translatable="yes">Allow _Deflate data compression</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="ppp_usevj"> + <property name="label" translatable="yes">Use TCP _header compression</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> </child> </object> <packing> @@ -307,20 +289,14 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkCheckButton" id="ppp_send_echo_packets"> + <property name="margin_start">12</property> + <property name="label" translatable="yes">Send PPP _echo packets</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkCheckButton" id="ppp_send_echo_packets"> - <property name="label" translatable="yes">Send PPP _echo packets</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> diff --git a/src/connection-editor/ce-page-vlan.ui b/src/connection-editor/ce-page-vlan.ui index 27b52658..2ea15e28 100644 --- a/src/connection-editor/ce-page-vlan.ui +++ b/src/connection-editor/ce-page-vlan.ui @@ -153,7 +153,7 @@ </packing> </child> <child> - <object class="GtkAlignment" id="vlan_parent_alignment"> + <object class="GtkVBox" id="vlan_parent_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui index e2e544be..beaeb9cf 100644 --- a/src/connection-editor/ce-page-wifi.ui +++ b/src/connection-editor/ce-page-wifi.ui @@ -118,10 +118,9 @@ </packing> </child> <child> - <object class="GtkAlignment" id="wifi_device_mac_alignment"> + <object class="GtkVBox" id="wifi_device_mac_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <child> <placeholder/> </child> @@ -294,10 +293,9 @@ </packing> </child> <child> - <object class="GtkAlignment" id="wifi_bssid_alignment"> + <object class="GtkVBox" id="wifi_bssid_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> diff --git a/src/connection-editor/ce-page-wimax.ui b/src/connection-editor/ce-page-wimax.ui index 5d7468b8..bdd4682b 100644 --- a/src/connection-editor/ce-page-wimax.ui +++ b/src/connection-editor/ce-page-wimax.ui @@ -10,10 +10,9 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <object class="GtkAlignment" id="wimax_device_mac_alignment"> + <object class="GtkVBox" id="wimax_device_mac_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <child> <placeholder/> </child> diff --git a/src/connection-editor/ce-ppp-auth-methods.ui b/src/connection-editor/ce-ppp-auth-methods.ui index 21081e6c..bf5916c3 100644 --- a/src/connection-editor/ce-ppp-auth-methods.ui +++ b/src/connection-editor/ce-ppp-auth-methods.ui @@ -77,113 +77,107 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkVBox" id="vbox3"> + <property name="margin_start">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkCheckButton" id="allow_eap"> + <property name="label" translatable="yes">_EAP</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Extensible Authentication Protocol</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="allow_pap"> + <property name="label" translatable="yes">_PAP</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Password Authentication Protocol</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="allow_chap"> + <property name="label" translatable="yes">C_HAP</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Challenge Handshake Authentication Protocol</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="allow_mschap"> + <property name="label" translatable="yes">_MSCHAP</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Microsoft Challenge Handshake Authentication Protocol</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="allow_mschapv2"> + <property name="label" translatable="yes">MSCHAP v_2</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Microsoft Challenge Handshake Authentication Protocol version 2</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="allow_eap"> - <property name="label" translatable="yes">_EAP</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Extensible Authentication Protocol</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="allow_pap"> - <property name="label" translatable="yes">_PAP</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Password Authentication Protocol</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="allow_chap"> - <property name="label" translatable="yes">C_HAP</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Challenge Handshake Authentication Protocol</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="allow_mschap"> - <property name="label" translatable="yes">_MSCHAP</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Microsoft Challenge Handshake Authentication Protocol</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="allow_mschapv2"> - <property name="label" translatable="yes">MSCHAP v_2</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Microsoft Challenge Handshake Authentication Protocol version 2</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods.</property> - <property name="wrap">True</property> - <attributes> - <attribute name="style" value="italic"/> - </attributes> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods.</property> + <property name="wrap">True</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> </child> </object> <packing> diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c index dd3b2f18..e82c1b94 100644 --- a/src/connection-editor/page-ethernet.c +++ b/src/connection-editor/page-ethernet.c @@ -63,7 +63,7 @@ ethernet_private_init (CEPageEthernet *self) { CEPageEthernetPrivate *priv = CE_PAGE_ETHERNET_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -73,8 +73,9 @@ ethernet_private_init (CEPageEthernet *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "ethernet_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "ethernet_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c index e0ad4708..85b4d743 100644 --- a/src/connection-editor/page-general.c +++ b/src/connection-editor/page-general.c @@ -135,7 +135,7 @@ general_private_init (CEPageGeneral *self) { CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -143,8 +143,8 @@ general_private_init (CEPageGeneral *self) /*-- Firewall zone --*/ priv->firewall_zone = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new ()); - align = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->firewall_zone)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->firewall_zone)); gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone)); /* Get zones from FirewallD */ diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c index c2256048..7cef6b8e 100644 --- a/src/connection-editor/page-infiniband.c +++ b/src/connection-editor/page-infiniband.c @@ -49,7 +49,7 @@ infiniband_private_init (CEPageInfiniband *self) { CEPageInfinibandPrivate *priv = CE_PAGE_INFINIBAND_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -59,8 +59,9 @@ infiniband_private_init (CEPageInfiniband *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "infiniband_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "infiniband_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c index e070d60b..3a7a147d 100644 --- a/src/connection-editor/page-vlan.c +++ b/src/connection-editor/page-vlan.c @@ -63,7 +63,7 @@ vlan_private_init (CEPageVlan *self) { CEPageVlanPrivate *priv = CE_PAGE_VLAN_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -72,8 +72,8 @@ vlan_private_init (CEPageVlan *self) gtk_combo_box_set_entry_text_column (priv->parent, 0); priv->parent_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->parent))); - align = GTK_WIDGET (gtk_builder_get_object (builder, "vlan_parent_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->parent)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "vlan_parent_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->parent)); gtk_widget_show_all (GTK_WIDGET (priv->parent)); /* Set mnemonic widget for parent label */ diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c index c6d0cc4f..97a49c3f 100644 --- a/src/connection-editor/page-wifi.c +++ b/src/connection-editor/page-wifi.c @@ -59,7 +59,7 @@ wifi_private_init (CEPageWifi *self) CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); GtkBuilder *builder; GtkWidget *widget; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -78,8 +78,9 @@ wifi_private_init (CEPageWifi *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->bssid), _("This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_bssid_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->bssid)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_bssid_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->bssid)); + gtk_widget_set_halign (GTK_WIDGET (priv->bssid), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->bssid)); /* Device MAC */ @@ -88,8 +89,9 @@ wifi_private_init (CEPageWifi *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c index 757f2949..aff955f5 100644 --- a/src/connection-editor/page-wimax.c +++ b/src/connection-editor/page-wimax.c @@ -41,7 +41,7 @@ wimax_private_init (CEPageWimax *self) { CEPageWimaxPrivate *priv = CE_PAGE_WIMAX_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -53,8 +53,9 @@ wimax_private_init (CEPageWimax *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "wimax_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wimax_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/gsm-unlock.ui b/src/gsm-unlock.ui index 6f873616..0bb86b3b 100644 --- a/src/gsm-unlock.ui +++ b/src/gsm-unlock.ui @@ -63,19 +63,12 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkImage" id="image7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">GTK_ALIGN_START</property> - <child> - <object class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">GTK_ALIGN_START</property> - <property name="icon_name">dialog-password</property> - <property name="icon-size">6</property> - </object> - </child> + <property name="icon_name">dialog-password</property> + <property name="icon-size">6</property> </object> <packing> <property name="expand">False</property> @@ -119,186 +112,174 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment6"> + <object class="GtkGrid" id="grid14"> + <property name="margin">12</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> - <property name="left_padding">12</property> - <property name="right_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="grid14"> + <object class="GtkLabel" id="code1_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="code1_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label">label</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="code1_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="code2_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label">label</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="code2_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="code3_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label">label</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="code3_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_password_checkbutton"> - <property name="label">Show it</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label">label</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="code1_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="code2_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label">label</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="code2_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="code3_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label">label</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="code3_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="show_password_checkbutton"> + <property name="label">Show it</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="progress_hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="spacing">6</property> <child> - <object class="GtkHBox" id="progress_hbox"> + <object class="GtkVBox" id="spinner_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="spinner_alignment"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="progress_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="save_checkbutton"> - <property name="label" translatable="yes">Automatically unlock this device</property> + <object class="GtkLabel" id="progress_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="wrap">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="save_checkbutton"> + <property name="label" translatable="yes">Automatically unlock this device</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> <packing> diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui index 6bac3568..11b7da3e 100644 --- a/src/wireless-security/eap-method-simple.ui +++ b/src/wireless-security/eap-method-simple.ui @@ -76,47 +76,41 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkCheckButton" id="eap_password_always_ask"> + <property name="label" translatable="yes">As_k for this password every time</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="eap_password_always_ask"> - <property name="label" translatable="yes">As_k for this password every time</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_checkbutton_eapsimple"> - <property name="label" translatable="yes">Sho_w password</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="show_checkbutton_eapsimple"> + <property name="label" translatable="yes">Sho_w password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> <packing> |