GNOME.org
 

gnome-settings-daemon r647 - in trunk: . data po

Author: matthiasc
Date: Wed Dec 31 03:16:33 2008
New Revision: 647
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=647&view=rev

Log:
2008-12-30  Matthias Clasen  <mclasen redhat com>

        Bug 565310 â support hotkeys for a11y tools

        * configure.ac: Set GNOME_KEYBINDINGS_KEYSDIR.

        * data/gnome-settings-daemon.schemas.in: Add missing schemas for
        the keys in /destkop/gnome/applications/at, and also add new
        schemas for keys in /desktop/gnome/keybindings that define
        global keybindings for turning ATs on and off. Todo: There are no
        default key combinations in the schema yet.

        * data/50-accessibility.xml.in: Keybinding file to group the
        new keybindings in an "Accessibility" section in the keybinding
        capplet.

        * data/Makefile.am: Install the keybinding file in the proper
        location.

        * po/POTFILES.in: Add 50-accessibility.xml.in.


Added:
   trunk/data/50-accessibility.xml.in
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/gnome-settings-daemon.schemas.in
   trunk/po/POTFILES.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Dec 31 03:16:33 2008
@@ -36,6 +36,10 @@
 GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
 
+ dnl Unconditionally use this dir to avoid a circular dep with gnomecc
+GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
+AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
+
 dnl ---------------------------------------------------------------------------
 dnl - Dependencies
 dnl ---------------------------------------------------------------------------

Added: trunk/data/50-accessibility.xml.in
==============================================================================
--- (empty file)
+++ trunk/data/50-accessibility.xml.in	Wed Dec 31 03:16:33 2008
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries _name="Accessibility">
+
+	<KeyListEntry name="/desktop/gnome/keybindings/magnifier/binding"/>
+	<KeyListEntry name="/desktop/gnome/keybindings/screenreader/binding"/>
+	<KeyListEntry name="/desktop/gnome/keybindings/onscreenkeyboard/binding"/>
+
+</KeyListEntries>

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Dec 31 03:16:33 2008
@@ -29,6 +29,12 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnome-settings-daemon.pc
 
+ INTLTOOL_XML_NOMERGE_RULE@
+
+xmldir = @GNOME_KEYBINDINGS_KEYSDIR@
+xml_in_files = 50-accessibility.xml.in
+xml_DATA = $(xml_in_files:.xml.in=.xml)
+
 EXTRA_DIST = 				\
 	$(schemas_in_files)		\
 	$(service_in_files)		\

Modified: trunk/data/gnome-settings-daemon.schemas.in
==============================================================================
--- trunk/data/gnome-settings-daemon.schemas.in	(original)
+++ trunk/data/gnome-settings-daemon.schemas.in	Wed Dec 31 03:16:33 2008
@@ -347,5 +347,176 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/keybindings/magnifier/binding</key>
+      <applyto>/desktop/gnome/keybindings/magnifier/binding</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Toggle magnifier</short>
+        <long>
+          Binding to toggle the magnifier.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/keybindings/magnifier/action</key>
+      <applyto>/desktop/gnome/keybindings/magnifier/action</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>string</type>
+      <default>gconftool-2 --toggle /desktop/gnome/applications/at/screen_magnifier_enabled</default>
+      <locale name="C">
+        <short>Toggle magnifier</short>
+        <long>
+          Command used to turn the magnifier on or off.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/keybindings/screenreader/binding</key>
+      <applyto>/desktop/gnome/keybindings/screenreader/binding</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Toggle screen reader</short>
+        <long>
+          Binding to toggle the screen reader.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/keybindings/screenreader/action</key>
+      <applyto>/desktop/gnome/keybindings/screenreader/action</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>string</type>
+      <default>gconftool-2 --toggle /desktop/gnome/applications/at/screen_reader_enabled</default>
+      <locale name="C">
+        <short>Toggle screen reader</short>
+        <long>
+          Command used to turn the screen reader on or off.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/keybindings/onscreenkeyboard/binding</key>
+      <applyto>/desktop/gnome/keybindings/onscreenkeyboard/binding</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Toggle on-screen keyboard</short>
+        <long>
+          Binding to toggle the on-screen keyboard.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/keybindings/onscreenkeyboard/action</key>
+      <applyto>/desktop/gnome/keybindings/onscreenkeyboard/action</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>string</type>
+      <default>gconftool-2 --toggle /desktop/gnome/applications/at/screen_keyboard_enabled</default>
+      <locale name="C">
+        <short>Toggle on-screen keyboard</short>
+        <long>
+          Command used to turn the on-screen keyboard on or off.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/accessibility/keyboard/stickykeys_enable</key>
+      <applyto>/desktop/gnome/accessibility/keyboard/stickykeys_enable</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Sticky keys</short>
+        <long>
+          Whether the sticky keys keyboard accessibility feature is turned on.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_enable</key>
+      <applyto>/desktop/gnome/accessibility/keyboard/bouncekeys_enable</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Bounce keys</short>
+        <long>
+          Whether the bounce keys keyboard accessibility feature is turned on.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/accessibility/keyboard/slowkeys_enable</key>
+      <applyto>/desktop/gnome/accessibility/keyboard/slowkeys_enable</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Slow keys</short>
+        <long>
+          Whether the slow keys keyboard accessibility feature is turned on.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/accessibility/keyboard/mousekeys_enable</key>
+      <applyto>/desktop/gnome/accessibility/keyboard/mousekeys_enable</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Mouse keys</short>
+        <long>
+          Whether the mouse keys keyboard accessibility feature is turned on.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/applications/at/screen_keyboard_enabled</key>
+      <applyto>/desktop/gnome/applications/at/screen_keyboard_enabled</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>On-screen keyboard</short>
+        <long>
+          Whether the on-screen keyboard is turned on.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/applications/at/screen_magnifier_enabled</key>
+      <applyto>/desktop/gnome/applications/at/screen_magnifier_enabled</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Screen magnifier</short>
+        <long>
+          Whether the screen magnifier is turned on.
+        </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/applications/at/screen_reader_enabled</key>
+      <applyto>/desktop/gnome/applications/at/screen_reader_enabled</applyto>
+      <owner>gnome-settings-daemon</owner>
+      <type>bool</type>
+      <default>FALSE</default>
+      <locale name="C">
+        <short>Screen reader</short>
+        <long>
+          Whether the screen reader is turned on.
+        </long>
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Dec 31 03:16:33 2008
@@ -7,6 +7,7 @@
 data/desktop_gnome_keybindings.schemas.in
 data/gnome-settings-daemon.desktop.in.in
 data/gnome-settings-daemon.schemas.in
+data/50-accessibility.xml.in
 gnome-settings-daemon/main.c
 [type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.in
 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]