editor: merge branch 'bg/editor-mnemonics'

https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/54

5 files changed, 74 insertions, 55 deletions

diff --git a/src/connection-editor/ce-page-macsec.ui b/src/connection-editor/ce-page-macsec.ui
index d7469782..e0374641 100644
--- a/src/connection-editor/ce-page-macsec.ui
+++ b/src/connection-editor/ce-page-macsec.ui
@@ -55,7 +55,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Device name</property>
+        <property name="label" translatable="yes">_Device name</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_name</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -80,7 +82,9 @@
         <property name="can_focus">False</property>
         <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Parent device</property>
+        <property name="label" translatable="yes">_Parent device</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_parent</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -107,25 +111,34 @@
       </packing>
     </child>
     <child>
-      <object class="GtkEntry" id="macsec_ckn">
+      <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="tooltip_text" translatable="yes"> The pre-shared Connectivity-association Key Name</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Keys</property>
+        <property name="xalign">1</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">5</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
-      <object class="GtkEntry" id="macsec_cak">
+      <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="tooltip_text" translatable="yes">The pre-shared Connectivity Association Key</property>
+        <property name="can_focus">False</property>
+        <property name="halign">end</property>
+        <property name="hexpand">False</property>
+        <property name="label" translatable="yes">_Mode</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_mode</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">4</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">3</property>
       </packing>
     </child>
     <child>
@@ -151,23 +164,24 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">CKN</property>
+        <property name="hexpand">False</property>
+        <property name="label" translatable="yes">C_AK</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_cak</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
+        <property name="top_attach">4</property>
       </packing>
     </child>
     <child>
-      <object class="GtkLabel">
+      <object class="GtkEntry" id="macsec_cak">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="hexpand">False</property>
-        <property name="label" translatable="yes">CAK</property>
+        <property name="can_focus">True</property>
+        <property name="tooltip_text" translatable="yes">The pre-shared Connectivity Association Key</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
+        <property name="left_attach">1</property>
         <property name="top_attach">4</property>
       </packing>
     </child>
@@ -176,28 +190,24 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Mode</property>
+        <property name="label" translatable="yes">C_KN</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_ckn</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
+        <property name="top_attach">5</property>
       </packing>
     </child>
     <child>
-      <object class="GtkLabel">
+      <object class="GtkEntry" id="macsec_ckn">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Keys</property>
-        <property name="xalign">1</property>
-        <attributes>
-          <attribute name="weight" value="bold"/>
-        </attributes>
+        <property name="can_focus">True</property>
+        <property name="tooltip_text" translatable="yes"> The pre-shared Connectivity-association Key Name</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-        <property name="width">2</property>
+        <property name="left_attach">1</property>
+        <property name="top_attach">5</property>
       </packing>
     </child>
     <child>
@@ -221,7 +231,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Validation</property>
+        <property name="label" translatable="yes">_Validation</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_validation</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -229,18 +241,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="label" translatable="yes">SCI port</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">8</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkComboBox" id="macsec_validation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -259,17 +259,17 @@
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="macsec_encryption">
-        <property name="label" translatable="yes">Encrypt</property>
+      <object class="GtkLabel">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="tooltip_text" translatable="yes">Whether the transmitted traffic must be encrypted</property>
-        <property name="draw_indicator">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">_SCI port</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">macsec_sci_port</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">9</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">8</property>
       </packing>
     </child>
     <child>
@@ -287,6 +287,21 @@
       </packing>
     </child>
     <child>
+      <object class="GtkCheckButton" id="macsec_encryption">
+        <property name="label" translatable="yes">_Encrypt</property>
+        <property name="use_underline">True</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="tooltip_text" translatable="yes">Whether the transmitted traffic must be encrypted</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">9</property>
+      </packing>
+    </child>
+    <child>
       <placeholder/>
     </child>
   </object>
diff --git a/src/connection-editor/ce-page-team.ui b/src/connection-editor/ce-page-team.ui
index 271bd9af..fff0a056 100644
--- a/src/connection-editor/ce-page-team.ui
+++ b/src/connection-editor/ce-page-team.ui
@@ -172,6 +172,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">_Teamed connections</property>
+        <property name="mnemonic_widget">master_connections</property>
         <property name="use_underline">True</property>
         <property name="xalign">1</property>
       </object>
diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui
index 52eb840c..cdbdac8a 100644
--- a/src/wireless-security/eap-method-peap.ui
+++ b/src/wireless-security/eap-method-peap.ui
@@ -88,6 +88,7 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">PEAP _version</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">eap_peap_version_combo</property>
             <property name="xalign">1</property>
           </object>
           <packing>
@@ -119,6 +120,7 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">eap_peap_inner_auth_combo</property>
             <property name="xalign">1</property>
           </object>
           <packing>
diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui
index a0da485c..c0206eb2 100644
--- a/src/wireless-security/eap-method-simple.ui
+++ b/src/wireless-security/eap-method-simple.ui
@@ -102,7 +102,7 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">P_rivate Key Passphrase</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">eap_simple_password_entry</property>
+            <property name="mnemonic_widget">eap_simple_pkey_passphrase_entry</property>
             <property name="xalign">1</property>
           </object>
           <packing>
diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui
index abdc9648..8cb2b56a 100644
--- a/src/wireless-security/eap-method-ttls.ui
+++ b/src/wireless-security/eap-method-ttls.ui
@@ -76,6 +76,7 @@
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">eap_ttls_inner_auth_combo</property>
             <property name="xalign">1</property>
           </object>
           <packing>