GNOME.org
 

[gnome-control-center/wip/benzea/wifi-panel-with-editor-changes: 5/19] wireless-security: Make field name labels dim

commit 13020b60cda3b849ce2e0238742506d0c57c76e3
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Dec 4 12:42:09 2018 +0100

    wireless-security: Make field name labels dim

 .../network/connection-editor/8021x-security-page.ui   |  9 +++++++++
 panels/network/connection-editor/ce-page-vpn.c         |  6 ++++++
 panels/network/connection-editor/ethernet-page.ui      | 18 ++++++++++++++++++
 panels/network/connection-editor/security-page.ui      |  9 +++++++++
 panels/network/connection-editor/vpn-page.ui           |  3 +++
 panels/network/connection-editor/wifi-page.ui          | 12 ++++++++++++
 panels/network/wireless-security/eap-method-fast.ui    | 12 ++++++++++++
 panels/network/wireless-security/eap-method-leap.ui    |  6 ++++++
 panels/network/wireless-security/eap-method-peap.ui    | 12 ++++++++++++
 panels/network/wireless-security/eap-method-simple.ui  |  6 ++++++
 panels/network/wireless-security/eap-method-tls.ui     | 15 +++++++++++++++
 panels/network/wireless-security/eap-method-ttls.ui    |  9 +++++++++
 panels/network/wireless-security/ws-dynamic-wep.ui     |  3 +++
 panels/network/wireless-security/ws-leap.ui            |  6 ++++++
 panels/network/wireless-security/ws-wep-key.ui         |  9 +++++++++
 panels/network/wireless-security/ws-wpa-eap.ui         |  3 +++
 panels/network/wireless-security/ws-wpa-psk.ui         |  6 ++++++
 17 files changed, 144 insertions(+)
---
diff --git a/panels/network/connection-editor/8021x-security-page.ui 
b/panels/network/connection-editor/8021x-security-page.ui
index 5111dfb9c..bfabda937 100644
--- a/panels/network/connection-editor/8021x-security-page.ui
+++ b/panels/network/connection-editor/8021x-security-page.ui
@@ -26,6 +26,9 @@
             <property name="label" translatable="yes">802.1x _Security</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">8021x_switch</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -223,6 +226,9 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -237,6 +243,9 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Inner _authentication</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c
index dd6d42f4b..0cbe33b0b 100644
--- a/panels/network/connection-editor/ce-page-vpn.c
+++ b/panels/network/connection-editor/ce-page-vpn.c
@@ -53,12 +53,17 @@ vpn_gnome3ify_editor (GtkWidget *widget)
                         vpn_gnome3ify_editor (iter->data);
                 g_list_free (children);
         } else if (GTK_IS_LABEL (widget)) {
+                GtkStyleContext *style;
                 const char *text;
                 gfloat xalign;
                 char *newtext;
                 int len;
 
+                style = gtk_widget_get_style_context (widget);
                 xalign = gtk_label_get_xalign (GTK_LABEL (widget));
+                /* If the label is aligned at the end, it's likely a field name. */
+                if (xalign == 1.0)
+                        gtk_style_context_add_class (style, "dim-label");
                 if (xalign != 0.0)
                         return;
                 text = gtk_label_get_text (GTK_LABEL (widget));
@@ -66,6 +71,7 @@ vpn_gnome3ify_editor (GtkWidget *widget)
                 if (len < 2 || text[len - 1] != ':')
                         return;
 
+                gtk_style_context_add_class (style, "dim-label");
                 newtext = g_strndup (text, len - 1);
                 gtk_label_set_text (GTK_LABEL (widget), newtext);
                 g_free (newtext);
diff --git a/panels/network/connection-editor/ethernet-page.ui 
b/panels/network/connection-editor/ethernet-page.ui
index eb1bfb06a..63c2d775b 100644
--- a/panels/network/connection-editor/ethernet-page.ui
+++ b/panels/network/connection-editor/ethernet-page.ui
@@ -71,6 +71,9 @@
         <property name="label" translatable="yes">_Name</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">entry_name</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -100,6 +103,9 @@
         <property name="label" translatable="yes">_MAC Address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">combo_mac</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -146,6 +152,9 @@
         <property name="label" translatable="yes">M_TU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">spin_mtu</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -163,6 +172,9 @@
         <property name="label" translatable="yes">_Cloned Address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">entry_cloned_mac</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -176,6 +188,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">bytes</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">2</property>
@@ -203,6 +218,9 @@
       <object class="GtkLabel" id="filler">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">2</property>
diff --git a/panels/network/connection-editor/security-page.ui 
b/panels/network/connection-editor/security-page.ui
index 0c3dd923d..6ab6364d7 100644
--- a/panels/network/connection-editor/security-page.ui
+++ b/panels/network/connection-editor/security-page.ui
@@ -26,6 +26,9 @@
             <property name="label" translatable="yes">S_ecurity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">combo_sec</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -222,6 +225,9 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -236,6 +242,9 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Inner _authentication</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
index 589b199e1..1d8118f69 100644
--- a/panels/network/connection-editor/vpn-page.ui
+++ b/panels/network/connection-editor/vpn-page.ui
@@ -23,6 +23,9 @@
             <property name="label" translatable="yes">_Name</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_name</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/panels/network/connection-editor/wifi-page.ui b/panels/network/connection-editor/wifi-page.ui
index eedab9230..344ee21dc 100644
--- a/panels/network/connection-editor/wifi-page.ui
+++ b/panels/network/connection-editor/wifi-page.ui
@@ -20,6 +20,9 @@
         <property name="label" translatable="yes">_SSID</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">entry_ssid</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -36,6 +39,9 @@
         <property name="label" translatable="yes">_BSSID</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">combo_bssid</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -67,6 +73,9 @@
         <property name="label" translatable="yes">_MAC Address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">combo_mac</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -97,6 +106,9 @@
         <property name="label" translatable="yes">_Cloned Address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">entry_cloned_mac</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/panels/network/wireless-security/eap-method-fast.ui 
b/panels/network/wireless-security/eap-method-fast.ui
index 290834800..0c2a05367 100644
--- a/panels/network/wireless-security/eap-method-fast.ui
+++ b/panels/network/wireless-security/eap-method-fast.ui
@@ -50,6 +50,9 @@
             <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_fast_anon_identity_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -76,6 +79,9 @@
             <property name="label" translatable="yes">PAC _file</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_fast_pac_file_button</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -122,6 +128,9 @@
             <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_fast_inner_auth_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">3</property>
@@ -159,6 +168,9 @@
             <property name="receives_default">False</property>
             <property name="use_underline">True</property>
             <property name="draw_indicator">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">1</property>
diff --git a/panels/network/wireless-security/eap-method-leap.ui 
b/panels/network/wireless-security/eap-method-leap.ui
index 8946a3313..342c56429 100644
--- a/panels/network/wireless-security/eap-method-leap.ui
+++ b/panels/network/wireless-security/eap-method-leap.ui
@@ -26,6 +26,9 @@
             <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_leap_username_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -40,6 +43,9 @@
             <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_leap_password_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">1</property>
diff --git a/panels/network/wireless-security/eap-method-peap.ui 
b/panels/network/wireless-security/eap-method-peap.ui
index 05fd40b5c..f87b74baa 100644
--- a/panels/network/wireless-security/eap-method-peap.ui
+++ b/panels/network/wireless-security/eap-method-peap.ui
@@ -48,6 +48,9 @@
             <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_anon_identity_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -74,6 +77,9 @@
             <property name="label" translatable="yes">C_A certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_ca_cert_button</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -114,6 +120,9 @@
             <property name="label" translatable="yes">PEAP _version</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_version_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -146,6 +155,9 @@
             <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_inner_auth_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/panels/network/wireless-security/eap-method-simple.ui 
b/panels/network/wireless-security/eap-method-simple.ui
index 3dd38366c..f31901e4d 100644
--- a/panels/network/wireless-security/eap-method-simple.ui
+++ b/panels/network/wireless-security/eap-method-simple.ui
@@ -26,6 +26,9 @@
             <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_simple_username_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -40,6 +43,9 @@
             <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_simple_password_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">1</property>
diff --git a/panels/network/wireless-security/eap-method-tls.ui 
b/panels/network/wireless-security/eap-method-tls.ui
index ea6bd8599..1894a5816 100644
--- a/panels/network/wireless-security/eap-method-tls.ui
+++ b/panels/network/wireless-security/eap-method-tls.ui
@@ -24,6 +24,9 @@
             <property name="label" translatable="yes">I_dentity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_identity_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -50,6 +53,9 @@
             <property name="label" translatable="yes">_User certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_user_cert_button</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -75,6 +81,9 @@
             <property name="label" translatable="yes">C_A certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_ca_cert_button</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -115,6 +124,9 @@
             <property name="label" translatable="yes">Private _key</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_private_key_button</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -140,6 +152,9 @@
             <property name="label" translatable="yes">_Private key password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_private_key_password_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/panels/network/wireless-security/eap-method-ttls.ui 
b/panels/network/wireless-security/eap-method-ttls.ui
index 241f1faf6..84fc415a5 100644
--- a/panels/network/wireless-security/eap-method-ttls.ui
+++ b/panels/network/wireless-security/eap-method-ttls.ui
@@ -31,6 +31,9 @@
             <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_anon_identity_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -57,6 +60,9 @@
             <property name="label" translatable="yes">C_A certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_ca_cert_button</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -98,6 +104,9 @@
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_inner_auth_combo</property>
             <property name="xalign">1</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui 
b/panels/network/wireless-security/ws-dynamic-wep.ui
index f5c229ec2..5fdc05345 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.ui
+++ b/panels/network/wireless-security/ws-dynamic-wep.ui
@@ -39,6 +39,9 @@
             <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">dynamic_wep_auth_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
index 62f35ffdd..31a1cade6 100644
--- a/panels/network/wireless-security/ws-leap.ui
+++ b/panels/network/wireless-security/ws-leap.ui
@@ -26,6 +26,9 @@
             <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">leap_username_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -40,6 +43,9 @@
             <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">leap_password_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">1</property>
diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
index bca3b5d74..4eeefda32 100644
--- a/panels/network/wireless-security/ws-wep-key.ui
+++ b/panels/network/wireless-security/ws-wep-key.ui
@@ -56,6 +56,9 @@
             <property name="label" translatable="yes">_Key</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wep_key_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -115,6 +118,9 @@
             <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">auth_method_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">3</property>
@@ -152,6 +158,9 @@
             <property name="label" translatable="yes">WEP inde_x</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">key_index_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui
index 3a54574c2..0e632001e 100644
--- a/panels/network/wireless-security/ws-wpa-eap.ui
+++ b/panels/network/wireless-security/ws-wpa-eap.ui
@@ -33,6 +33,9 @@
             <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_eap_auth_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
index 2430b6591..1998a4270 100644
--- a/panels/network/wireless-security/ws-wpa-psk.ui
+++ b/panels/network/wireless-security/ws-wpa-psk.ui
@@ -22,6 +22,9 @@
             <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_psk_entry</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -81,6 +84,9 @@
             <property name="label" translatable="yes">_Type</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_psk_type_combo</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]