diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-02-23 13:33:24 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-07 12:16:09 +0200 |
| commit | e44f2ade36489a73ebc863ec401c66714c994462 (patch) | |
| tree | 9abdf5b3cf345dcdc691266a7d1137379aa4fed3 | |
| parent | 0a415c863109011a11f69d0fe4ae82481bdfe3b8 (diff) | |
| download | network-manager-applet-e44f2ade36489a73ebc863ec401c66714c994462.tar.gz | |
ui: drop GtkAligments where they serve no purpose
Set the appropriate margins on the child widget when the alignments are used to
space a single one.
The alignments are deprecated since 3.14.
| -rw-r--r-- | src/connection-editor/ce-page-dcb.ui | 1184 | ||||
| -rw-r--r-- | src/connection-editor/ce-page-ip4.ui | 382 | ||||
| -rw-r--r-- | src/connection-editor/ce-page-ip6.ui | 386 | ||||
| -rw-r--r-- | src/connection-editor/ce-page-mobile.ui | 416 | ||||
| -rw-r--r-- | src/connection-editor/ce-page-ppp.ui | 290 | ||||
| -rw-r--r-- | src/connection-editor/ce-ppp-auth-methods.ui | 196 | ||||
| -rw-r--r-- | src/gsm-unlock.ui | 318 | ||||
| -rw-r--r-- | src/wireless-security/eap-method-simple.ui | 66 |
8 files changed, 1562 insertions, 1676 deletions
diff --git a/src/connection-editor/ce-page-dcb.ui b/src/connection-editor/ce-page-dcb.ui index e4109576..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_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> + <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> @@ -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-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-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/gsm-unlock.ui b/src/gsm-unlock.ui index 6f873616..fbb87991 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,175 @@ </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> + <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="GtkLabel" id="code3_label"> + <object class="GtkAlignment" id="spinner_alignment"> <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="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> |