Merge lp:~philip.scott/switchboard-plug-a11y/enable-animations into lp:~elementary-pantheon/switchboard-plug-a11y/trunk

[Felipe Escoto]

Disable animations switch

Enable/disable animations switch

=== modified file 'src/Backend/Settings.vala'
--- src/Backend/Settings.vala	2015-09-03 01:41:51 +0000
+++ src/Backend/Settings.vala	2016-06-15 22:08:02 +0000
@@ -246,3 +246,11 @@
         base ("org.gnome.desktop.a11y.mouse");
     }
 }
+
+public class Accessibility.Backend.Animations : Granite.Services.Settings {
+    public bool enable_animations { get; set; }
+
+    public Animations () {
+        base ("org.pantheon.desktop.gala.animations");
+    }
+}

=== modified file 'src/Panes/General.vala'
--- src/Panes/General.vala	2015-11-27 15:54:08 +0000
+++ src/Panes/General.vala	2016-06-15 22:08:02 +0000
@@ -20,8 +20,9 @@
  * Authored by: Felipe Escoto <[e-mail]>
  */
 public class Accessibility.Panes.General : Categories.Pane {
-    private Gtk.Switch keyboard;
-    private Gtk.Switch panel;
+    //private Gtk.Switch keyboard;
+    //private Gtk.Switch panel;
+    private Gtk.Switch animations;
 
     public General () {
         base (_("General"), "preferences-desktop-accessibility");
@@ -34,8 +35,9 @@
 
     private void build_ui () {
         var general = new Accessibility.Widgets.SettingsBox ();
-        keyboard = general.add_switch (_("Turn accessibility features on and off using the keyboard:"));
-        panel = general.add_switch (_("Display accessibility menu in panel:"));
+        //keyboard = general.add_switch (_("Turn accessibility features on and off using the keyboard:"));
+        //panel = general.add_switch (_("Display accessibility menu in panel:"));
+        animations = general.add_switch (_("Animations"));
 
         grid.add (general);
 
@@ -43,7 +45,8 @@
     }
 
     private void connect_signals () {
-        keyboard_settings.schema.bind ("enable", keyboard, "active", SettingsBindFlags.DEFAULT);
-        a11y_settings.schema.bind ("always-show-universal-access-status", panel, "active", SettingsBindFlags.DEFAULT);
+        //keyboard_settings.schema.bind ("enable", keyboard, "active", SettingsBindFlags.DEFAULT);
+        //a11y_settings.schema.bind ("always-show-universal-access-status", panel, "active", SettingsBindFlags.DEFAULT);
+        animations_settings.schema.bind ("enable-animations", animations, "active", SettingsBindFlags.DEFAULT);
     }
 }

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-04-25 11:59:24 +0000
+++ src/Plug.vala	2016-06-15 22:08:02 +0000
@@ -31,6 +31,7 @@
     public Accessibility.Backend.Peripherals        peripherals_settings;
     public Accessibility.Backend.Mouse              mouse_settings;
     public Accessibility.Backend.MediaKeys          media_keys_settings;
+    public Accessibility.Backend.Animations         animations_settings;
 
     public class Plug : Switchboard.Plug {
         Gtk.Paned paned;
@@ -54,6 +55,7 @@
             peripherals_settings =      new Accessibility.Backend.Peripherals ();
             mouse_settings =            new Accessibility.Backend.Mouse ();
             media_keys_settings =       new Accessibility.Backend.MediaKeys ();
+            animations_settings =       new Accessibility.Backend.Animations ();
         }
 
         public override Gtk.Widget get_widget () {

=== modified file 'src/Widgets/Categories.vala'
--- src/Widgets/Categories.vala	2016-04-15 19:13:14 +0000
+++ src/Widgets/Categories.vala	2016-06-15 22:08:02 +0000
@@ -35,7 +35,7 @@
         add (list_box);
 
         var general = new Panes.General ();
-        //list_box.add (general); FIXME: These options currently do nothing
+        list_box.add (general);
 
         var display = new Panes.Display ();
         list_box.add (display);