diff --git a/.gitignore b/.gitignore index a93d3342a..e01f1ea24 100644 --- a/.gitignore +++ b/.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 diff --git a/configure.ac b/configure.ac index 1225e71ec..20e4347a6 100644 --- a/configure.ac +++ b/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], diff --git a/data/Makefile.am b/data/Makefile.am index b5d0dc626..359c729dc 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -55,9 +55,7 @@ dist_theme_DATA = \ theme/ws-switch-arrow-up.svg \ theme/ws-switch-arrow-down.svg -gsettings_SCHEMAS = \ - org.gnome.accessibility.magnifier.gschema.xml \ - org.gnome.shell.gschema.xml +gsettings_SCHEMAS = 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 = \ diff --git a/data/org.gnome.accessibility.magnifier.gschema.xml.in b/data/org.gnome.accessibility.magnifier.gschema.xml.in deleted file mode 100644 index 7958fcac9..000000000 --- a/data/org.gnome.accessibility.magnifier.gschema.xml.in +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - false - <_summary>Show or hide the magnifier - <_description> - Show or hide the magnifier and all of its zoom regions. - - - - 'proportional' - <_summary>Mouse Tracking Mode - <_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. - - - - 'full-screen' - <_summary>Screen position - <_description> - The magnified view either fills the entire screen, or occupies the - top-half, bottom-half, left-half, or right-half of the screen. - - - - 2.0 - <_summary>Magnification factor - <_description> - The power of the magnification. A value of 1.0 means no magnification. - A value of 2.0 doubles the size. - - - - false - <_summary>Enable lens mode - <_description> - Whether the magnified view should be centered over the location of - the system mouse and move with it. - - - - false - <_summary> - Scroll magnified contents beyond the edges of the desktop - - <_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. - - - - - - false - <_summary>Show or hide crosshairs - <_description> - Enables/disables display of crosshairs centered on the magnified - mouse sprite. - - - - 8 - <_summary>Thickness of the crosshairs - <_description> - Width of the vertical and horizontal lines that make up the crosshairs. - - - - '#ff0000' - <_summary>Color of the crosshairs - <_description> - The color of the the vertical and horizontal lines that make up - the crosshairs. - - - - 169 - <_summary>Opacity of the crosshairs - <_description> - Determines the transparency of the crosshairs, from fully opaque - to fully transparent. - - - - 4096 - <_summary>Length of the crosshairs - <_description> - Determines the length of the vertical and horizontal lines that - make up the crosshairs. - - - - false - <_summary>Clip the crosshairs at the center - <_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. - - - - diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js index 91a0e773f..3e60c24c8 100644 --- a/js/ui/magnifier.js +++ b/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. diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js index 11a95f373..b6c7b0826 100644 --- a/js/ui/status/accessibility.js +++ b/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'; diff --git a/po/POTFILES.in b/po/POTFILES.in index c49513d36..c574872cf 100644 --- a/po/POTFILES.in +++ b/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