[PATCH 2/2] Resolved accelerator conflicts and marked excpetions.

David Shea dshea at redhat.com
Mon Aug 26 18:29:08 UTC 2013


---
 pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 10 ++++++++++
 pyanaconda/ui/gui/spokes/custom.glade           |  8 +++++---
 pyanaconda/ui/gui/spokes/filter.glade           | 21 ++++++++++++++-------
 pyanaconda/ui/gui/spokes/network.glade          |  8 ++++++--
 pyanaconda/ui/gui/spokes/source.glade           |  9 +++++----
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
index 6947314..98fb46f 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
@@ -397,6 +397,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
+                                <!-- check_accelerators: not visible at same time as label2 -->
                                 <property name="label" translatable="yes">CHAP _Username:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapUsernameEntry</property>
@@ -413,6 +414,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
+                                <!-- check_accelerators: not visible at same time as label3 -->
                                 <property name="label" translatable="yes">CHAP _Password:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">rchapPasswordEntry</property>
@@ -762,6 +764,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
+                            <!-- check_accelerators: not visible at same time as label11 -->
                             <property name="label" translatable="yes">_Node login authentication type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">loginAuthTypeCombo</property>
@@ -820,6 +823,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label2 -->
                                     <property name="label" translatable="yes">CHAP _Username:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginChapUsernameEntry</property>
@@ -836,6 +840,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label3 -->
                                     <property name="label" translatable="yes">CHAP _Password:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginChapPasswordEntry</property>
@@ -962,6 +967,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label2 -->
                                     <property name="label" translatable="yes">CHAP _Username:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapUsernameEntry</property>
@@ -978,6 +984,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label3 -->
                                     <property name="label" translatable="yes">CHAP _Password:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapPasswordEntry</property>
@@ -994,6 +1001,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as retryButton -->
                                     <property name="label" translatable="yes">_Reverse CHAP Username:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapReverseUsername</property>
@@ -1010,6 +1018,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label12 -->
                                     <property name="label" translatable="yes">Reverse CHAP Pass_word:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">loginRchapReversePassword</property>
@@ -1161,6 +1170,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="retryLoginButton">
+                                    <!-- check_accelerators: not visible at same time as retryButton -->
                                     <property name="label" translatable="yes">_Retry Log In</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 0b76c6e..b33fe5f 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -645,7 +645,7 @@ use.  Try something else?</property>
                   <object class="GtkLabel" id="containerSizeLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Size policy:</property>
+                    <property name="label" translatable="yes">Si_ze policy:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">containerSizeCombo</property>
                   </object>
@@ -1109,7 +1109,7 @@ use.  Try something else?</property>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="reformatCheckbox">
-                                        <property name="label" translatable="yes">Refor_mat</property>
+                                        <property name="label" translatable="yes">Re_format</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -1182,7 +1182,7 @@ use.  Try something else?</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_RAID Level:</property>
+                                        <property name="label" translatable="yes">R_AID Level:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">raidLevelCombo</property>
                                         <attributes>
@@ -1367,6 +1367,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
                                   <object class="GtkLabel" id="passphraseLabel">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <!-- check_accelerators: not visible at same time as mountPointLabel -->
                                     <property name="label" translatable="yes">_Passphrase:</property>
                                     <property name="use_underline">True</property>
                                     <attributes>
@@ -1395,6 +1396,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="unlockButton">
+                                    <!-- check_accelerators: not visible at same time as applyButton -->
                                     <property name="label" translatable="yes">_Unlock</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade
index 8818aa8..e98ed1a 100644
--- a/pyanaconda/ui/gui/spokes/filter.glade
+++ b/pyanaconda/ui/gui/spokes/filter.glade
@@ -601,7 +601,7 @@
                                           <object class="GtkLabel" id="label7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Show Only Devices From:</property>
+                                            <property name="label" translatable="yes">Show Only _Devices From:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">multipathVendorCombo</property>
                                           </object>
@@ -641,7 +641,8 @@
                                           <object class="GtkLabel" id="label16">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Show Only Devices With:</property>
+                                            <!-- check_accelerators: not visible at same time as label7 -->
+                                            <property name="label" translatable="yes">Show Only _Devices With:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">multipathInterconnectCombo</property>
                                           </object>
@@ -681,7 +682,8 @@
                                           <object class="GtkLabel" id="label17">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Show Only Devices Containing:</property>
+                                            <!-- check_accelerators: not visible at same time as label7 -->
+                                            <property name="label" translatable="yes">Show Only _Devices Containing:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">multipathWWIDEntry</property>
                                           </object>
@@ -899,6 +901,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label2 -->
                                     <property name="label" translatable="yes">_Filter By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">multipathTypeCombo</property>
@@ -957,7 +960,8 @@
                                           <object class="GtkLabel" id="label12">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Show Only Devices From:</property>
+                                            <!-- check_accelerators: not visible at same time as label7 -->
+                                            <property name="label" translatable="yes">Show Only _Devices From:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">otherVendorCombo</property>
                                           </object>
@@ -997,7 +1001,8 @@
                                           <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Show Only Devices With:</property>
+                                            <!-- check_accelerators: not visible at same time as label7 -->
+                                            <property name="label" translatable="yes">Show Only _Devices With:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">otherInterconnectCombo</property>
                                           </object>
@@ -1037,7 +1042,8 @@
                                           <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Show Only Devices Containing:</property>
+                                            <!-- check_accelerators: not visible at same time as label7 -->
+                                            <property name="label" translatable="yes">Show Only _Devices Containing:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">otherIDEntry</property>
                                           </object>
@@ -1266,6 +1272,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
+                                    <!-- check_accelerators: not visible at same time as label2 -->
                                     <property name="label" translatable="yes">_Filter By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">zFilterCombo</property>
@@ -1488,7 +1495,7 @@
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="addZFCPButton">
-                        <property name="label" translatable="yes">Add _ZFCP LUN...</property>
+                        <property name="label" translatable="yes">_Add ZFCP LUN...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade
index a61863c..14ec157 100644
--- a/pyanaconda/ui/gui/spokes/network.glade
+++ b/pyanaconda/ui/gui/spokes/network.glade
@@ -1641,6 +1641,7 @@ updates available for you.</property>
                                         <property name="top_padding">12</property>
                                         <child>
                                           <object class="GtkButton" id="button_mobilebb_options">
+                                            <!-- check_accelerators: not in same tab as button_wireless_options -->
                                             <property name="label" translatable="yes">_Configure...</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -1926,6 +1927,7 @@ updates available for you.</property>
                                         <property name="top_padding">12</property>
                                         <child>
                                           <object class="GtkButton" id="button_vpn_options">
+                                            <!-- check_accelerators: not in same tab as button_wireless_options -->
                                             <property name="label" translatable="yes">_Configure...</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -2081,6 +2083,7 @@ updates available for you.</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
+                                            <!-- check_accelerators: not in same tab as button_wireless_options -->
                                             <property name="label" translatable="yes">_Configuration URL</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_url</property>
@@ -2111,7 +2114,7 @@ updates available for you.</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_HTTP Proxy</property>
+                                            <property name="label" translatable="yes">HTTP _Proxy</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_http</property>
                                           </object>
@@ -2159,6 +2162,7 @@ updates available for you.</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
+                                            <!-- check_accelerators: not in same tab as button_wireless_options -->
                                             <property name="label" translatable="yes">_Socks Host</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">entry_proxy_socks</property>
@@ -2424,7 +2428,7 @@ updates available for you.</property>
                               <object class="GtkLabel" id="label_flight_mode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Air_plane Mode</property>
+                                <property name="label" translatable="yes">_Airplane Mode</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade
index 5895566..366b316 100644
--- a/pyanaconda/ui/gui/spokes/source.glade
+++ b/pyanaconda/ui/gui/spokes/source.glade
@@ -692,6 +692,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="verifyIsoButton">
+                        <!-- check_accelerators: not active at same time as verifyMediaButton -->
                         <property name="label" translatable="yes">_Verify</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
@@ -715,7 +716,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="networkRadioButton">
-                    <property name="label" translatable="yes">On the _network:</property>
+                    <property name="label" translatable="yes">_On the network:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -843,7 +844,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">NFS mount _options:</property>
+                            <property name="label" translatable="yes">N_FS mount options:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">nfsOptsEntry</property>
                           </object>
@@ -1222,7 +1223,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Proxy URL:</property>
+                            <property name="label" translatable="yes">P_roxy URL:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">repoProxyUrlEntry</property>
                             <attributes>
@@ -1241,7 +1242,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">User_name:</property>
+                            <property name="label" translatable="yes">U_sername:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">repoProxyUsernameEntry</property>
                             <attributes>
-- 
1.8.3.1



More information about the anaconda-patches mailing list