Add keyboard accelerators to a whole lot of widgets (#864964).

13 files changed, 139 insertions, 103 deletions

diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 59eb54132..72d06cad0 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -137,8 +137,10 @@
                 <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">&lt;b&gt;Desired Capacity:&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;_Desired Capacity:&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">sizeEntry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -152,8 +154,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Mount Point:&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;M_ount Point:&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">addMountPointEntry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -320,10 +324,11 @@ use.  Try something else?</property>
         </child>
         <child>
           <object class="GtkCheckButton" id="removeAllCheckbox">
-            <property name="label" translatable="yes">Delete all other filesystems in the %s root as well.</property>
+            <property name="label" translatable="yes">Delete _all other filesystems in the %s root as well.</property>
             <property name="visible">True</property>
             <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="draw_indicator">True</property>
           </object>
@@ -556,8 +561,10 @@ you'll be able to view their details here.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Mount Point:&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;M_ount Point:&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">mountPointEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -586,8 +593,10 @@ you'll be able to view their details here.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Label:&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;_Label:&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">labelEntry</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -602,8 +611,10 @@ you'll be able to view their details here.</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">end</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Desired Capacity (MB):&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;_Desired Capacity (MB):&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">sizeSpinner</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -649,7 +660,9 @@ you'll be able to view their details here.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Name:</property>
+                                    <property name="label" translatable="yes">_Name:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">nameEntry</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
                                     </attributes>
@@ -710,8 +723,10 @@ you'll be able to view their details here.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;Device Type:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Device _Type:&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">deviceTypeCombo</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
@@ -725,8 +740,10 @@ you'll be able to view their details here.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">&lt;b&gt;File System:&lt;/b&gt;</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;File _System:&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">fileSystemTypeCombo</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
@@ -804,10 +821,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="lvmRedundancyCheckbox">
-                                                    <property name="label" translatable="yes">Redundancy (mirror)</property>
+                                                    <property name="label" translatable="yes">Redundancy (_mirror)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -848,10 +866,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="lvmPerformanceCheckbox">
-                                                    <property name="label" translatable="yes">Optimized performance (stripe)</property>
+                                                    <property name="label" translatable="yes">Optimi_zed performance (stripe)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -901,10 +920,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="raidRedundancyCheckbox">
-                                                    <property name="label" translatable="yes">Redundancy (mirror)</property>
+                                                    <property name="label" translatable="yes">Redundancy (_mirror)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -945,10 +965,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="raidPerformanceCheckbox">
-                                                    <property name="label" translatable="yes">Optimized performance (stripe)</property>
+                                                    <property name="label" translatable="yes">Optimi_zed performance (stripe)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -988,10 +1009,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="raidErrorCheckbox">
-                                                    <property name="label" translatable="yes">Error detection (parity)</property>
+                                                    <property name="label" translatable="yes">Error detection (_parity)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -1032,10 +1054,11 @@ you'll be able to view their details here.</property>
                                                 <property name="margin_left">12</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="raidDistErrorCheckbox">
-                                                    <property name="label" translatable="yes">Distributed</property>
+                                                    <property name="label" translatable="yes">D_istributed</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -1063,11 +1086,12 @@ you'll be able to view their details here.</property>
                                                 </child>
                                                 <child>
                                                   <object class="GtkCheckButton" id="raidRedundantErrorCheckbox">
-                                                    <property name="label" translatable="yes">Redundant</property>
+                                                    <property name="label" translatable="yes">Red_undant</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="margin_left">6</property>
+                                                    <property name="use_underline">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -1142,10 +1166,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="btrfsRedundancyCheckbox">
-                                                    <property name="label" translatable="yes">Redundancy (mirror)</property>
+                                                    <property name="label" translatable="yes">Redundancy (_mirror)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -1186,10 +1211,11 @@ you'll be able to view their details here.</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="btrfsPerformanceCheckbox">
-                                                    <property name="label" translatable="yes">Optimized performance (stripe)</property>
+                                                    <property name="label" translatable="yes">Optimi_zed performance (stripe)</property>
                                                     <property name="visible">True</property>
                                                     <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="draw_indicator">True</property>
                                                     <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/>
@@ -1241,10 +1267,11 @@ you'll be able to view their details here.</property>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="reformatCheckbox">
-                                        <property name="label" translatable="yes">Reformat</property>
+                                        <property name="label" translatable="yes">_Reformat</property>
                                         <property name="visible">True</property>
                                         <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="draw_indicator">True</property>
                                         <signal name="toggled" handler="on_reformat_toggled" swapped="no"/>
@@ -1260,7 +1287,9 @@ you'll be able to view their details here.</property>
                                       <object class="GtkLabel" id="volumeGroupLabel">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Volume Group:</property>
+                                        <property name="label" translatable="yes">_Volume Group:</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">volumeGroupCombo</property>
                                         <attributes>
                                           <attribute name="weight" value="bold"/>
                                         </attributes>
@@ -1289,10 +1318,11 @@ you'll be able to view their details here.</property>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="modifyVGButton">
-                                        <property name="label" translatable="yes">Modify ...</property>
+                                        <property name="label" translatable="yes">Modif_y...</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
+                                        <property name="use_underline">True</property>
                                         <signal name="clicked" handler="on_modify_vg_clicked" swapped="no"/>
                                       </object>
                                       <packing>
@@ -1433,7 +1463,8 @@ you'll be able to view their details here.</property>
                                   <object class="GtkLabel" id="passphraseLabel">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Passphrase:</property>
+                                    <property name="label" translatable="yes">_Passphrase:</property>
+                                    <property name="use_underline">True</property>
                                     <attributes>
                                       <attribute name="font-desc" value="Cantarell 11"/>
                                     </attributes>
@@ -1450,6 +1481,7 @@ you'll be able to view their details here.</property>
                                     <property name="can_focus">True</property>
                                     <property name="visibility">False</property>
                                     <property name="invisible_char">●</property>
+                                    <accelerator key="p" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -2034,7 +2066,9 @@ you'll be able to view their details here.</property>
                   <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes">_Name:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">vg_name_entry</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -2047,6 +2081,7 @@ you'll be able to view their details here.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">●</property>
+                <accelerator key="n" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 95a4398e5..e7b47e51b 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -633,8 +633,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
         summaryLabel = self._summaryButton.get_children()[0]
         count = len(self.data.clearpart.drives)
-        summary = P_("%d storage device selected",
-                     "%d storage devices selected",
+        summary = P_("%d _storage device selected",
+                     "%d _storage devices selected",
                      count) % count
 
         summaryLabel.set_use_markup(True)
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
index d30264518..d2b9825f3 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
@@ -84,7 +84,9 @@
                               <object class="GtkLabel" id="regionLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Region:</property>
+                                <property name="label" translatable="yes">_Region:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">regionCombobox</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -117,7 +119,9 @@
                               <object class="GtkLabel" id="cityLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">City:</property>
+                                <property name="label" translatable="yes">_City:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">cityCombobox</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -161,7 +165,9 @@
                                       <object class="GtkLabel" id="networkTimeLabel">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Network Time</property>
+                                        <property name="label" translatable="yes">_Network Time</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="mnemonic_widget">networkTimeSwitch</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -458,11 +464,11 @@
                                     <property name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkRadioButton" id="timeFormatRB">
-                                        <property name="label" translatable="yes">24-hour</property>
+                                        <property name="label" translatable="yes">24-_hour</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_underline">True</property>
                                         <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
@@ -476,11 +482,11 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="timeFormatRB2">
-                                        <property name="label" translatable="yes">AM/PM</property>
+                                        <property name="label" translatable="yes">_AM/PM</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_underline">True</property>
                                         <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">timeFormatRB</property>
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade
index 0eb063c75..d48c1c9b6 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.glade
+++ b/pyanaconda/ui/gui/spokes/keyboard.glade
@@ -187,6 +187,7 @@
         <property name="orientation">vertical</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
                 <property name="can_focus">False</property>
@@ -450,7 +451,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Test the layout configuration below:</property>
+                            <property name="label" translatable="yes">_Test the layout configuration below:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">layoutTextView</property>
                             <attributes>
                               <attribute name="font-desc" value="Cantarell 10"/>
                             </attributes>
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index af10a1e70..2b1f217e6 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -237,9 +237,10 @@ class CreateNewPage(Page):
         label.set_line_wrap(True)
         self._createBox.add(label)
 
-        self._createNewButton = Gtk.LinkButton("", label=_("Click here to create them automatically."))
+        self._createNewButton = Gtk.LinkButton("", label=_("_Click here to create them automatically."))
         label = self._createNewButton.get_children()[0]
         label.set_line_wrap(True)
+        label.set_use_underline(True)
 
         self._createNewButton.set_has_tooltip(False)
         self._createNewButton.set_halign(Gtk.Align.START)
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.glade b/pyanaconda/ui/gui/spokes/lib/cart.glade
index a51d1b271..0743a9f33 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.glade
+++ b/pyanaconda/ui/gui/spokes/lib/cart.glade
@@ -234,6 +234,7 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Disk summary goes here</property>
                 <property name="use_markup">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
index ea3cac20c..76d36494f 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -135,9 +135,9 @@ class SelectedDisksDialog(GUIObject):
         size = str(Size(bytes=long(size))).upper()
         free = str(Size(bytes=long(free))).upper()
 
-        text = P_("<b>%d disk; %s capacity; %s free space</b> "
+        text = P_("<b>%d d_isk; %s capacity; %s free space</b> "
                    "(unpartitioned and in filesystems)",
-                  "<b>%d disks; %s capacity; %s free space</b> "
+                  "<b>%d d_isks; %s capacity; %s free space</b> "
                    "(unpartitioned and in filesystems)",
                   count) % (count, size, free)
         self._summary_label.set_markup(text)
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade
index ca912f5ee..cb088993a 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade
@@ -49,10 +49,11 @@
             </child>
             <child>
               <object class="GtkButton" id="passphrase_save_button">
-                <property name="label" translatable="yes">Save Passphrase</property>
+                <property name="label" translatable="yes">_Save Passphrase</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_save_clicked" swapped="no"/>
               </object>
               <packing>
@@ -94,7 +95,10 @@
               <object class="GtkLabel" id="passphrase_entry_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Passphrase:</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Passphrase:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">passphrase_entry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -124,7 +128,10 @@
               <object class="GtkLabel" id="confirm_entry_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Confirm:</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Confirm:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">confirm_entry</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.glade b/pyanaconda/ui/gui/spokes/lib/resize.glade
index c7074ba92..05f5ad393 100644
--- a/pyanaconda/ui/gui/spokes/lib/resize.glade
+++ b/pyanaconda/ui/gui/spokes/lib/resize.glade
@@ -209,7 +209,9 @@
                   <object class="GtkToolButton" id="preserveButton">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Preserve</property>
+                    <property name="label" translatable="yes">_Preserve</property>
+                    <property name="use_underline">True</property>
+                    <accelerator key="p" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <signal name="clicked" handler="on_preserve_clicked" swapped="no"/>
                   </object>
                   <packing>
@@ -221,7 +223,9 @@
                   <object class="GtkToolButton" id="shrinkButton">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Shrink</property>
+                    <property name="label" translatable="yes">_Shrink</property>
+                    <property name="use_underline">True</property>
+                    <accelerator key="s" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <signal name="clicked" handler="on_shrink_clicked" swapped="no"/>
                   </object>
                   <packing>
@@ -233,7 +237,9 @@
                   <object class="GtkToolButton" id="deleteButton">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Delete</property>
+                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="use_underline">True</property>
+                    <accelerator key="d" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <signal name="clicked" handler="on_delete_clicked" swapped="no"/>
                   </object>
                   <packing>
diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade
index 5fc0613e1..4d8042f46 100644
--- a/pyanaconda/ui/gui/spokes/network.glade
+++ b/pyanaconda/ui/gui/spokes/network.glade
@@ -575,27 +575,6 @@ updates available for you.</property>
                                         <child>
                                           <placeholder/>
                                         </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -1083,24 +1062,6 @@ updates available for you.</property>
                                             <property name="height">1</property>
                                           </packing>
                                         </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -2200,11 +2161,11 @@ updates available for you.</property>
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="button_unlock">
-                            <property name="label" translatable="yes">Unlock</property>
+                            <property name="label" translatable="yes">Unloc_k</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
diff --git a/pyanaconda/ui/gui/spokes/password.glade b/pyanaconda/ui/gui/spokes/password.glade
index 043f0ada1..75ac9579b 100644
--- a/pyanaconda/ui/gui/spokes/password.glade
+++ b/pyanaconda/ui/gui/spokes/password.glade
@@ -15,6 +15,7 @@
         <property name="spacing">6</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
                 <property name="can_focus">False</property>
@@ -49,8 +50,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Root Password:</property>
+                        <property name="label" translatable="yes">_Root Password:</property>
                         <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">pw</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -64,8 +67,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Confirm:</property>
+                        <property name="label" translatable="yes">_Confirm:</property>
                         <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">confirm</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade
index 07fc23d5c..78cc90142 100644
--- a/pyanaconda/ui/gui/spokes/source.glade
+++ b/pyanaconda/ui/gui/spokes/source.glade
@@ -186,7 +186,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Fedora People Repositories</property>
+                        <property name="label" translatable="yes">_Fedora People Repositories</property>
+                        <property name="use_underline">True</property>
                       </object>
                     </child>
                   </object>
@@ -303,7 +304,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Standard YUM repository:</property>
+                        <property name="label" translatable="yes">_Standard YUM repository:</property>
+                        <property name="use_underline">True</property>
                       </object>
                     </child>
                   </object>
@@ -665,8 +667,10 @@ TeXlive 2012 repository</col>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Proxy URL&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Proxy URL&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">proxyURLEntry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -740,8 +744,10 @@ TeXlive 2012 repository</col>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Username&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;User_name&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">proxyUsernameEntry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -755,8 +761,10 @@ TeXlive 2012 repository</col>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Password&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Pass_word&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">proxyPasswordEntry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -832,6 +840,7 @@ TeXlive 2012 repository</col>
         <property name="orientation">vertical</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
                 <property name="can_focus">False</property>
@@ -985,7 +994,9 @@ TeXlive 2012 repository</col>
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Device:</property>
+                        <property name="label" translatable="yes">D_evice:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">isoPartitionCombo</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1083,12 +1094,6 @@ TeXlive 2012 repository</col>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
                           <object class="GtkComboBoxText" id="protocolComboBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -1179,7 +1184,9 @@ TeXlive 2012 repository</col>
                           <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">NFS mount _options:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">nfsOptsEntry</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1237,7 +1244,7 @@ TeXlive 2012 repository</col>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="noUpdatesCheckbox">
-                    <property name="label" translatable="yes">D_on't install the latest available software updates. Install the default versions provided by the install source above.</property>
+                    <property name="label" translatable="yes">Don't install the latest available software _updates. Install the default versions provided by the install source above.</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index 27f5e61b6..43e2791dd 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -152,7 +152,8 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Partition scheme configuration</property>
+                    <property name="label" translatable="yes">Partition _scheme configuration</property>
+                    <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell 11"/>
                     </attributes>
@@ -507,7 +508,8 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Partition scheme configuration</property>
+                    <property name="label" translatable="yes">Partition _scheme configuration</property>
+                    <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell 11"/>
                     </attributes>
@@ -853,6 +855,7 @@
         <property name="spacing">6</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
                 <property name="can_focus">False</property>
@@ -969,7 +972,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="summary_button">
-                        <property name="label" translatable="yes">Full disk summary and options...</property>
+                        <property name="label" translatable="yes">_Full disk summary and options...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1008,13 +1011,14 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="encryption_checkbutton">
-                        <property name="label" translatable="yes">Encrypt my data. I'll set a passphrase later.</property>
+                        <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">end</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
+                        <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>