Merge lp:~themuso/ubiquity/maybe-ubiquity-a11y-profiles into lp:ubiquity

[Luke Yelavich]

This branch adds support for activating some accessibility profiles via an indicator and keyboard shortcuts when in maybe-ubiquity mode. The indicator and shortcuts will stay active for the entire install process.

[lp:~themuso/ubiquity/maybe-ubiquity-a11y-profiles]

4795. By Luke Yelavich on 2011-08-09

Merge from trunk

4796. By Luke Yelavich on 2011-08-09

Merge from trunk

4797. By Luke Yelavich on 2011-08-10

Fix typo

4798. By Luke Yelavich on 2011-08-10

Fix up ubiquity.ui file

4799. By Luke Yelavich on 2011-08-10

Fix some calls to gdk now we are using all pygi

[Luke Yelavich (themuso)]

One thing I forgot to add to merge comments. I added keypress events as well as keyboard shortcuts to menu items for the indicator menu items because 1) the keyboard shortcuts in the ui file alone don;t work naturally, so the keypress events are needed. 2) I couldn't work out how to show the shortcut keys in the menu any other way. If there is a better way, I'm happy to be pointed in the right direction.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2011-08-09 10:11:44 +0000
+++ bin/ubiquity-dm	2011-08-10 06:14:31 +0000
@@ -265,9 +265,6 @@
         os.environ['SUDO_UID'] = str(self.uid)
         os.environ['SUDO_GID'] = str(self.gid)
         os.environ['GVFS_DISABLE_FUSE' ] = '1'
-        # Share Orbit between ubiquity (running as root) and the non-root GNOME
-        # applications.  This lets ubiquity communicate with ATI-SPI.
-        os.environ['ORBIT_SOCKETDIR'] = '/tmp/orbit-%s' % self.username
 
         ck_open_session(self.uid)
 
@@ -320,14 +317,15 @@
                     preexec_fn=self.drop_privileges)
                 accessibility = subp.communicate()[0].rstrip('\n')
             # Accessibility infrastructure
-            if accessibility == 'true':
-                if os.path.exists('/usr/lib/at-spi2-core/at-spi-bus-launcher'):
-                    extras.append(subprocess.Popen(
-                        ['/usr/lib/at-spi2-core/at-spi-bus-launcher',
-                        '--launch-immediately'],
-                        stdin=null, stdout=logfile, stderr=logfile,
-                        preexec_fn=self.drop_privileges))
-                    os.environ['GTK_MODULES'] = 'gail:atk-bridge'
+            with open('/proc/cmdline', 'r') as fp:
+                if (accessibility == 'true' or 'maybe-ubiquity' in fp.readline()):
+                    if os.path.exists('/usr/lib/at-spi2-core/at-spi-bus-launcher'):
+                        extras.append(subprocess.Popen(
+                            ['/usr/lib/at-spi2-core/at-spi-bus-launcher',
+                            '--launch-immediately'],
+                            stdin=null, stdout=logfile, stderr=logfile,
+                            preexec_fn=self.drop_privileges))
+                        os.environ['GTK_MODULES'] = 'gail:atk-bridge'
 
             # Don't show the background image in v1 accessibility profile. It
             # is not shown in the GNOME desktop after all.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-09 15:25:03 +0000
+++ debian/changelog	2011-08-10 06:14:31 +0000
@@ -11,6 +11,19 @@
   [ Brian Murray ]
   * Instead of sending people to +filebug recommend using apport
 
+  [ Luke Yelavich ]
+  * Add support for launching high contrast, screen reader, keyboard modifiers,
+    and onscreen keyboard accessibility profiles in maybe-ubiquity mode, high
+    contrast and screen reader profiles being launcheable either from an
+    indicator, or via keyboard shortcut, the rest of the profiles available
+    via the indicator only
+  * bin/ubiquity-dm:
+    - Start at-spi either when an appropriate accessibility profile is enabled,
+      or when maybe-ubiquity mode is enabled
+    - Remove references to orbit, as the a11y stack now uses dbus
+  * debian/control: Add python-appindicator as a dependency of
+    ubiquity-frontend-gtk
+
  -- Brian Murray <[e-mail]>  Tue, 09 Aug 2011 08:04:40 -0700
 
 ubiquity (2.7.14) oneiric; urgency=low

=== modified file 'debian/control'
--- debian/control	2011-08-09 08:35:24 +0000
+++ debian/control	2011-08-10 06:14:31 +0000
@@ -43,7 +43,7 @@
 
 Package: ubiquity-frontend-gtk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ubiquity (= ${binary:Version}), python-dbus, gir1.2-gtk-3.0, gir1.2-gdkpixbuf-2.0, gir1.2-vte-2.90, gir1.2-webkit-3.0, iso-codes, x-window-manager, gksu, python-xklavier, gir1.2-timezonemap-1.0, python-libxml2
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ubiquity (= ${binary:Version}), python-dbus, gir1.2-gtk-3.0, gir1.2-gdkpixbuf-2.0, gir1.2-vte-2.90, gir1.2-webkit-3.0, iso-codes, x-window-manager, gksu, python-xklavier, gir1.2-timezonemap-1.0, python-libxml2, python-appindicator
 Suggests: gnome-control-center
 Conflicts: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 Replaces: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)

=== modified file 'gui/gtk/ubiquity.ui'
--- gui/gtk/ubiquity.ui	2011-08-09 15:25:03 +0000
+++ gui/gtk/ubiquity.ui	2011-08-10 06:14:31 +0000
@@ -1023,4 +1023,40 @@
       <action-widget response="-7">exitbutton</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkMenu" id="a11y_indicator_menu">
+    <child>
+      <object class="GtkMenuItem" id="a11y_high_contrast">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_High Contrast</property>
+        <property name="use_underline">True</property>
+        <accelerator key="H" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <signal name="activate" handler="a11y_profile_high_contrast_activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="a11y_screen_reader">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Screen Reader</property>
+        <property name="use_underline">True</property>
+        <accelerator key="S" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+        <signal name="activate" handler="a11y_profile_screen_reader_activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="a11y_keyboard_modifiers">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Keyboard Modifiers</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="a11y_profile_keyboard_modifiers_activate"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="a11y_onscreen_keyboard">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_On-screen Keyboard</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="a11y_profile_onscreen_keyboard_activate"/>
+      </object>
+    </child>
+  </object>
 </interface>

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2011-08-09 10:18:40 +0000
+++ ubiquity/frontend/gtk_ui.py	2011-08-10 06:14:31 +0000
@@ -295,6 +295,18 @@
 
         self.customize_installer()
 
+        # Put up the a11y indicator in maybe-ubiquity mode
+        if ('UBIQUITY_GREETER' in os.environ and os.path.exists('/usr/bin/casper-a11y-enable')):
+            try:
+                import appindicator
+                self.indicator = appindicator.Indicator('ubiquity', 'accessibility-directory',
+                    appindicator.CATEGORY_OTHER)
+                self.indicator.set_status(appindicator.STATUS_ACTIVE)
+                self.indicator.set_menu(self.builder.get_object('a11y_indicator_menu'))
+                self.live_installer.connect('key-press-event', self.a11y_profile_keys)
+            except:
+                print >>sys.stderr, "Unable to set up accessibility profile support."
+
     def all_children(self, parent):
         if isinstance(parent, Gtk.Container):
             def recurse(x, y):
@@ -489,6 +501,40 @@
         if self.thunar_previous:
             self.thunar_set_volmanrc(self.thunar_previous)
 
+    def a11y_profile_keys(self, window, event):
+        if event.state & Gdk.CONTROL_MASK and event.keyval == Gdk.keyval_from_name('h'):
+            self.a11y_profile_high_contrast_activate()
+        elif event.state & Gdk.CONTROL_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',
+                         '--pass-stdout', '/usr/bin/casper-a11y-enable',
+                         'high-contrast'], preexec_fn=misc.drop_all_privileges)
+        os.environ['UBIQUITY_A11Y_PROFILE'] = 'high-contrast'
+
+    def a11y_profile_screen_reader_activate(self, widget=None):
+        subprocess.call(['log-output', '-t', 'ubiquity',
+                         '--pass-stdout', '/usr/bin/casper-a11y-enable',
+                         'blindness'], preexec_fn=misc.drop_all_privileges)
+        os.environ['UBIQUITY_A11Y_PROFILE'] = 'screen-reader'
+        if os.path.exists('/usr/bin/orca'):
+            subprocess.Popen(['/usr/bin/orca', '-n'], preexec_fn=misc.drop_all_privileges)
+             
+    def a11y_profile_keyboard_modifiers_activate(self, widget=None):
+        subprocess.call(['log-output', '-t', 'ubiquity',
+                         '--pass-stdout', '/usr/bin/casper-a11y-enable',
+                         'keyboard-modifiers'], preexec_fn=misc.drop_all_privileges)
+        os.environ['UBIQUITY_A11Y_PROFILE'] = 'keyboard-modifiers'
+
+    def a11y_profile_onscreen_keyboard_activate(self, widget=None):
+        subprocess.call(['log-output', '-t', 'ubiquity',
+                         '--pass-stdout', '/usr/bin/casper-a11y-enable',
+                         'onscreen-keyboard'], preexec_fn=misc.drop_all_privileges)
+        os.environ['UBIQUITY_A11Y_PROFILE'] = 'onscreen-keyboard'
+        if os.path.exists('/usr/bin/onboard'):
+            subprocess.Popen(['/usr/bin/onboard'], preexec_fn=misc.drop_all_privileges)
+
     def run(self):
         """run the interface."""