diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-07-26 13:27:30 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-07-26 13:27:30 +0200 |
| commit | 818aef08047e14e3fb919cc6d36895816dcbd889 (patch) | |
| tree | 8160b801832ffefed9e0fa787e24698d1073b31f | |
| parent | 7e02bc089abd0b322b0ca4d5d784d9fa768f63c7 (diff) | |
| parent | 536655b8d8f40b07c0cbe145ca9ca2645e5f3257 (diff) | |
| download | network-manager-applet-818aef08047e14e3fb919cc6d36895816dcbd889.tar.gz | |
merge: branch 'lr/fixes'
https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/11
56 files changed, 544 insertions, 262 deletions
diff --git a/Makefile.am b/Makefile.am index 2019adb2..3ad1af9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -696,6 +696,8 @@ connection_editor_hc_real = \ src/connection-editor/ce-polkit-button.h \ src/connection-editor/ce-polkit.c \ src/connection-editor/ce-polkit.h \ + src/connection-editor/ce-utils.c \ + src/connection-editor/ce-utils.h \ src/connection-editor/connection-helpers.c \ src/connection-editor/connection-helpers.h diff --git a/src/8021x.ui b/src/8021x.ui index 3fcbeeb5..eda17229 100644 --- a/src/8021x.ui +++ b/src/8021x.ui @@ -4,7 +4,10 @@ <requires lib="gtk+" version="3.10"/> <object class="GtkDialog" id="8021x_dialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="title" translatable="yes">802.1X authentication</property> <property name="resizable">False</property> <property name="modal">True</property> @@ -63,10 +66,14 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="image1"> @@ -83,7 +90,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -106,15 +114,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="column_spacing">6</property> <child> <object class="GtkLabel" id="network_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Network name:</property> + <property name="label" translatable="yes">_Network name</property> <property name="use_underline">True</property> <property name="mnemonic_widget">network_name_entry</property> - <property name="xalign">0</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -135,7 +143,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="security_vbox"> + <object class="GtkBox" id="security_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/src/connection-editor/ce-ip4-routes.ui b/src/connection-editor/ce-ip4-routes.ui index 38c54f97..6cc0aa5e 100644 --- a/src/connection-editor/ce-ip4-routes.ui +++ b/src/connection-editor/ce-ip4-routes.ui @@ -6,7 +6,10 @@ <property name="width_request">450</property> <property name="height_request">250</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="icon_name">stock-peferences</property> @@ -59,13 +62,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkBox" id="vbox2"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkBox" id="hbox5"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/connection-editor/ce-ip6-routes.ui b/src/connection-editor/ce-ip6-routes.ui index f3a13902..beec17da 100644 --- a/src/connection-editor/ce-ip6-routes.ui +++ b/src/connection-editor/ce-ip6-routes.ui @@ -6,7 +6,10 @@ <property name="width_request">450</property> <property name="height_request">250</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="icon_name">stock-peferences</property> @@ -59,13 +62,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkBox" id="vbox2"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkBox" id="hbox5"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/connection-editor/ce-new-connection.ui b/src/connection-editor/ce-new-connection.ui index 80d72762..4f809a31 100644 --- a/src/connection-editor/ce-new-connection.ui +++ b/src/connection-editor/ce-new-connection.ui @@ -24,7 +24,10 @@ </object> <object class="GtkDialog" id="new_connection_type_dialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="title"> </property> <property name="resizable">False</property> <property name="modal">True</property> @@ -81,10 +84,14 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="image2"> @@ -101,7 +108,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkBox" id="vbox3"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -140,7 +148,8 @@ If you are creating a VPN, and the VPN connection you wish to create does not ap </packing> </child> <child> - <object class="GtkVBox" id="new_connection_vbox"> + <object class="GtkBox" id="new_connection_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/connection-editor/ce-page-bluetooth.ui b/src/connection-editor/ce-page-bluetooth.ui index 11ce28e0..7e441c3e 100644 --- a/src/connection-editor/ce-page-bluetooth.ui +++ b/src/connection-editor/ce-page-bluetooth.ui @@ -5,7 +5,10 @@ <object class="GtkGrid" id="BluetoothPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> diff --git a/src/connection-editor/ce-page-bond.ui b/src/connection-editor/ce-page-bond.ui index 3e24af2f..258f2cb8 100644 --- a/src/connection-editor/ce-page-bond.ui +++ b/src/connection-editor/ce-page-bond.ui @@ -78,7 +78,10 @@ <object class="GtkGrid" id="BondPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -127,7 +130,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">10</property> @@ -242,7 +246,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -390,7 +395,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bond_updelay_box"> + <object class="GtkBox" id="bond_updelay_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -429,7 +435,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bond_downdelay_box"> + <object class="GtkBox" id="bond_downdelay_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -508,7 +515,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bond_mtu_box"> + <object class="GtkBox" id="bond_mtu_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> diff --git a/src/connection-editor/ce-page-bridge-port.ui b/src/connection-editor/ce-page-bridge-port.ui index 33343a60..3466234a 100644 --- a/src/connection-editor/ce-page-bridge-port.ui +++ b/src/connection-editor/ce-page-bridge-port.ui @@ -16,7 +16,10 @@ <object class="GtkGrid" id="BridgePortPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> diff --git a/src/connection-editor/ce-page-bridge.ui b/src/connection-editor/ce-page-bridge.ui index f90e5d73..24e70b50 100644 --- a/src/connection-editor/ce-page-bridge.ui +++ b/src/connection-editor/ce-page-bridge.ui @@ -48,7 +48,10 @@ <object class="GtkGrid" id="BridgePage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -67,7 +70,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">10</property> @@ -236,7 +240,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bridge_forward_delay_box"> + <object class="GtkBox" id="bridge_forward_delay_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -277,7 +282,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bridge_hello_time_box"> + <object class="GtkBox" id="bridge_hello_time_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -341,7 +347,7 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Controls whether Spanning Tree Protocol (STP) is enabled for this bridge</property> <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -380,7 +386,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bridge_max_age_box"> + <object class="GtkBox" id="bridge_max_age_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -435,7 +442,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="bridge_ageing_time_box"> + <object class="GtkBox" id="bridge_ageing_time_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> diff --git a/src/connection-editor/ce-page-dcb.ui b/src/connection-editor/ce-page-dcb.ui index 5bfd7f85..8f6f42ca 100644 --- a/src/connection-editor/ce-page-dcb.ui +++ b/src/connection-editor/ce-page-dcb.ui @@ -5,7 +5,10 @@ <object class="GtkGrid" id="DcbPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> diff --git a/src/connection-editor/ce-page-dsl.ui b/src/connection-editor/ce-page-dsl.ui index 12ece6c7..f0db4fb7 100644 --- a/src/connection-editor/ce-page-dsl.ui +++ b/src/connection-editor/ce-page-dsl.ui @@ -6,7 +6,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui index f4d69615..9d4e7c6a 100644 --- a/src/connection-editor/ce-page-ethernet.ui +++ b/src/connection-editor/ce-page-ethernet.ui @@ -84,7 +84,10 @@ <object class="GtkGrid" id="EthernetPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -133,7 +136,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="ethernet_device_vbox"> + <object class="GtkBox" id="ethernet_device_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -192,7 +196,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -254,9 +259,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin_right">12</property> + <property name="margin_end">12</property> <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -270,9 +275,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin_right">12</property> + <property name="margin_end">12</property> <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -287,7 +292,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -302,7 +307,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -317,7 +322,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -332,7 +337,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -347,7 +352,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -362,7 +367,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -439,7 +444,7 @@ <object class="GtkLabel" id="ethernet_speed_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">26</property> + <property name="margin_start">26</property> <property name="label" translatable="yes">_Speed</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ethernet_speed</property> @@ -473,7 +478,7 @@ <object class="GtkLabel" id="ethernet_duplex_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">26</property> + <property name="margin_start">26</property> <property name="label" translatable="yes">Duple_x</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ethernet_duplex</property> diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui index bfbd26e4..75b10765 100644 --- a/src/connection-editor/ce-page-general.ui +++ b/src/connection-editor/ce-page-general.ui @@ -36,7 +36,10 @@ <object class="GtkGrid" id="GeneralPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -100,7 +103,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="firewall_zone_vbox"> + <object class="GtkBox" id="firewall_zone_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/src/connection-editor/ce-page-infiniband.ui b/src/connection-editor/ce-page-infiniband.ui index 7d65ceff..7c1eadcf 100644 --- a/src/connection-editor/ce-page-infiniband.ui +++ b/src/connection-editor/ce-page-infiniband.ui @@ -24,7 +24,10 @@ <object class="GtkGrid" id="InfinibandPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -54,7 +57,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="infiniband_device_vbox"> + <object class="GtkBox" id="infiniband_device_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -85,7 +89,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/src/connection-editor/ce-page-ip-tunnel.ui b/src/connection-editor/ce-page-ip-tunnel.ui index dc2287ce..b3019606 100644 --- a/src/connection-editor/ce-page-ip-tunnel.ui +++ b/src/connection-editor/ce-page-ip-tunnel.ui @@ -46,7 +46,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui index e1c318a8..01245ea6 100644 --- a/src/connection-editor/ce-page-ip4.ui +++ b/src/connection-editor/ce-page-ip4.ui @@ -25,13 +25,18 @@ </row> </data> </object> - <object class="GtkVBox" id="IP4Page"> + <object class="GtkBox" id="IP4Page"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="spacing">18</property> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -78,7 +83,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="ip4_addresses_box"> + <object class="GtkBox" id="ip4_addresses_box"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -98,13 +104,15 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -302,7 +310,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkBox" id="hbox4"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">3</property> diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui index ef139478..28bb0a94 100644 --- a/src/connection-editor/ce-page-ip6.ui +++ b/src/connection-editor/ce-page-ip6.ui @@ -56,13 +56,18 @@ </row> </data> </object> - <object class="GtkVBox" id="IP6Page"> + <object class="GtkBox" id="IP6Page"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="spacing">18</property> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -109,7 +114,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="ip6_addresses_box"> + <object class="GtkBox" id="ip6_addresses_box"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -129,13 +135,15 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -370,7 +378,8 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkBox" id="hbox4"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">3</property> diff --git a/src/connection-editor/ce-page-macsec.ui b/src/connection-editor/ce-page-macsec.ui index 3e87379d..9feac173 100644 --- a/src/connection-editor/ce-page-macsec.ui +++ b/src/connection-editor/ce-page-macsec.ui @@ -43,7 +43,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui index cbf75f48..a191ab03 100644 --- a/src/connection-editor/ce-page-mobile.ui +++ b/src/connection-editor/ce-page-mobile.ui @@ -2,14 +2,19 @@ <!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.10"/> - <object class="GtkVBox" id="MobilePage"> + <object class="GtkBox" id="MobilePage"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="mobile_basic_vbox"> + <object class="GtkBox" id="mobile_basic_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -125,7 +130,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="mobile_advanced_vbox"> + <object class="GtkBox" id="mobile_advanced_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -192,7 +198,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -287,7 +294,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/connection-editor/ce-page-ppp.ui b/src/connection-editor/ce-page-ppp.ui index a1ef86f4..1a481d89 100644 --- a/src/connection-editor/ce-page-ppp.ui +++ b/src/connection-editor/ce-page-ppp.ui @@ -2,13 +2,18 @@ <!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.10"/> - <object class="GtkVBox" id="PppPage"> + <object class="GtkBox" id="PppPage"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkBox" id="vbox2"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -29,13 +34,15 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox" id="vbox4"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -113,7 +120,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox" id="vbox5"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -134,13 +142,15 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox6"> + <object class="GtkBox" id="vbox6"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox7"> + <object class="GtkBox" id="vbox7"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -160,7 +170,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox8"> + <object class="GtkBox" id="vbox8"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> @@ -269,7 +280,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox9"> + <object class="GtkBox" id="vbox9"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/connection-editor/ce-page-proxy.ui b/src/connection-editor/ce-page-proxy.ui index f2a6686d..b58a7393 100644 --- a/src/connection-editor/ce-page-proxy.ui +++ b/src/connection-editor/ce-page-proxy.ui @@ -7,7 +7,10 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -34,7 +37,6 @@ <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Use this proxy configuration for only browser clients/schemes.</property> <property name="halign">start</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-team-port.ui b/src/connection-editor/ce-page-team-port.ui index d31903ab..3fc53793 100644 --- a/src/connection-editor/ce-page-team-port.ui +++ b/src/connection-editor/ce-page-team-port.ui @@ -7,7 +7,10 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">8</property> <property name="column_spacing">6</property> <child> @@ -155,8 +158,8 @@ <child internal-child="action_area"> <object class="GtkButtonBox" id="advanced_buttons"> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> <property name="layout_style">end</property> @@ -199,8 +202,8 @@ <object class="GtkNotebook" id="advanced_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> <child> @@ -208,7 +211,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -396,7 +402,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -770,7 +779,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="vexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">8</property> <property name="column_spacing">6</property> <child> diff --git a/src/connection-editor/ce-page-team.ui b/src/connection-editor/ce-page-team.ui index 21fd3d77..d46bd784 100644 --- a/src/connection-editor/ce-page-team.ui +++ b/src/connection-editor/ce-page-team.ui @@ -160,7 +160,10 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">8</property> <property name="column_spacing">6</property> <child> @@ -179,7 +182,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -323,7 +327,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="team_mtu_box"> + <object class="GtkBox" id="team_mtu_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -531,8 +536,8 @@ <child internal-child="action_area"> <object class="GtkButtonBox" id="advanced_buttons"> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> <property name="layout_style">end</property> @@ -575,8 +580,8 @@ <object class="GtkNotebook" id="advanced_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> <child> @@ -584,7 +589,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -775,7 +783,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="vexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <property name="column_homogeneous">True</property> @@ -1117,7 +1128,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -1491,7 +1505,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="vexpand">True</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">8</property> <property name="column_spacing">6</property> <child> diff --git a/src/connection-editor/ce-page-vlan.ui b/src/connection-editor/ce-page-vlan.ui index 8de06edd..c583722e 100644 --- a/src/connection-editor/ce-page-vlan.ui +++ b/src/connection-editor/ce-page-vlan.ui @@ -15,7 +15,10 @@ <object class="GtkGrid" id="VlanPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -92,7 +95,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -144,7 +148,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vlan_parent_vbox"> + <object class="GtkBox" id="vlan_parent_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -210,7 +215,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -225,7 +230,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -240,7 +245,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -255,7 +260,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> diff --git a/src/connection-editor/ce-page-wifi-security.ui b/src/connection-editor/ce-page-wifi-security.ui index 15a8c3b8..32cd0a06 100644 --- a/src/connection-editor/ce-page-wifi-security.ui +++ b/src/connection-editor/ce-page-wifi-security.ui @@ -16,7 +16,10 @@ <object class="GtkGrid" id="WifiSecurityPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -52,7 +55,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="wifi_security_vbox"> + <object class="GtkBox" id="wifi_security_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui index a6dc05a4..d12c6266 100644 --- a/src/connection-editor/ce-page-wifi.ui +++ b/src/connection-editor/ce-page-wifi.ui @@ -59,11 +59,15 @@ <object class="GtkGrid" id="WifiPage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> - <object class="GtkHBox" id="wifi_mtu_hbox"> + <object class="GtkBox" id="wifi_mtu_hbox"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -115,7 +119,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="wifi_device_vbox"> + <object class="GtkBox" id="wifi_device_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -172,7 +177,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="wifi_tx_power_hbox"> + <object class="GtkBox" id="wifi_tx_power_hbox"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -224,7 +230,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="wifi_rate_hbox"> + <object class="GtkBox" id="wifi_rate_hbox"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -276,7 +283,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="wifi_bssid_vbox"> + <object class="GtkBox" id="wifi_bssid_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/src/connection-editor/ce-ppp-auth-methods.ui b/src/connection-editor/ce-ppp-auth-methods.ui index 94906869..07c13cc7 100644 --- a/src/connection-editor/ce-ppp-auth-methods.ui +++ b/src/connection-editor/ce-ppp-auth-methods.ui @@ -4,7 +4,10 @@ <requires lib="gtk+" version="3.10"/> <object class="GtkDialog" id="auth_methods_dialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="window_position">center-on-parent</property> <property name="default_width">400</property> <property name="icon_name">stock-preferences</property> @@ -57,10 +60,14 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label3"> @@ -79,7 +86,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkBox" id="vbox3"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_start">12</property> diff --git a/src/connection-editor/ce-utils.c b/src/connection-editor/ce-utils.c new file mode 100644 index 00000000..038f2175 --- /dev/null +++ b/src/connection-editor/ce-utils.c @@ -0,0 +1,38 @@ +/* NetworkManager Applet -- allow user control over networking + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2015, 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "ce-utils.h" + +/* Change key in @event to 'Enter' key. */ +void +utils_fake_return_key (GdkEventKey *event) +{ + GdkKeymapKey *keys = NULL; + gint n_keys; + + /* Get hardware keycode for GDK_KEY_Return */ + if (gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default (), GDK_KEY_Return, &keys, &n_keys)) { + event->keyval = GDK_KEY_Return; + event->hardware_keycode = keys[0].keycode; + event->state = 0; + } + g_free (keys); +} diff --git a/src/connection-editor/ce-utils.h b/src/connection-editor/ce-utils.h new file mode 100644 index 00000000..f24f6c80 --- /dev/null +++ b/src/connection-editor/ce-utils.h @@ -0,0 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager Applet -- allow user control over networking + * + * Dan Williams <dcbw@redhat.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2007 - 2015 Red Hat, Inc. + */ + +#ifndef __CE_UTILS_H__ +#define __CE_UTILS_H__ + +void utils_fake_return_key (GdkEventKey *event); + +#endif /* __CE_UTILS_H__ */ diff --git a/src/connection-editor/ip4-routes-dialog.c b/src/connection-editor/ip4-routes-dialog.c index 4b10552e..e574f3c8 100644 --- a/src/connection-editor/ip4-routes-dialog.c +++ b/src/connection-editor/ip4-routes-dialog.c @@ -34,6 +34,7 @@ #include "ip4-routes-dialog.h" #include "utils.h" +#include "ce-utils.h" #define COL_ADDRESS 0 #define COL_PREFIX 1 diff --git a/src/connection-editor/ip6-routes-dialog.c b/src/connection-editor/ip6-routes-dialog.c index 35bb6586..270dba16 100644 --- a/src/connection-editor/ip6-routes-dialog.c +++ b/src/connection-editor/ip6-routes-dialog.c @@ -36,6 +36,7 @@ #include "ip6-routes-dialog.h" #include "utils.h" +#include "ce-utils.h" #define COL_ADDRESS 0 #define COL_PREFIX 1 diff --git a/src/connection-editor/meson.build b/src/connection-editor/meson.build index ef2657bb..8ab39a91 100644 --- a/src/connection-editor/meson.build +++ b/src/connection-editor/meson.build @@ -2,6 +2,7 @@ sources = files( 'ce-page.c', 'ce-polkit-button.c', 'ce-polkit.c', + 'ce-utils.c', 'connection-helpers.c', 'ip4-routes-dialog.c', 'ip6-routes-dialog.c', diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui index 73f7760c..1ab49963 100644 --- a/src/connection-editor/nm-connection-editor.ui +++ b/src/connection-editor/nm-connection-editor.ui @@ -9,7 +9,8 @@ <property name="icon_name">preferences-system-network</property> <property name="type_hint">dialog</property> <child> - <object class="GtkVBox" id="ce-vbox"> + <object class="GtkBox" id="ce-vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -87,13 +88,18 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkBox" id="vbox3"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkBox" id="hbox3"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -149,7 +155,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -246,7 +253,10 @@ </object> <object class="GtkDialog" id="relabel_dialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="title" translatable="yes">File Relabel</property> <property name="modal">True</property> <property name="default_width">500</property> diff --git a/src/connection-editor/nm-connection-list.ui b/src/connection-editor/nm-connection-list.ui index 24f3c31e..a4282954 100644 --- a/src/connection-editor/nm-connection-list.ui +++ b/src/connection-editor/nm-connection-list.ui @@ -42,7 +42,10 @@ <object class="GtkBox" id="connection_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="margin_start">6</property> + <property name="margin_end">6</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c index 94519ab8..a09be7a6 100644 --- a/src/connection-editor/page-ip4.c +++ b/src/connection-editor/page-ip4.c @@ -33,6 +33,7 @@ #include "page-ip4.h" #include "ip4-routes-dialog.h" #include "connection-helpers.h" +#include "ce-utils.h" G_DEFINE_TYPE (CEPageIP4, ce_page_ip4, CE_TYPE_PAGE) diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c index b12966fa..0c82b33d 100644 --- a/src/connection-editor/page-ip6.c +++ b/src/connection-editor/page-ip6.c @@ -32,6 +32,7 @@ #include "page-ip6.h" #include "ip6-routes-dialog.h" +#include "ce-utils.h" G_DEFINE_TYPE (CEPageIP6, ce_page_ip6, CE_TYPE_PAGE) diff --git a/src/gsm-unlock.ui b/src/gsm-unlock.ui index 7bd0ed27..99fe7309 100644 --- a/src/gsm-unlock.ui +++ b/src/gsm-unlock.ui @@ -4,7 +4,10 @@ <requires lib="gtk+" version="3.10"/> <object class="GtkDialog" id="unlock_dialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="window_position">center</property> <property name="default_width">400</property> <property name="icon_name">dialog-password</property> @@ -59,7 +62,8 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox7"> + <object class="GtkBox" id="hbox7"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -79,7 +83,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkBox" id="vbox3"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -202,14 +207,16 @@ </packing> </child> <child> - <object class="GtkHBox" id="progress_hbox"> + <object class="GtkBox" id="progress_hbox"> + <property name="orientation">horizontal</property> <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="GtkVBox" id="spinner_vbox"> + <object class="GtkBox" id="spinner_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/info.ui b/src/info.ui index 4deb8467..17191994 100644 --- a/src/info.ui +++ b/src/info.ui @@ -5,7 +5,10 @@ <object class="GtkDialog" id="info_dialog"> <property name="width_request">600</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="title" translatable="yes">Connection Information</property> <property name="resizable">False</property> <property name="window_position">center</property> @@ -48,14 +51,19 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox" id="vbox4"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="image6"> @@ -72,7 +80,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkBox" id="vbox2"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/libnm-gtk/wifi.ui b/src/libnm-gtk/wifi.ui index b93795b3..354617b8 100644 --- a/src/libnm-gtk/wifi.ui +++ b/src/libnm-gtk/wifi.ui @@ -24,10 +24,14 @@ </row> </data> </object> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">5</property> + <property name="margin_end">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="image1"> @@ -44,7 +48,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -70,7 +75,8 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkVBox" id="security_vbox"> + <object class="GtkBox" id="security_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/src/libnma/nma-cert-chooser.c b/src/libnma/nma-cert-chooser.c index 53d35f32..a20cd8fc 100644 --- a/src/libnma/nma-cert-chooser.c +++ b/src/libnma/nma-cert-chooser.c @@ -218,6 +218,7 @@ nma_cert_chooser_set_cert_password (NMACertChooser *cert_chooser, const gchar *p const NMACertChooserVtable *vtable; g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser)); + g_return_if_fail (password); vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser); if (vtable->set_cert_password) @@ -346,6 +347,7 @@ void nma_cert_chooser_set_key_password (NMACertChooser *cert_chooser, const gchar *password) { g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser)); + g_return_if_fail (password); NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->set_key_password (cert_chooser, password); } diff --git a/src/libnma/nma-file-cert-chooser.c b/src/libnma/nma-file-cert-chooser.c index 9f85717c..e263bb9a 100644 --- a/src/libnma/nma-file-cert-chooser.c +++ b/src/libnma/nma-file-cert-chooser.c @@ -247,11 +247,11 @@ set_title (NMACertChooser *cert_chooser, const gchar *title) gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (priv->key_button), text); g_free (text); - text = g_strdup_printf (_("%s private _key:"), title); + text = g_strdup_printf (_("%s private _key"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_button_label), text); g_free (text); - text = g_strdup_printf (_("%s key _password:"), title); + text = g_strdup_printf (_("%s key _password"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_password_label), text); g_free (text); @@ -259,7 +259,7 @@ set_title (NMACertChooser *cert_chooser, const gchar *title) gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (priv->cert_button), text); g_free (text); - text = g_strdup_printf (_("%s _certificate:"), title); + text = g_strdup_printf (_("%s _certificate"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_button_label), text); g_free (text); } @@ -293,7 +293,7 @@ init (NMACertChooser *cert_chooser) gtk_grid_insert_column (GTK_GRID (cert_chooser), 2); gtk_grid_set_row_spacing (GTK_GRID (cert_chooser), 6); - gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 12); + gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 6); /* The key chooser */ gtk_grid_insert_row (GTK_GRID (cert_chooser), 0); @@ -307,18 +307,16 @@ init (NMACertChooser *cert_chooser) gtk_widget_set_hexpand (priv->key_button, TRUE); gtk_widget_set_sensitive (priv->key_button, FALSE); gtk_widget_show (priv->key_button); - gtk_widget_set_no_show_all (priv->key_button, TRUE); g_signal_connect (priv->key_button, "selection-changed", G_CALLBACK (key_changed_cb), cert_chooser); priv->key_button_label = gtk_label_new (NULL); - g_object_set (priv->key_button_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->key_button_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_button_label), priv->key_button); gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1); gtk_widget_set_sensitive (priv->key_button_label, FALSE); gtk_widget_show (priv->key_button_label); - gtk_widget_set_no_show_all (priv->key_button_label, TRUE); /* The key password entry */ gtk_grid_insert_row (GTK_GRID (cert_chooser), 1); @@ -329,25 +327,22 @@ init (NMACertChooser *cert_chooser) gtk_widget_set_hexpand (priv->key_password, TRUE); gtk_widget_set_sensitive (priv->key_password, FALSE); gtk_widget_show (priv->key_password); - gtk_widget_set_no_show_all (priv->key_password, TRUE); g_signal_connect (priv->key_password, "changed", G_CALLBACK (key_password_changed_cb), cert_chooser); priv->key_password_label = gtk_label_new (NULL); - g_object_set (priv->key_password_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->key_password_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_password_label), priv->key_password); gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1); gtk_widget_set_sensitive (priv->key_password_label, FALSE); gtk_widget_show (priv->key_password_label); - gtk_widget_set_no_show_all (priv->key_password_label, TRUE); /* Show password */ gtk_grid_insert_row (GTK_GRID (cert_chooser), 2); priv->show_password = gtk_check_button_new_with_mnemonic ("Sho_w password"); gtk_grid_attach (GTK_GRID (cert_chooser), priv->show_password, 1, 2, 1, 1); gtk_widget_show (priv->show_password); - gtk_widget_set_no_show_all (priv->show_password, TRUE); g_signal_connect (priv->show_password, "toggled", G_CALLBACK (show_toggled_cb), cert_chooser); @@ -363,7 +358,6 @@ init (NMACertChooser *cert_chooser) gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button, 1, 0, 1, 1); gtk_widget_set_hexpand (priv->cert_button, TRUE); gtk_widget_show (priv->cert_button); - gtk_widget_set_no_show_all (priv->cert_button, TRUE); /* For some reason, GTK+ calls set_current_filter (..., NULL) from * gtkfilechooserdefault.c::show_and_select_files_finished_loading() on our @@ -377,11 +371,10 @@ init (NMACertChooser *cert_chooser) G_CALLBACK (cert_changed_cb), cert_chooser); priv->cert_button_label = gtk_label_new (NULL); - g_object_set (priv->cert_button_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->cert_button_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button); gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1); gtk_widget_show (priv->cert_button_label); - gtk_widget_set_no_show_all (priv->cert_button_label, TRUE); } const NMACertChooserVtable nma_cert_chooser_vtable_file = { diff --git a/src/libnma/nma-mobile-wizard.ui b/src/libnma/nma-mobile-wizard.ui index c7be404f..b3bd224c 100644 --- a/src/libnma/nma-mobile-wizard.ui +++ b/src/libnma/nma-mobile-wizard.ui @@ -59,7 +59,10 @@ <object class="GtkBox" id="intro_page"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -95,7 +98,7 @@ <object class="GtkLabel" id="provider_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="label" translatable="yes">Your broadband provider’s name</property> <property name="xalign">0</property> </object> @@ -109,7 +112,7 @@ <object class="GtkLabel" id="plan_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="label" translatable="yes">Your broadband billing plan name</property> <property name="xalign">0</property> </object> @@ -123,7 +126,7 @@ <object class="GtkLabel" id="apn_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="label" translatable="yes">(in some cases) Your broadband billing plan APN (Access Point Name)</property> <property name="xalign">0</property> </object> @@ -142,7 +145,6 @@ <property name="label" translatable="yes">Create a connection for _this mobile broadband device:</property> <property name="use_underline">True</property> <property name="xalign">0</property> - <property name="yalign">1</property> </object> <packing> <property name="expand">False</property> @@ -176,7 +178,10 @@ <object class="GtkBox" id="country_page"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -229,7 +234,10 @@ <object class="GtkBox" id="providers_page"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -254,7 +262,7 @@ <property name="height_request">140</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> @@ -296,7 +304,7 @@ <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="row_spacing">12</property> <property name="column_spacing">12</property> <child> @@ -358,7 +366,10 @@ <object class="GtkBox" id="plan_page"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -427,7 +438,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> + <property name="valign">start</property> <property name="icon_name">dialog-warning</property> <property name="icon_size">6</property> </object> @@ -470,7 +481,10 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</ <object class="GtkBox" id="confirm_page"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -505,7 +519,7 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</ <object class="GtkLabel" id="confirm_device"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="xalign">0</property> </object> <packing> @@ -531,7 +545,7 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</ <object class="GtkLabel" id="confirm_provider"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="xalign">0</property> </object> <packing> @@ -558,11 +572,12 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkLabel" id="confirm_plan"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> + <property name="margin_start">25</property> <property name="xalign">0</property> </object> <packing> @@ -575,8 +590,7 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</ <object class="GtkLabel" id="confirm_apn"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">25</property> - <property name="ypad">6</property> + <property name="margin_start">25</property> <property name="xalign">0</property> </object> <packing> @@ -594,9 +608,9 @@ If you are unsure of your plan please ask your provider for your plan’s APN.</ </child> <child> <object class="GtkLabel" id="confirm_connect_after_label"> + <property name="visible">False</property> <property name="width_request">500</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="valign">end</property> <property name="vexpand">True</property> <property name="label" translatable="yes">A connection will now be made to your mobile broadband provider using the settings you selected. If the connection fails or you cannot access network resources, double-check your settings. To modify your mobile broadband connection settings, choose “Network Connections” from the System → Preferences menu.</property> diff --git a/src/libnma/nma-pkcs11-cert-chooser.c b/src/libnma/nma-pkcs11-cert-chooser.c index 1c033e93..80b02b34 100644 --- a/src/libnma/nma-pkcs11-cert-chooser.c +++ b/src/libnma/nma-pkcs11-cert-chooser.c @@ -371,11 +371,11 @@ set_title (NMACertChooser *cert_chooser, const gchar *title) nma_cert_chooser_button_set_title (NMA_CERT_CHOOSER_BUTTON (priv->key_button), text); g_free (text); - text = g_strdup_printf (_("%s private _key:"), title); + text = g_strdup_printf (_("%s private _key"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_button_label), text); g_free (text); - text = g_strdup_printf (_("%s key _password:"), title); + text = g_strdup_printf (_("%s key _password"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_password_label), text); g_free (text); @@ -383,11 +383,11 @@ set_title (NMACertChooser *cert_chooser, const gchar *title) nma_cert_chooser_button_set_title (NMA_CERT_CHOOSER_BUTTON (priv->cert_button), text); g_free (text); - text = g_strdup_printf (_("%s _certificate:"), title); + text = g_strdup_printf (_("%s _certificate"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_button_label), text); g_free (text); - text = g_strdup_printf (_("%s certificate _password:"), title); + text = g_strdup_printf (_("%s certificate _password"), title); gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_password_label), text); g_free (text); } @@ -420,7 +420,7 @@ init (NMACertChooser *cert_chooser) gtk_grid_insert_column (GTK_GRID (cert_chooser), 2); gtk_grid_set_row_spacing (GTK_GRID (cert_chooser), 6); - gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 12); + gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 6); /* Show password */ gtk_grid_insert_row (GTK_GRID (cert_chooser), 0); @@ -446,7 +446,7 @@ init (NMACertChooser *cert_chooser) G_CALLBACK (key_changed_cb), cert_chooser); priv->key_button_label = gtk_label_new (NULL); - g_object_set (priv->key_button_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->key_button_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_button_label), priv->key_button); gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1); gtk_widget_set_sensitive (priv->key_button_label, FALSE); @@ -468,7 +468,7 @@ init (NMACertChooser *cert_chooser) G_CALLBACK (key_password_changed_cb), cert_chooser); priv->key_password_label = gtk_label_new (NULL); - g_object_set (priv->key_password_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->key_password_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_password_label), priv->key_password); gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1); gtk_widget_set_sensitive (priv->key_password_label, FALSE); @@ -489,7 +489,7 @@ init (NMACertChooser *cert_chooser) G_CALLBACK (cert_changed_cb), cert_chooser); priv->cert_button_label = gtk_label_new (NULL); - g_object_set (priv->cert_button_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->cert_button_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button); gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1); gtk_widget_show (priv->cert_button_label); @@ -510,7 +510,7 @@ init (NMACertChooser *cert_chooser) G_CALLBACK (cert_password_changed_cb), cert_chooser); priv->cert_password_label = gtk_label_new (NULL); - g_object_set (priv->cert_password_label, "xalign", (gfloat) 0, NULL); + g_object_set (priv->cert_password_label, "xalign", (gfloat) 1, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_password_label), priv->cert_password); gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_password_label, 0, 1, 1, 1); gtk_widget_set_sensitive (priv->cert_password_label, FALSE); diff --git a/src/libnma/nma-pkcs11-token-login-dialog.ui b/src/libnma/nma-pkcs11-token-login-dialog.ui index 98dc542f..ef996f6d 100644 --- a/src/libnma/nma-pkcs11-token-login-dialog.ui +++ b/src/libnma/nma-pkcs11-token-login-dialog.ui @@ -56,8 +56,8 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> <property name="margin_top">12</property> <property name="margin_bottom">12</property> <property name="orientation">vertical</property> diff --git a/src/libnma/nma-vpn-password-dialog.ui b/src/libnma/nma-vpn-password-dialog.ui index 9b63dcc5..ebed49c8 100644 --- a/src/libnma/nma-vpn-password-dialog.ui +++ b/src/libnma/nma-vpn-password-dialog.ui @@ -62,8 +62,8 @@ <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> <property name="margin_top">12</property> <property name="margin_bottom">12</property> <property name="row_spacing">6</property> @@ -75,7 +75,7 @@ <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="halign">start</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="show_passwords_toggled_cb" swapped="no"/> </object> @@ -86,8 +86,8 @@ </child> <child> <object class="GtkEntry" id="password_entry_tertiary"> + <property name="visible">False</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> <property name="visibility">False</property> <property name="width_chars">20</property> <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/> @@ -99,9 +99,8 @@ </child> <child> <object class="GtkEntry" id="password_entry_secondary"> - <property name="visible">True</property> + <property name="visible">False</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> <property name="visibility">False</property> <property name="width_chars">20</property> <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/> @@ -113,9 +112,8 @@ </child> <child> <object class="GtkEntry" id="password_entry"> - <property name="visible">True</property> + <property name="visible">False</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> <property name="visibility">False</property> <property name="width_chars">20</property> <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/> @@ -127,8 +125,8 @@ </child> <child> <object class="GtkLabel" id="password_label_tertiary"> + <property name="visible">False</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="label" translatable="yes">_Tertiary Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password_entry_tertiary</property> @@ -141,9 +139,8 @@ </child> <child> <object class="GtkLabel" id="password_label_secondary"> - <property name="visible">True</property> + <property name="visible">False</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="label" translatable="yes">_Secondary Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password_entry_secondary</property> @@ -156,9 +153,8 @@ </child> <child> <object class="GtkLabel" id="password_label"> - <property name="visible">True</property> + <property name="visible">False</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password_entry</property> @@ -171,8 +167,8 @@ </child> <child> <object class="GtkLabel" id="message_label"> + <property name="visible">False</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="halign">start</property> <property name="margin_bottom">12</property> <property name="hexpand">True</property> @@ -189,11 +185,11 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">12</property> + <property name="margin_start">6</property> + <property name="margin_end">12</property> <property name="margin_top">6</property> <property name="margin_bottom">6</property> - <property name="yalign">0</property> + <property name="valign">start</property> <property name="icon_name">dialog-password</property> <property name="icon_size">6</property> </object> diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c index 50d8363f..3ac5fd68 100644 --- a/src/libnma/nma-wifi-dialog.c +++ b/src/libnma/nma-wifi-dialog.c @@ -432,11 +432,8 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection) GtkCellRenderer *renderer; const char *id; - g_return_val_if_fail (priv->connection == NULL, FALSE); - - /* Clear any old model */ - if (priv->connection_model) - g_object_unref (priv->connection_model); + g_clear_object (&priv->connection_model); + g_clear_object (&priv->connection); /* New model */ store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); @@ -1047,7 +1044,6 @@ internal_init (NMAWifiDialog *self, gboolean security_combo_focus = FALSE; gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER_ALWAYS); - gtk_container_set_border_width (GTK_CONTAINER (self), 6); gtk_window_set_default_size (GTK_WINDOW (self), 488, -1); gtk_window_set_resizable (GTK_WINDOW (self), FALSE); @@ -1149,9 +1145,9 @@ internal_init (NMAWifiDialog *self, tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network “%s”."), esc_ssid ? esc_ssid : "<unknown>"); gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required")); - label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s", - _("Authentication required by Wi-Fi network"), - tmp); + label = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s", + _("Authentication required by Wi-Fi network"), + tmp); g_free (esc_ssid); g_free (tmp); } else if (priv->operation == OP_CREATE_ADHOC) { diff --git a/src/libnma/wifi.ui b/src/libnma/wifi.ui index 4b5c4c9a..d0ac63a3 100644 --- a/src/libnma/wifi.ui +++ b/src/libnma/wifi.ui @@ -24,16 +24,20 @@ </row> </data> </object> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="yalign">0</property> + <property name="valign">start</property> <property name="icon_name">network-wireless</property> <property name="icon_size">6</property> </object> @@ -44,7 +48,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -68,9 +73,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="column_spacing">6</property> <child> - <object class="GtkVBox" id="security_vbox"> + <object class="GtkBox" id="security_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -88,10 +94,10 @@ <object class="GtkLabel" id="security_combo_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Wi-Fi _security:</property> + <property name="label" translatable="yes">Wi-Fi _security</property> <property name="use_underline">True</property> <property name="mnemonic_widget">security_combo</property> - <property name="xalign">0</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -120,10 +126,10 @@ <object class="GtkLabel" id="network_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Network name:</property> + <property name="label" translatable="yes">_Network name</property> <property name="use_underline">True</property> <property name="mnemonic_widget">network_name_entry</property> - <property name="xalign">0</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -145,10 +151,10 @@ <object class="GtkLabel" id="connection_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">C_onnection:</property> + <property name="label" translatable="yes">C_onnection</property> <property name="use_underline">True</property> <property name="mnemonic_widget">connection_combo</property> - <property name="xalign">0</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -170,10 +176,10 @@ <object class="GtkLabel" id="device_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Wi-Fi _adapter:</property> + <property name="label" translatable="yes">Wi-Fi _adapter</property> <property name="use_underline">True</property> <property name="mnemonic_widget">device_combo</property> - <property name="xalign">0</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> diff --git a/src/utils/utils.c b/src/utils/utils.c index c355be3b..694c521a 100644 --- a/src/utils/utils.c +++ b/src/utils/utils.c @@ -216,7 +216,7 @@ utils_show_error_dialog (const char *title, g_signal_connect (err_dialog, "delete-event", G_CALLBACK (gtk_widget_destroy), NULL); g_signal_connect (err_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); - gtk_widget_show_all (err_dialog); + gtk_widget_show (err_dialog); gtk_window_present (GTK_WINDOW (err_dialog)); } } @@ -361,22 +361,6 @@ utils_set_cell_background (GtkCellRenderer *cell, g_object_set (G_OBJECT (cell), "cell-background-set", FALSE, NULL); } -/* Change key in @event to 'Enter' key. */ -void -utils_fake_return_key (GdkEventKey *event) -{ - GdkKeymapKey *keys = NULL; - gint n_keys; - - /* Get hardware keycode for GDK_KEY_Return */ - if (gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default (), GDK_KEY_Return, &keys, &n_keys)) { - event->keyval = GDK_KEY_Return; - event->hardware_keycode = keys[0].keycode; - event->state = 0; - } - g_free (keys); -} - void widget_set_error (GtkWidget *widget) { diff --git a/src/utils/utils.h b/src/utils/utils.h index ccc653f8..4425789a 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -79,8 +79,6 @@ void utils_set_cell_background (GtkCellRenderer *cell, const char *color, const char *value); -void utils_fake_return_key (GdkEventKey *event); - void widget_set_error (GtkWidget *widget); void widget_unset_error (GtkWidget *widget); diff --git a/src/wireless-security/eap-method-fast.ui b/src/wireless-security/eap-method-fast.ui index c862f57e..67cad4fb 100644 --- a/src/wireless-security/eap-method-fast.ui +++ b/src/wireless-security/eap-method-fast.ui @@ -92,7 +92,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="eap_fast_inner_auth_vbox"> + <object class="GtkBox" id="eap_fast_inner_auth_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui index a75669bd..7baea54f 100644 --- a/src/wireless-security/eap-method-peap.ui +++ b/src/wireless-security/eap-method-peap.ui @@ -145,7 +145,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="eap_peap_inner_auth_vbox"> + <object class="GtkBox" id="eap_peap_inner_auth_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui index eae8cf3e..79afeb70 100644 --- a/src/wireless-security/eap-method-simple.ui +++ b/src/wireless-security/eap-method-simple.ui @@ -68,7 +68,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox" id="vbox5"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui index 6ea1709c..e4474af2 100644 --- a/src/wireless-security/eap-method-ttls.ui +++ b/src/wireless-security/eap-method-ttls.ui @@ -37,7 +37,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="eap_ttls_inner_auth_vbox"> + <object class="GtkBox" id="eap_ttls_inner_auth_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c index 0b11443d..2e9daa23 100644 --- a/src/wireless-security/eap-method.c +++ b/src/wireless-security/eap-method.c @@ -391,6 +391,7 @@ eap_method_setup_cert_chooser (NMACertChooser *cert_chooser, { NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_UNKNOWN; const char *value = NULL; + const char *password = NULL; if (s_8021x && cert_path_func && cert_uri_func && cert_scheme_func) { @@ -403,8 +404,9 @@ eap_method_setup_cert_chooser (NMACertChooser *cert_chooser, /* Not available in libnm-glib */ case NM_SETTING_802_1X_CK_SCHEME_PKCS11: value = cert_uri_func (s_8021x); - if (cert_password_func) - nma_cert_chooser_set_cert_password (cert_chooser, cert_password_func (s_8021x)); + password = cert_password_func ? cert_password_func (s_8021x) : NULL; + if (password) + nma_cert_chooser_set_cert_password (cert_chooser, password); break; #endif case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: @@ -439,6 +441,7 @@ eap_method_setup_cert_chooser (NMACertChooser *cert_chooser, nma_cert_chooser_set_key (cert_chooser, value, scheme); } - if (s_8021x && key_password_func) + password = s_8021x && key_password_func ? key_password_func (s_8021x) : NULL; + if (password) nma_cert_chooser_set_key_password (cert_chooser, key_password_func (s_8021x)); } diff --git a/src/wireless-security/ws-dynamic-wep.ui b/src/wireless-security/ws-dynamic-wep.ui index 5f9bdc1b..cdc2a5c1 100644 --- a/src/wireless-security/ws-dynamic-wep.ui +++ b/src/wireless-security/ws-dynamic-wep.ui @@ -57,7 +57,8 @@ </packing> </child> <child> - <object class="GtkVBox" id="dynamic_wep_method_vbox"> + <object class="GtkBox" id="dynamic_wep_method_vbox"> + <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> diff --git a/src/wireless-security/ws-wpa-eap.ui b/src/wireless-security/ws-wpa-eap.ui index c91a1d3f..80c0109d 100644 --- a/src/wireless-security/ws-wpa-eap.ui +++ b/src/wireless-security/ws-wpa-eap.ui @@ -57,10 +57,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="wpa_eap_method_vbox"> + <object class="GtkBox" id="wpa_eap_method_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="orientation">vertical</property> <child> <placeholder/> </child> |