Merge lp:~themuso/ubiquity/a11y-improvements into lp:ubiquity

[Luke Yelavich]

Some small accessibility related improvements.

[lp:~themuso/ubiquity/a11y-improvements]

6133. By Luke Yelavich on 2014-03-12

Merge with trunk.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-12 16:53:09 +0000
+++ debian/changelog	2014-03-12 22:22:58 +0000
@@ -1,3 +1,16 @@
+ubiquity (2.17.10) UNRELEASED; urgency=low
+
+  * Set up atk label association for grub boot loader location combo box in
+    advanced partition editor.
+  * Add Super + Alt + S as an activation keystroke for the screen reader
+    profile. This mirrors the same keystroke that can be used to activate the
+    screen reader when in a Unity or GNOME desktop. The Control + S keystroke
+    is still present for transitional purposes, so new users don't need to
+    hunt for new information when they attempt to install trusty. It will be
+    removed in trusty+1.
+
+ -- Luke Yelavich <[e-mail]>  Thu, 13 Mar 2014 09:21:43 +1100
+
 ubiquity (2.17.9) trusty; urgency=medium
 
   [ Matthew Paul Thomas ]

=== modified file 'gui/gtk/stepPartAdvanced.ui'
--- gui/gtk/stepPartAdvanced.ui	2013-06-24 10:08:31 +0000
+++ gui/gtk/stepPartAdvanced.ui	2014-03-12 22:22:58 +0000
@@ -931,6 +931,9 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Help for GRUB device selection goes here.</property>
                 <property name="wrap">True</property>
+                <accessibility>
+                  <relation type="label-for" target="grub_device_entry"/>
+                </accessibility>
               </object>
               <packing>
                 <property name="left_attach">0</property>

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2014-03-06 06:42:00 +0000
+++ ubiquity/frontend/gtk_ui.py	2014-03-12 22:22:58 +0000
@@ -361,8 +361,6 @@
                             AppIndicator.IndicatorStatus.ACTIVE)
                         self.indicator.set_menu(
                             self.builder.get_object('a11y_indicator_menu'))
-                        self.live_installer.connect(
-                            'key-press-event', self.a11y_profile_keys)
                         if osextras.find_on_path('canberra-gtk-play'):
                             subprocess.Popen(
                                 ['canberra-gtk-play', '--id=system-ready'],
@@ -370,6 +368,8 @@
                     except:
                         print("Unable to set up accessibility profile support",
                               file=sys.stderr)
+            self.live_installer.connect(
+                'key-press-event', self.a11y_profile_keys)
 
     def all_children(self, parent):
         if isinstance(parent, Gtk.Container):
@@ -668,6 +668,10 @@
         elif (event.state & Gdk.ModifierType.CONTROL_MASK and
                 event.keyval == Gdk.keyval_from_name('s')):
             self.a11y_profile_screen_reader_activate()
+        elif (event.state & Gdk.ModifierType.SUPER_MASK and
+                event.state & Gdk.ModifierType.MOD1_MASK and
+                event.keyval == Gdk.keyval_from_name('s')):
+            self.a11y_profile_screen_reader_activate()
 
     def a11y_profile_high_contrast_activate(self, widget=None):
         subprocess.call(['log-output', '-t', 'ubiquity',