Commit 004ac2a2 authored by Bastien Nocera's avatar Bastien Nocera
Browse files

connection-editor: Change labelling style

Replace the left justified labels with right justified ones, reduce the
space between label and entry and drop the unnecessary ":". This more
closely matches the GNOME UI style, reducing the differences between
gnome-control-center's Network panel and nm-connection-editor.

https://bugzilla.gnome.org/show_bug.cgi?id=794295
parent ed741239
......@@ -7,7 +7,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkBox" id="bluetooth_device_vbox">
<property name="visible">True</property>
......@@ -29,9 +29,9 @@
<object class="GtkLabel" id="bluetooth_device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Device:</property>
<property name="label" translatable="yes">_Device</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -80,14 +80,14 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="master_connections_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Bonded _connections:</property>
<property name="label" translatable="yes">Bonded _connections</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -99,10 +99,10 @@
<object class="GtkLabel" id="bond_mode_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">M_ode:</property>
<property name="label" translatable="yes">M_ode</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_mode</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -231,10 +231,10 @@
<object class="GtkLabel" id="bond_frequency_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Monitoring _frequency:</property>
<property name="label" translatable="yes">Monitoring _frequency</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_frequency</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -283,10 +283,10 @@
<object class="GtkLabel" id="master_interface_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Interface name:</property>
<property name="label" translatable="yes">_Interface name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">master_interface</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -308,10 +308,10 @@
<object class="GtkLabel" id="bond_monitoring_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Link Monitoring:</property>
<property name="label" translatable="yes">_Link Monitoring</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_monitoring</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -339,10 +339,10 @@
<object class="GtkLabel" id="bond_arp_targets_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">ARP _targets:</property>
<property name="label" translatable="yes">ARP _targets</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_arp_targets</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -365,10 +365,10 @@
<object class="GtkLabel" id="bond_updelay_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Link _up delay:</property>
<property name="label" translatable="yes">Link _up delay</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_updelay</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -379,10 +379,10 @@
<object class="GtkLabel" id="bond_downdelay_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Link _down delay:</property>
<property name="label" translatable="yes">Link _down delay</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_downdelay</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -471,10 +471,10 @@
<object class="GtkLabel" id="bond_primary_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Primary:</property>
<property name="label" translatable="yes">_Primary</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_primary</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -497,10 +497,10 @@
<object class="GtkLabel" id="bond_mtu_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_MTU:</property>
<property name="label" translatable="yes">_MTU</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bond_mtu</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="bridge_port_hairpin_mode">
<property name="visible">True</property>
......@@ -36,9 +36,9 @@
<object class="GtkLabel" id="bridge_port_path_cost_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Path _cost:</property>
<property name="label" translatable="yes">Path _cost</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -49,9 +49,9 @@
<object class="GtkLabel" id="bridge_port_priority_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Priority:</property>
<property name="label" translatable="yes">_Priority</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -91,10 +91,10 @@
<object class="GtkLabel" id="bridge_port_hairpin_mode_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Hairpin mode:</property>
<property name="label" translatable="yes">_Hairpin mode</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_port_hairpin_mode</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -50,15 +50,15 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="master_connections_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Bridged _connections:</property>
<property name="label" translatable="yes">Bridged _connections</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -171,10 +171,10 @@
<object class="GtkLabel" id="bridge_prio">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Priority:</property>
<property name="label" translatable="yes">_Priority</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_priority</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -185,10 +185,10 @@
<object class="GtkLabel" id="master_interface_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Interface name:</property>
<property name="label" translatable="yes">_Interface name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">master_interface</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -211,10 +211,10 @@
<object class="GtkLabel" id="bridge_forward_delay_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Forward delay:</property>
<property name="label" translatable="yes">_Forward delay</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_forward_delay</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -225,10 +225,10 @@
<object class="GtkLabel" id="bridge_hello_time_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Hello time:</property>
<property name="label" translatable="yes">_Hello time</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_hello_time</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -369,10 +369,10 @@
<object class="GtkLabel" id="bridge_max_age_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Max age:</property>
<property name="label" translatable="yes">_Max age</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_max_age</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -424,10 +424,10 @@
<object class="GtkLabel" id="bridge_ageing_time_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Aging time:</property>
<property name="label" translatable="yes">_Aging time</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_ageing_time</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -479,10 +479,10 @@
<object class="GtkLabel" id="bridge_group_fwd_mask_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Group _forward mask:</property>
<property name="label" translatable="yes">Group _forward mask</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bridge_group_fwd_mask</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
This diff is collapsed.
......@@ -8,15 +8,15 @@
<property name="hexpand">True</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Username:</property>
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dsl_username</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -51,10 +51,10 @@
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Service:</property>
<property name="label" translatable="yes">_Service</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dsl_service</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -92,10 +92,10 @@
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Password:</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dsl_password</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -106,10 +106,10 @@
<object class="GtkLabel" id="dsl_interface_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">PPP _interface:</property>
<property name="label" translatable="yes">PPP _interface</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dsl_interface</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -120,10 +120,10 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">P_arent interface:</property>
<property name="label" translatable="yes">P_arent interface</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">dsl_parent</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -86,15 +86,15 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="ethernet_port_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Port:</property>
<property name="label" translatable="yes">_Port</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_port</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -123,9 +123,9 @@
<object class="GtkLabel" id="ethernet_device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Device:</property>
<property name="label" translatable="yes">_Device</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -149,10 +149,10 @@
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">C_loned MAC address:</property>
<property name="label" translatable="yes">C_loned MAC address</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_cloned_mac</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -181,10 +181,10 @@
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_MTU:</property>
<property name="label" translatable="yes">_MTU</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_mtu</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -233,9 +233,9 @@
<object class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Wake on LAN:</property>
<property name="xalign">0</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Wake on LAN</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -380,10 +380,10 @@
<object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Wake on LAN password:</property>
<property name="label" translatable="yes">_Wake on LAN password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_wol_passwd</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -406,10 +406,10 @@
<object class="GtkLabel" id="ethernet_linkneg_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Lin_k negotiation:</property>
<property name="label" translatable="yes">Lin_k negotiation</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_linkneg</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -440,10 +440,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">26</property>
<property name="label" translatable="yes">_Speed:</property>
<property name="label" translatable="yes">_Speed</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_speed</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -474,10 +474,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">26</property>
<property name="label" translatable="yes">Duple_x:</property>
<property name="label" translatable="yes">Duple_x</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ethernet_duplex</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -21,7 +21,7 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="dependent_vpn_checkbox">
<property name="label" translatable="yes">Automatically connect to _VPN when using this connection</property>
......@@ -96,10 +96,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Connection _priority for auto-activation:</property>
<property name="label" translatable="yes">Connection _priority for auto-activation</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">autoconnect_prio</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -142,9 +142,9 @@
<child>
<object class="GtkLabel" id="firewall_zone_label">
<property name="can_focus">False</property>
<property name="label" translatable="yes">Firewall _zone:</property>
<property name="label" translatable="yes">Firewall _zone</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
......
......@@ -26,14 +26,14 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="infiniband_mode_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Transport mode:</property>
<property name="label" translatable="yes">_Transport mode</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -44,9 +44,9 @@
<object class="GtkLabel" id="infiniband_device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Device:</property>
<property name="label" translatable="yes">_Device</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -126,10 +126,10 @@
<object class="GtkLabel" id="infiniband_mtu_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_MTU:</property>
<property name="label" translatable="yes">_MTU</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">infiniband_mtu</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -49,13 +49,13 @@
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Device name:</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Device name</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -77,9 +77,9 @@
<object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="halign">end</property>
<property name="hexpand">False</property>