Merge lp:~parnold-x/wingpanel-indicator-a11y/session-support into lp:~wingpanel-devs/wingpanel-indicator-a11y/trunk

[Djax]

wingpanel session support

[lp:~parnold-x/wingpanel-indicator-a11y/session-support]

3. By Djax on 2015-09-09

support wingpanel session

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-04 20:48:42 +0000
+++ src/CMakeLists.txt	2015-09-09 21:31:57 +0000
@@ -1,7 +1,7 @@
 find_package (PkgConfig)
 
 # Add all your dependencies to the list below
-pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 wingpanel-2.0)
+pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 wingpanel-2.0 granite)
 
 add_definitions (${DEPS_CFLAGS})
 link_directories (${DEPS_LIBRARY_DIRS})
@@ -13,11 +13,15 @@
 include (ValaPrecompile)
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
+  GreeterWidget.vala
   Indicator.vala
+  SessionSettings.vala
+  SessionWidget.vala
   ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
   wingpanel-2.0
   posix
+  granite
 OPTIONS
   --thread
 )
 
=== added file 'src/GreeterWidget.vala'
--- src/GreeterWidget.vala	1970-01-01 00:00:00 +0000
+++ src/GreeterWidget.vala	2015-09-09 21:31:57 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class A11Y.GreeterWidget : Gtk.Grid {
+    KeyFile settings;
+    Gtk.Window keyboard_window;
+    int keyboard_pid;
+
+    public GreeterWidget () {
+        settings = new KeyFile ();
+
+        /*
+         * we could load /etc/lightdm/pantheon-greeter.conf but all keys are commented there.
+         * setting defaults instead to prevent needless warnings
+         */
+        settings.set_boolean ("greeter", "high-contrast", false);
+        settings.set_boolean ("greeter", "onscreen-keyboard", false);
+        /*
+         * try {
+         *     settings.load_from_file ("/etc/lightdm/pantheon-greeter.conf",
+         *                              KeyFileFlags.KEEP_COMMENTS);
+         * } catch (Error e) {
+         *     warning (e.message);
+         * }
+         */
+        int position = 0;
+        var onscreen_keyboard = new Wingpanel.Widgets.Switch (_("Onscreen Keyboard"), false);
+        onscreen_keyboard.switched.connect (() => {
+            toggle_keyboard (onscreen_keyboard.get_active ());
+        });
+        attach (onscreen_keyboard, 0, position++, 1, 1);
+        try {
+            onscreen_keyboard.set_active (settings.get_boolean ("greeter", "onscreen-keyboard"));
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        var high_contrast = new Wingpanel.Widgets.Switch (_("HighContrast"), false);
+        high_contrast.switched.connect (() => {
+            Gtk.Settings.get_default ().gtk_theme_name = high_contrast.get_active () ? "HighContrastInverse" : "elementary";
+            settings.set_boolean ("greeter", "high-contrast", high_contrast.get_active ());
+        });
+        attach (high_contrast, 0, position++, 1, 1);
+        try {
+            high_contrast.set_active (settings.get_boolean ("greeter", "high-contrast"));
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+
+    ~GreeterWidget () {
+        if (keyboard_pid != 0) {
+            Posix.kill (keyboard_pid, Posix.SIGKILL);
+            int status;
+            Posix.waitpid (keyboard_pid, out status, 0);
+            keyboard_pid = 0;
+        }
+    }
+
+    private void toggle_keyboard (bool active) {
+        if (keyboard_window != null) {
+            keyboard_window.visible = active;
+            settings.set_boolean ("greeter", "onscreen-keyboard", active);
+
+            return;
+        }
+
+        int id = 0;
+        int onboard_stdout_fd;
+
+        try {
+            string[] argv;
+            Shell.parse_argv ("onboard --xid", out argv);
+            Process.spawn_async_with_pipes (null, argv, null, SpawnFlags.SEARCH_PATH, null, out keyboard_pid, null, out onboard_stdout_fd, null);
+
+            var f = FileStream.fdopen (onboard_stdout_fd, "r");
+            var stdout_text = new char[1024];
+            f.gets (stdout_text);
+            id = int.parse ((string)stdout_text);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        var keyboard_socket = new Gtk.Socket ();
+        keyboard_window = new Gtk.Window ();
+        keyboard_window.accept_focus = false;
+        keyboard_window.focus_on_map = false;
+        keyboard_window.add (keyboard_socket);
+        keyboard_socket.add_id (id);
+
+        var screen = Gdk.Screen.get_default ();
+        var monitor = screen.get_primary_monitor ();
+        Gdk.Rectangle geom;
+        screen.get_monitor_geometry (monitor, out geom);
+        keyboard_window.move (geom.x, geom.y + geom.height - 200);
+        keyboard_window.resize (geom.width, 200);
+        keyboard_window.set_keep_above (true);
+
+        keyboard_window.show_all ();
+        settings.set_boolean ("greeter", "onscreen-keyboard", true);
+    }
+}
 
=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-08-04 20:33:38 +0000
+++ src/Indicator.vala	2015-09-09 21:31:57 +0000
@@ -21,41 +21,13 @@
     Wingpanel.Widgets.OverlayIcon panel_icon;
     Gtk.Grid main_grid;
 
-    KeyFile settings;
-    Gtk.Window keyboard_window;
-    int keyboard_pid;
+    public Wingpanel.IndicatorManager.ServerType server_type { get; construct set; }
 
-    public Indicator () {
+    public Indicator (Wingpanel.IndicatorManager.ServerType indicator_server_type) {
         Object (code_name: "a11y",
                 display_name: _("Accessibility"),
-                description: _("Accessibility indicator"));
-
-        this.visible = true;
-        settings = new KeyFile ();
-
-        /*
-         * we could load /etc/lightdm/pantheon-greeter.conf but all keys are commented there.
-         * setting defaults instead to prevent needless warnings
-         */
-        settings.set_boolean ("greeter", "high-contrast", false);
-        settings.set_boolean ("greeter", "onscreen-keyboard", false);
-        /*
-         * try {
-         *     settings.load_from_file ("/etc/lightdm/pantheon-greeter.conf",
-         *                              KeyFileFlags.KEEP_COMMENTS);
-         * } catch (Error e) {
-         *     warning (e.message);
-         * }
-         */
-    }
-
-    ~Indicator () {
-        if (keyboard_pid != 0) {
-            Posix.kill (keyboard_pid, Posix.SIGKILL);
-            int status;
-            Posix.waitpid (keyboard_pid, out status, 0);
-            keyboard_pid = 0;
-        }
+                description: _("Accessibility indicator"),
+                server_type: indicator_server_type);
     }
 
     public override Gtk.Widget get_display_widget () {
@@ -68,79 +40,22 @@
 
     public override Gtk.Widget? get_widget () {
         if (main_grid == null) {
-            int position = 0;
-            main_grid = new Gtk.Grid ();
-
-            var onscreen_keyboard = new Wingpanel.Widgets.Switch (_("Onscreen Keyboard"), false);
-            onscreen_keyboard.switched.connect (() => {
-                toggle_keyboard (onscreen_keyboard.get_active ());
-            });
-            main_grid.attach (onscreen_keyboard, 0, position++, 1, 1);
-            try {
-                onscreen_keyboard.set_active (settings.get_boolean ("greeter", "onscreen-keyboard"));
-            } catch (Error e) {
-                warning (e.message);
-            }
-
-            var high_contrast = new Wingpanel.Widgets.Switch (_("HighContrast"), false);
-            high_contrast.switched.connect (() => {
-                Gtk.Settings.get_default ().gtk_theme_name = high_contrast.get_active () ? "HighContrastInverse" : "elementary";
-                settings.set_boolean ("greeter", "high-contrast", high_contrast.get_active ());
-            });
-            main_grid.attach (high_contrast, 0, position++, 1, 1);
-            try {
-                high_contrast.set_active (settings.get_boolean ("greeter", "high-contrast"));
-            } catch (Error e) {
-                warning (e.message);
+            if (server_type == Wingpanel.IndicatorManager.ServerType.GREETER) {
+                this.visible = true;
+                main_grid = new GreeterWidget ();
+            } else {
+                var visible_settings = new A11ySettings ();
+                this.visible = visible_settings.always_show_universal_access_status;
+                visible_settings.notify.connect (() => {
+                    this.visible = visible_settings.always_show_universal_access_status;
+                });
+                main_grid = new SessionWidget ();
             }
         }
 
         return main_grid;
     }
 
-    private void toggle_keyboard (bool active) {
-        if (keyboard_window != null) {
-            keyboard_window.visible = active;
-            settings.set_boolean ("greeter", "onscreen-keyboard", active);
-
-            return;
-        }
-
-        int id = 0;
-        int onboard_stdout_fd;
-
-        try {
-            string[] argv;
-            Shell.parse_argv ("onboard --xid", out argv);
-            Process.spawn_async_with_pipes (null, argv, null, SpawnFlags.SEARCH_PATH, null, out keyboard_pid, null, out onboard_stdout_fd, null);
-
-            var f = FileStream.fdopen (onboard_stdout_fd, "r");
-            var stdout_text = new char[1024];
-            f.gets (stdout_text);
-            id = int.parse ((string)stdout_text);
-        } catch (Error e) {
-            warning (e.message);
-        }
-
-        var keyboard_socket = new Gtk.Socket ();
-        keyboard_window = new Gtk.Window ();
-        keyboard_window.accept_focus = false;
-        keyboard_window.focus_on_map = false;
-        keyboard_window.add (keyboard_socket);
-        keyboard_socket.add_id (id);
-
-        var screen = Gdk.Screen.get_default ();
-        var monitor = screen.get_primary_monitor ();
-        Gdk.Rectangle geom;
-        screen.get_monitor_geometry (monitor, out geom);
-        keyboard_window.move (geom.x, geom.y + geom.height - 200);
-        keyboard_window.resize (geom.width, 200);
-        keyboard_window.set_keep_above (true);
-
-        keyboard_window.show_all ();
-        settings.set_boolean ("greeter", "onscreen-keyboard", true);
-    }
-
     public override void opened () {
     }
 
@@ -150,11 +65,5 @@
 
 public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
     debug ("Activating Accessibility Indicator");
-
-    /* Only show a11y in greeter */
-    if (server_type == Wingpanel.IndicatorManager.ServerType.GREETER) {
-        return new A11Y.Indicator ();
-    }
-
-    return null;
+    return new A11Y.Indicator (server_type);
 }
 \ No newline at end of file
 
=== added file 'src/SessionSettings.vala'
--- src/SessionSettings.vala	1970-01-01 00:00:00 +0000
+++ src/SessionSettings.vala	2015-09-09 21:31:57 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2015 Pantheon Developers (https://launchpad.net/switchboardswitchboard-plug-a11y)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.Actualy, if you have windows just use
+ *
+ * Authored by: Felipe Escoto <[e-mail]>
+ */
+
+public class A11Y.DesktopInterface : Granite.Services.Settings {
+    private const string HIGH_CONTRAST_THEME = "HighContrast";
+
+    public string gtk_theme { get; set; }
+    public string icon_theme { get; set; }
+
+    private WmSettings wm_settings;
+
+    public DesktopInterface () {
+        base ("org.gnome.desktop.interface");
+        wm_settings = new WmSettings ();
+    }
+
+    public bool get_high_contrast () {
+        if (gtk_theme == HIGH_CONTRAST_THEME) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void set_high_contrast (bool state) {
+        if (state) {
+            gtk_theme = HIGH_CONTRAST_THEME;
+            icon_theme = HIGH_CONTRAST_THEME;
+        } else {
+            schema.reset ("gtk-theme");
+            schema.reset ("icon-theme");
+            wm_settings.schema.reset ("theme");
+        }
+    }
+}
+
+public class A11Y.A11ySettings : Granite.Services.Settings {
+    public bool always_show_universal_access_status { get; set; }
+
+    public A11ySettings () {
+        base ("org.gnome.desktop.a11y");
+    }
+}
+
+public class A11Y.WmSettings : Granite.Services.Settings {
+    public string? theme { get; set; }
+    public WmSettings () {
+        base ("org.gnome.desktop.wm.preferences");
+    }
+}
 \ No newline at end of file
 
=== added file 'src/SessionWidget.vala'
--- src/SessionWidget.vala	1970-01-01 00:00:00 +0000
+++ src/SessionWidget.vala	2015-09-09 21:31:57 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class A11Y.SessionWidget : Gtk.Grid {
+
+    public SessionWidget () {
+        var desktop_interface = new DesktopInterface ();
+
+        var high_contrast = new Wingpanel.Widgets.Switch (_("HighContrast"), false);
+        high_contrast.switched.connect (() => {
+            desktop_interface.set_high_contrast (high_contrast.get_active ());
+        });
+        attach (high_contrast, 0, 0, 1, 1);
+        high_contrast.set_active (desktop_interface.get_high_contrast ());
+        desktop_interface.notify["gtk-theme"].connect (() => {
+            high_contrast.set_active (desktop_interface.get_high_contrast ());
+        });
+    }
+
+}