diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-02 17:26:27 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-02 17:26:47 +0200 |
commit | dc05cfa11994f2d74b76a6dd2dd80f0428bad661 (patch) | |
tree | 49611c0b4893a53204e0318ae9894384a860e46d | |
parent | 0bc3e5a226822b82440e0691385fdce015012b02 (diff) | |
parent | 52ceadb390c29af5a5ffca2a8d0a6dbe042ab5ae (diff) | |
download | network-manager-applet-dc05cfa11994f2d74b76a6dd2dd80f0428bad661.tar.gz |
ui: merge branch 'lr/gtk-deprecations'
https://bugzilla.gnome.org/show_bug.cgi?id=745020
30 files changed, 67 insertions, 145 deletions
diff --git a/src/8021x.ui b/src/8021x.ui index 1944922e..a3954687 100644 --- a/src/8021x.ui +++ b/src/8021x.ui @@ -24,12 +24,12 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -39,13 +39,13 @@ </child> <child> <object class="GtkButton" id="ok_button"> - <property name="label">gtk-connect</property> + <property name="label">C_onnect</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -71,7 +71,7 @@ <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> + <property name="valign">GTK_ALIGN_START</property> <property name="icon_name">dialog-password</property> <property name="icon-size">6</property> </object> diff --git a/src/connection-editor/ce-ip4-routes.ui b/src/connection-editor/ce-ip4-routes.ui index 78f9cea5..b18a7cad 100644 --- a/src/connection-editor/ce-ip4-routes.ui +++ b/src/connection-editor/ce-ip4-routes.ui @@ -23,11 +23,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -37,11 +37,11 @@ </child> <child> <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <property name="label">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -81,7 +81,6 @@ <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> - <property name="rules_hint">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -102,12 +101,12 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="ip4_route_add_button"> - <property name="label">gtk-add</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -117,12 +116,12 @@ </child> <child> <object class="GtkButton" id="ip4_route_delete_button"> - <property name="label">gtk-delete</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -151,7 +150,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -169,7 +167,6 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">If enabled, this connection will never be used as the default network connection.</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-ip6-routes.ui b/src/connection-editor/ce-ip6-routes.ui index b2272414..3d5591d1 100644 --- a/src/connection-editor/ce-ip6-routes.ui +++ b/src/connection-editor/ce-ip6-routes.ui @@ -23,11 +23,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -37,11 +37,11 @@ </child> <child> <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <property name="label">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -81,7 +81,6 @@ <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> - <property name="rules_hint">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -102,12 +101,12 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="ip6_route_add_button"> - <property name="label">gtk-add</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -117,12 +116,12 @@ </child> <child> <object class="GtkButton" id="ip6_route_delete_button"> - <property name="label">gtk-delete</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -151,7 +150,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -169,7 +167,6 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">If enabled, this connection will never be used as the default network connection.</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-new-connection.ui b/src/connection-editor/ce-new-connection.ui index 3b6444be..1ce5cf3c 100644 --- a/src/connection-editor/ce-new-connection.ui +++ b/src/connection-editor/ce-new-connection.ui @@ -36,13 +36,13 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -82,8 +82,8 @@ <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="stock">gtk-dialog-question</property> + <property name="valign">GTK_ALIGN_START</property> + <property name="icon_name">dialog-question</property> <property name="icon_size">6</property> </object> <packing> diff --git a/src/connection-editor/ce-page-bond.ui b/src/connection-editor/ce-page-bond.ui index 453e03c3..22b3e562 100644 --- a/src/connection-editor/ce-page-bond.ui +++ b/src/connection-editor/ce-page-bond.ui @@ -178,11 +178,11 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="master_connection_add"> - <property name="label">gtk-add</property> + <property name="label">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> diff --git a/src/connection-editor/ce-page-bridge-port.ui b/src/connection-editor/ce-page-bridge-port.ui index c99cc018..f464ba49 100644 --- a/src/connection-editor/ce-page-bridge-port.ui +++ b/src/connection-editor/ce-page-bridge-port.ui @@ -15,7 +15,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-bridge.ui b/src/connection-editor/ce-page-bridge.ui index 7561232d..6bc23511 100644 --- a/src/connection-editor/ce-page-bridge.ui +++ b/src/connection-editor/ce-page-bridge.ui @@ -110,11 +110,11 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="master_connection_add"> - <property name="label">gtk-add</property> + <property name="label">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -327,7 +327,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-dcb.ui b/src/connection-editor/ce-page-dcb.ui index 816c29ad..a7443e4d 100644 --- a/src/connection-editor/ce-page-dcb.ui +++ b/src/connection-editor/ce-page-dcb.ui @@ -16,7 +16,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -202,7 +201,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -218,7 +216,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -234,7 +231,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -250,7 +246,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -266,7 +261,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -282,7 +276,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -298,7 +291,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -314,7 +306,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -330,7 +321,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -346,7 +336,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -362,7 +351,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -378,7 +366,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -424,7 +411,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -440,7 +426,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -456,7 +441,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">center</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -649,11 +633,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="pfc_cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -663,11 +647,11 @@ </child> <child> <object class="GtkButton" id="pfc_ok_button"> - <property name="label">gtk-ok</property> + <property name="label">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -748,7 +732,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -789,7 +772,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -830,7 +812,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -871,7 +852,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -912,7 +892,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -953,7 +932,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -994,7 +972,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1035,7 +1012,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1098,11 +1074,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="pg_cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -1112,11 +1088,11 @@ </child> <child> <object class="GtkButton" id="pg_ok_button"> - <property name="label">gtk-ok</property> + <property name="label">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -1597,7 +1573,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1639,7 +1614,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1681,7 +1655,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1723,7 +1696,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1765,7 +1737,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1807,7 +1778,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1849,7 +1819,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -1891,7 +1860,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-dsl.ui b/src/connection-editor/ce-page-dsl.ui index 2fa8675e..32e071ee 100644 --- a/src/connection-editor/ce-page-dsl.ui +++ b/src/connection-editor/ce-page-dsl.ui @@ -70,7 +70,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui index e619da85..327a8e98 100644 --- a/src/connection-editor/ce-page-ethernet.ui +++ b/src/connection-editor/ce-page-ethernet.ui @@ -135,7 +135,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -153,7 +152,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui index 5683b2fa..f273a530 100644 --- a/src/connection-editor/ce-page-general.ui +++ b/src/connection-editor/ce-page-general.ui @@ -23,7 +23,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -61,7 +60,6 @@ <property name="receives_default">False</property> <property name="margin_bottom">12</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -77,7 +75,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui index ead685e8..adfbe8fb 100644 --- a/src/connection-editor/ce-page-ip4.ui +++ b/src/connection-editor/ce-page-ip4.ui @@ -123,7 +123,6 @@ <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> - <property name="rules_hint">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -144,12 +143,12 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="ip4_addr_add_button"> - <property name="label">gtk-add</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -159,12 +158,12 @@ </child> <child> <object class="GtkButton" id="ip4_addr_delete_button"> - <property name="label">gtk-delete</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -298,7 +297,6 @@ <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="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui index b709dc8e..6fa4ba70 100644 --- a/src/connection-editor/ce-page-ip6.ui +++ b/src/connection-editor/ce-page-ip6.ui @@ -140,7 +140,6 @@ <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> - <property name="rules_hint">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -161,12 +160,12 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="ip6_addr_add_button"> - <property name="label">gtk-add</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -176,12 +175,12 @@ </child> <child> <object class="GtkButton" id="ip6_addr_delete_button"> - <property name="label">gtk-delete</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -318,7 +317,6 @@ <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="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui index f09936c9..df6168b7 100644 --- a/src/connection-editor/ce-page-mobile.ui +++ b/src/connection-editor/ce-page-mobile.ui @@ -296,7 +296,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -334,7 +333,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="image_position">top</property> <property name="draw_indicator">True</property> </object> diff --git a/src/connection-editor/ce-page-ppp.ui b/src/connection-editor/ce-page-ppp.ui index e8081320..cd2e0147 100644 --- a/src/connection-editor/ce-page-ppp.ui +++ b/src/connection-editor/ce-page-ppp.ui @@ -160,7 +160,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -186,7 +185,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -202,7 +200,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -234,7 +231,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -250,7 +246,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -266,7 +261,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -324,7 +318,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> </child> diff --git a/src/connection-editor/ce-page-team.ui b/src/connection-editor/ce-page-team.ui index a751fdb8..2aee5205 100644 --- a/src/connection-editor/ce-page-team.ui +++ b/src/connection-editor/ce-page-team.ui @@ -131,11 +131,11 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="master_connection_add"> - <property name="label">gtk-add</property> + <property name="label">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> diff --git a/src/connection-editor/ce-ppp-auth-methods.ui b/src/connection-editor/ce-ppp-auth-methods.ui index b7a47419..9f82cfbb 100644 --- a/src/connection-editor/ce-ppp-auth-methods.ui +++ b/src/connection-editor/ce-ppp-auth-methods.ui @@ -20,11 +20,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -34,11 +34,11 @@ </child> <child> <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <property name="label">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -94,7 +94,6 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Extensible Authentication Protocol</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -111,7 +110,6 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Password Authentication Protocol</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -128,7 +126,6 @@ <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="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -145,7 +142,6 @@ <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="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -162,7 +158,6 @@ <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="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui index 468f923e..539a0628 100644 --- a/src/connection-editor/nm-connection-editor.ui +++ b/src/connection-editor/nm-connection-editor.ui @@ -23,12 +23,12 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="closebutton1"> - <property name="label">gtk-close</property> + <property name="label">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -60,7 +60,6 @@ <object class="GtkTreeView" id="connection_list"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -81,12 +80,12 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="connection_add"> - <property name="label">gtk-add</property> + <property name="label">_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_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -231,11 +230,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> diff --git a/src/gsm-unlock.ui b/src/gsm-unlock.ui index 9bc55079..f88021b3 100644 --- a/src/gsm-unlock.ui +++ b/src/gsm-unlock.ui @@ -21,11 +21,11 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="unlock_cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -66,13 +66,13 @@ <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</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="yalign">0</property> - <property name="stock">gtk-dialog-authentication</property> + <property name="valign">GTK_ALIGN_START</property> + <property name="icon_name">dialog-password</property> <property name="icon-size">6</property> </object> </child> @@ -222,7 +222,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -281,7 +280,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/info.ui b/src/info.ui index 999df87f..f6828c54 100644 --- a/src/info.ui +++ b/src/info.ui @@ -22,14 +22,14 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="closebutton1"> - <property name="label">gtk-close</property> + <property name="label">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -59,8 +59,8 @@ <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="stock">gtk-dialog-info</property> + <property name="valign">GTK_ALIGN_START</property> + <property name="icon_name">dialog-information</property> <property name="icon-size">6</property> </object> <packing> diff --git a/src/libnm-gtk/wifi.ui b/src/libnm-gtk/wifi.ui index 7b96f88b..83188542 100644 --- a/src/libnm-gtk/wifi.ui +++ b/src/libnm-gtk/wifi.ui @@ -33,7 +33,7 @@ <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> + <property name="valign">GTK_ALIGN_START</property> <property name="icon_name">network-wireless</property> <property name="icon_size">6</property> </object> diff --git a/src/wireless-security/eap-method-fast.ui b/src/wireless-security/eap-method-fast.ui index f7daf950..4b19a669 100644 --- a/src/wireless-security/eap-method-fast.ui +++ b/src/wireless-security/eap-method-fast.ui @@ -157,7 +157,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/eap-method-leap.ui b/src/wireless-security/eap-method-leap.ui index aeaad92e..1d1f23dd 100644 --- a/src/wireless-security/eap-method-leap.ui +++ b/src/wireless-security/eap-method-leap.ui @@ -70,7 +70,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui index 3bb455a7..a97123a3 100644 --- a/src/wireless-security/eap-method-peap.ui +++ b/src/wireless-security/eap-method-peap.ui @@ -105,7 +105,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui index b449ba13..6bac3568 100644 --- a/src/wireless-security/eap-method-simple.ui +++ b/src/wireless-security/eap-method-simple.ui @@ -90,7 +90,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -106,7 +105,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/eap-method-tls.ui b/src/wireless-security/eap-method-tls.ui index dac5fdab..5557593a 100644 --- a/src/wireless-security/eap-method-tls.ui +++ b/src/wireless-security/eap-method-tls.ui @@ -97,7 +97,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -177,7 +176,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui index 312695da..ce00c269 100644 --- a/src/wireless-security/eap-method-ttls.ui +++ b/src/wireless-security/eap-method-ttls.ui @@ -88,7 +88,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/ws-leap.ui b/src/wireless-security/ws-leap.ui index 20fc6715..dc936ad3 100644 --- a/src/wireless-security/ws-leap.ui +++ b/src/wireless-security/ws-leap.ui @@ -70,7 +70,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/ws-wep-key.ui b/src/wireless-security/ws-wep-key.ui index 490c65d5..2726290a 100644 --- a/src/wireless-security/ws-wep-key.ui +++ b/src/wireless-security/ws-wep-key.ui @@ -95,7 +95,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0.039999999105930328</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/wireless-security/ws-wpa-psk.ui b/src/wireless-security/ws-wpa-psk.ui index 56476bc9..4ec6909c 100644 --- a/src/wireless-security/ws-wpa-psk.ui +++ b/src/wireless-security/ws-wpa-psk.ui @@ -78,7 +78,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> |