Merge lp:~seb128/ubiquity/start-screen-reader into lp:ubiquity

[Sebastien Bacher]

Don't desactivate the screen-reader desktop keybinding, that was
needed when ubiquity was handling the key press events but now
gsd-media-keys is doing that. Listen to the corresponding key to
start orca under ubiquity-dm since gnome-session isn't there to do it.

Don't desactivate the screen-reader desktop keybinding, that was
needed when ubiquity was handling the key press events but now
gsd-media-keys is doing that. Listen to the corresponding key to
start orca under ubiquity-dm since gnome-session isn't there to do it.

[Iain Lane (laney)]

Two nitpicks and one other change requested, but looks mostly good - thanks!

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

I have nothing more to add that the remarks Laney already had. Reading the value calling directly the callback is the best way btw. :)

[Jean-Baptiste Lallement (jibel)]

package fails to build due to pep8 tests

./tests/run-pep8
ubiquity/frontend/gtk_ui.py:161:1: E302 expected 2 blank lines, found 1
ubiquity/frontend/gtk_ui.py:167:1: E302 expected 2 blank lines, found 1
ubiquity/frontend/gtk_ui.py:724:80: E501 line too long (88 > 79 characters)
ubiquity/frontend/gtk_ui.py:725:80: E501 line too long (106 > 79 characters)
ubiquity/frontend/gtk_ui.py:726:1: W293 blank line contains whitespace

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

+1 for me, I trust you testing it, but it looks syntactically good, as long as pep8 passes :)

[lp:~seb128/ubiquity/start-screen-reader]

6628. By Sebastien Bacher on 2018-04-24

Tweaks to address the first review comments

6629. By Sebastien Bacher on 2018-04-24

Identation, whitespace and new lines tweaks

[Iain Lane (laney)]

thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-24 10:13:17 +0000
+++ debian/changelog	2018-04-24 13:29:15 +0000
@@ -1,4 +1,11 @@
-ubiquity (18.04.10ubuntu1) UNRELEASED; urgency=medium
+ubiquity (18.04.11) UNRELEASED; urgency=medium
+
+  [ Sebastien Bacher]
+  * Don't desactivate the screen-reader desktop keybinding, that was
+    needed when ubiquity was handling the key press events but now 
+    gsd-media-keys is doing that. Listen to the corresponding key to
+    start orca under ubiquity-dm since gnome-session isn't there to do it.
+    (lp: #1741690)
 
   [ Didier Roche ]
   * Record OEM installation mode in telemetry data. (LP: #1765693)

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2018-03-26 08:11:13 +0000
+++ ubiquity/frontend/gtk_ui.py	2018-04-24 13:29:15 +0000
@@ -50,7 +50,7 @@
 
 # in query mode we won't be in X, but import needs to pass
 if 'DISPLAY' in os.environ:
-    from gi.repository import Gtk, Gdk, GObject, GLib, Atk
+    from gi.repository import Gtk, Gdk, GObject, GLib, Atk, Gio
     from ubiquity import gtkwidgets
 
 from ubiquity import (
@@ -159,6 +159,13 @@
         self._wizard.switch_to_install_interface()
 
 
+def on_screen_reader_enabled_changed(gsettings, key):
+    # handle starting orca only, it exits itself when the key is false
+    if (key == "screen-reader-enabled" and gsettings.get_boolean(key) and
+       osextras.find_on_path('orca')):
+        subprocess.Popen(['orca'], preexec_fn=misc.drop_all_privileges)
+
+
 class Wizard(BaseFrontend):
     def __init__(self, distro):
         def add_subpage(self, steps, name):
@@ -234,6 +241,7 @@
         self.timeout_id = None
         self.screen_reader = False
         self.orca_process = None
+        self.a11y_settings = None
 
         # To get a "busy mouse":
         self.watch = Gdk.Cursor.new(Gdk.CursorType.WATCH)
@@ -537,31 +545,6 @@
 
         gsettings.set(gs_schema, gs_key, gs_value)
 
-    def disable_screen_reader(self):
-        gs_key = 'screenreader'
-        for gs_schema in 'org.gnome.settings-daemon.plugins.media-keys', \
-                         'org.mate.SettingsDaemon.plugins.media-keys':
-            gs_previous = '%s/%s' % (gs_schema, gs_key)
-            if gs_previous in self.gsettings_previous:
-                return
-
-            gs_value = gsettings.get(gs_schema, gs_key)
-            self.gsettings_previous[gs_previous] = gs_value
-
-            if gs_value:
-                gsettings.set(gs_schema, gs_key, '')
-
-        atexit.register(self.enable_screen_reader)
-
-    def enable_screen_reader(self):
-        gs_key = 'screenreader'
-        for gs_schema in 'org.gnome.settings-daemon.plugins.media-keys', \
-                         'org.mate.SettingsDaemon.plugins.media-keys':
-            gs_previous = '%s/%s' % (gs_schema, gs_key)
-            gs_value = self.gsettings_previous[gs_previous]
-
-            gsettings.set(gs_schema, gs_key, gs_value)
-
     def disable_screensaver(self):
         gs_schema = 'org.gnome.desktop.screensaver'
         gs_key = 'idle-activation-enabled'
@@ -737,9 +720,17 @@
         self.disable_volume_manager()
         self.disable_screensaver()
         self.disable_powermgr()
-        self.disable_screen_reader()
 
         if 'UBIQUITY_ONLY' in os.environ:
+            # handle orca only in ubiquity-dm where there is no gnome-session
+            self.a11y_settings = Gio.Settings.new(
+                                     "org.gnome.desktop.a11y.applications")
+            self.a11y_settings.connect("changed::screen-reader-enabled",
+                                       on_screen_reader_enabled_changed)
+            # enable if needed and a key read is needed to connect the signal
+            on_screen_reader_enabled_changed(self.a11y_settings,
+                                             "screen-reader-enabled")
+
             self.disable_logout_indicator()
             if 'UBIQUITY_DEBUG' not in os.environ:
                 self.disable_terminal()