Move magnifier schemas to gsettings-desktop-schemas

Move the magnifier schemas to gsettings-desktop-schemas to allow them to be
shared between gnome-shell and other applications.

https://bugzilla.gnome.org/show_bug.cgi?id=642034

.gitignore

@@ -21,8 +21,6 @@ data/gnome-shell.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
-data/org.gnome.accessibility.magnifier.gschema.xml
-data/org.gnome.accessibility.magnifier.gschema.valid
 js/misc/config.js
 intltool-extract.in
 intltool-merge.in

configure.ac

@@ -104,6 +104,7 @@ PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
 PKG_CHECK_MODULES(JS_TEST, clutter-x11-1.0 gjs-1.0 gobject-introspection-1.0 gtk+-3.0)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
 
 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],

data/Makefile.am

@@ -55,9 +55,7 @@ dist_theme_DATA =				\
 	theme/ws-switch-arrow-up.svg		\
 	theme/ws-switch-arrow-down.svg
 
-gsettings_SCHEMAS =					\
+gsettings_SCHEMAS = org.gnome.shell.gschema.xml
-	org.gnome.accessibility.magnifier.gschema.xml	\
-	org.gnome.shell.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
@@ -93,7 +91,6 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(gconfschema_DATA)				\
 	$(shaders_DATA)					\
-	org.gnome.accessibility.magnifier.gschema.xml.in \
 	org.gnome.shell.gschema.xml.in
 
 CLEANFILES =						\

data/org.gnome.accessibility.magnifier.gschema.xml.in

@@ -1,133 +0,0 @@
-<schemalist>
-
-  <enum id="MouseTrackingMode">
-    <value nick="none"         value="0"/>
-    <value nick="centered"     value="1"/>
-    <value nick="proportional" value="2"/>
-    <value nick="push"         value="3"/>
-  </enum>
-
-  <enum id="ScreenPosition">
-    <value nick="none"        value="0"/>
-    <value nick="full-screen" value="1"/>
-    <value nick="top-half"    value="2"/>
-    <value nick="bottom-half" value="3"/>
-    <value nick="left-half"   value="4"/>
-    <value nick="right-half"  value="5"/>
-  </enum>
-
-  <schema id="org.gnome.accessibility.magnifier"
-          path="/desktop/gnome/accessibility/magnifier/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="show-magnifier" type="b">
-      <default>false</default>
-      <_summary>Show or hide the magnifier</_summary>
-      <_description>
-        Show or hide the magnifier and all of its zoom regions.
-      </_description>
-    </key>
-    <key name="mouse-tracking" enum="MouseTrackingMode">
-      <default>'proportional'</default>
-      <_summary>Mouse Tracking Mode</_summary>
-      <_description>
-        Determines the position of the magnified mouse image within the
-        magnified view and how it reacts to system mouse movement. The values
-        are
-        - none: no mouse tracking;
-        - centered: the mouse image is
-        displayed at the center of the zoom region (which also represents
-        the point under the system mouse) and the magnified contents are
-        scrolled as the system mouse moves;
-        - proportional: the position of the magnified mouse in the zoom region
-        is proportionally the same as the position of the system mouse on screen;
-        - push: when the magnified mouse intersects a boundary of the zoom
-        region, the contents are scrolled into view.
-      </_description>
-    </key>
-    <key name="screen-position" enum="ScreenPosition">
-      <default>'full-screen'</default>
-      <_summary>Screen position</_summary>
-      <_description>
-        The magnified view either fills the entire screen, or occupies the
-        top-half, bottom-half, left-half, or right-half of the screen.
-      </_description>
-    </key>
-    <key name="mag-factor" type="d">
-      <default>2.0</default>
-      <_summary>Magnification factor</_summary>
-      <_description>
-        The power of the magnification. A value of 1.0 means no magnification.
-        A value of 2.0 doubles the size.
-      </_description>
-    </key>
-    <key name="lens-mode" type="b">
-      <default>false</default>
-      <_summary>Enable lens mode</_summary>
-      <_description>
-        Whether the magnified view should be centered over the location of
-        the system mouse and move with it.
-      </_description>
-    </key>
-    <key name="scroll-at-edges" type="b">
-      <default>false</default>
-      <_summary>
-        Scroll magnified contents beyond the edges of the desktop
-      </_summary>
-      <_description>
-        For centered mouse tracking, when the system pointer is at or near the
-        edge of the screen, the magnified contents continue to scroll such that
-        the screen edge moves into the magnified view.
-      </_description>
-    </key>
-
-    <!-- Cross-hairs -->
-    <key name="show-cross-hairs" type="b">
-      <default>false</default>
-      <_summary>Show or hide crosshairs</_summary>
-      <_description>
-        Enables/disables display of crosshairs centered on the magnified
-        mouse sprite.
-      </_description>
-    </key>
-    <key name="cross-hairs-thickness" type="i">
-      <default>8</default>
-      <_summary>Thickness of the crosshairs</_summary>
-      <_description>
-        Width of the vertical and horizontal lines that make up the crosshairs.
-      </_description>
-    </key>
-    <key name="cross-hairs-color" type="s">
-      <default>'#ff0000'</default>
-      <_summary>Color of the crosshairs</_summary>
-      <_description>
-        The color of the the vertical and horizontal lines that make up
-        the crosshairs.
-      </_description>
-    </key>
-    <key name="cross-hairs-opacity" type="i">
-      <default>169</default>
-      <_summary>Opacity of the crosshairs</_summary>
-      <_description>
-        Determines the transparency of the crosshairs, from fully opaque
-        to fully transparent.
-      </_description>
-    </key>
-    <key name="cross-hairs-length" type="i">
-      <default>4096</default>
-      <_summary>Length of the crosshairs</_summary>
-      <_description>
-        Determines the length of the vertical and horizontal lines that
-        make up the crosshairs.
-      </_description>
-    </key>
-    <key name="cross-hairs-clip" type="b">
-      <default>false</default>
-      <_summary>Clip the crosshairs at the center</_summary>
-      <_description>
-        Determines whether the crosshairs intersect the magnified mouse sprite,
-        or are clipped such that the ends of the horizontal and vertical lines
-        surround the mouse image.
-      </_description>
-    </key>
-  </schema>
-</schemalist>

js/ui/magnifier.js

@@ -438,7 +438,7 @@ Magnifier.prototype = {
     },
 
     _settingsInit: function(zoomRegion) {
-        this._settings = new Gio.Settings({ schema: 'org.gnome.accessibility.magnifier' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.a11y.magnifier' });
 
         if (zoomRegion) {
             // Mag factor is accurate to two decimal places.

js/ui/status/accessibility.js

@@ -23,7 +23,7 @@ const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
 const KEY_SLOW_KEYS_ENABLED   = 'slowkeys-enable';
 const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';
 
-const MAGNIFIER_SCHEMA = 'org.gnome.accessibility.magnifier';
+const MAGNIFIER_SCHEMA = 'org.gnome.desktop.a11y.magnifier';
 const AT_SCREEN_KEYBOARD_SCHEMA = 'org.gnome.desktop.default-applications.at.mobility';
 const AT_SCREEN_READER_SCHEMA   = 'org.gnome.desktop.default-applications.at.visual';
 

po/POTFILES.in

@@ -1,6 +1,5 @@
 data/gnome-shell.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
-data/org.gnome.accessibility.magnifier.gschema.xml.in
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js