Ticket #1669: 0001-accessibility.patch

bin/sugar-session

@@ -213 +213 @@
     settings = gtk.settings_get_default()
     settings.set_property("gtk-font-name", "%s %f" % (face, size))
 
+def set_accessibility():
+    client = gconf.client_get_default()
+    is_accessibility = client.dir_exists("/desktop/sugar/accessibility")
+    if is_accessibility:
+        set_accessibility_keyboard()
+
+def get_mouseKeys():
+    client = gconf.client_get_default()
+    return client.get_bool("/desktop/sugar/accessibility/mouse_keys")
+
+def get_stickyKeys():    
+    client = gconf.client_get_default()
+    return client.get_bool("/desktop/sugar/accessibility/sticky_keys")
+
+def get_bounceKeys():
+    client = gconf.client_get_default()
+    return client.get_bool("/desktop/sugar/accessibility/bounce_keys")
+
+def set_accessibility_keyboard():
+    is_stickyKeys = get_stickyKeys()
+    is_bounceKeys = get_bounceKeys()
+    is_mouseKeys =  get_mouseKeys()
+    if is_mouseKeys or is_bounceKeys or is_mouseKeys:
+        if is_stickyKeys:
+            cmd_stiky = '+stickykeys'
+        else:
+            cmd_stiky = '-stickykeys'
+        if is_bounceKeys:
+            cmd_bounce = '+bouncekeys'
+        else:
+            cmd_bounce = '-bouncekeys'
+        if is_mouseKeys:            
+            subprocess.call(['ax', cmd_bounce, cmd_stiky, '+mousekeys', 'mousemaxspeed','3000', 'mousetimetomax', '1000', '-timeout', '-repeatkeys'])
+        else:
+            subprocess.call(['ax', cmd_bounce, cmd_stiky, '-mousekeys', 'mousemaxspeed', '3000', 'mousetimetomax', '1000', '+timeout', '+repeatkeys'])
+
 def main():
     cleanup_logs()
     logger.start('shell')
@@ -250 +286 @@
     screen = wnck.screen_get_default()
     screen.connect('window-manager-changed', __window_manager_changed_cb)
 
+    set_accessibility()
+
     try:
         gtk.main()
     except KeyboardInterrupt:

data/icons/Makefile.am

@@ -3 +3 @@
 sugar_DATA =                        \
         module-about_me.svg             \
         module-about_my_computer.svg    \
+        module-accessibility.svg        \
         module-date_and_time.svg        \
         module-frame.svg                \
         module-keyboard.svg             \
         module-language.svg             \
         module-network.svg              \
         module-power.svg                \
-        module-updater.svg
+        module-updater.svg              
+
 
 EXTRA_DIST = $(sugar_DATA)

new file data/icons/module-accessibility.svg

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="55"
+   height="55"
+   id="svg795"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   version="1.0"
+   sodipodi:docname="acc79.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs797">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective803" />
+    <inkscape:perspective
+       id="perspective813"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective813-2"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1380"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1380-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1448"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1448-2"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1479"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1501"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1523"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1545"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1567"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1589"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective1617"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective51"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective97"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective53"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="39.65323"
+     inkscape:cy="29.255214"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:object-paths="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="829"
+     inkscape:window-x="0"
+     inkscape:window-y="25">
+    <sodipodi:guide
+       orientation="0,1"
+       position="27.021581,50.002551"
+       id="guide1605" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="27.021581,6.0609153"
+       id="guide1607" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata800">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ffffff"
+       id="path12"
+       sodipodi:cx="-32.640553"
+       sodipodi:cy="30.440666"
+       sodipodi:rx="8.901969"
+       sodipodi:ry="11.301082"
+       d="m -23.738584,30.440666 a 8.901969,11.301082 0 1 1 -17.803937,0 8.901969,11.301082 0 1 1 17.803937,0 z"
+       transform="matrix(1.2765958,0,0,1.0558659,19.192898,-13.127946)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1.44962609;stroke-opacity:1"
+       d="m 30.145644,37.823484 c -0.583589,6.659344 -6.7511,11.52268 -13.775517,10.862567 C 9.3457054,48.02594 4.1243814,42.092348 4.7079694,35.433004 5.2915594,28.773661 20.67887,20.597949 14.885997,24.011638 -12.777062,40.313232 24.43362,62.068174 30.145644,37.823484 z"
+       id="path1405-0"
+       sodipodi:nodetypes="csssc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50547338;stroke-opacity:1"
+       id="rect1438-8"
+       width="2.916333"
+       height="21.188446"
+       x="18.332197"
+       y="13.76814"
+       ry="1.3939767" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.41987956;stroke-opacity:1"
+       id="rect1438-1-87"
+       width="2.8716421"
+       height="19.140917"
+       x="-35.091366"
+       y="-38.207035"
+       ry="1.259271"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.21988189;stroke-opacity:1"
+       id="rect1438-0-4"
+       width="2.5733202"
+       height="15.766372"
+       x="-5.4068875"
+       y="-65.997124"
+       ry="1.0372615"
+       transform="matrix(-0.55477829,0.83199823,-0.68762037,-0.72607041,0,0)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.98759735;stroke-opacity:1"
+       id="rect1438-0-1-8"
+       width="2.0588"
+       height="12.916228"
+       x="6.7647386"
+       y="-38.278324"
+       ry="0.84975183"
+       transform="matrix(-0.21998034,0.97550431,-0.88967727,-0.45658992,0,0)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.69142139;stroke-opacity:1"
+       id="rect1438-1-8-5"
+       width="0.98179615"
+       height="13.275604"
+       x="-30.243309"
+       y="-41.495876"
+       ry="0.87339497"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.64177793;stroke-opacity:1"
+       id="rect1438-1-8-0-0"
+       width="0.97070193"
+       height="11.568416"
+       x="50.822704"
+       y="-8.6089849"
+       ry="0.76108003"
+       transform="matrix(0.89791652,0.44016579,0.56230073,-0.82693282,0,0)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.68172067;stroke-opacity:1"
+       id="rect1438-0-1-7-7"
+       width="1.6299056"
+       height="7.7739253"
+       x="72.759727"
+       y="35.364716"
+       ry="0.51144254"
+       transform="matrix(0.9888174,0.14913131,-0.60877492,0.79334299,0,0)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1"
+       id="path1603-2"
+       sodipodi:cx="76.392784"
+       sodipodi:cy="18.634508"
+       sodipodi:rx="3.2829957"
+       sodipodi:ry="3.0304577"
+       d="m 79.67578,18.634508 a 3.2829957,3.0304577 0 1 1 -6.565992,0 3.2829957,3.0304577 0 1 1 6.565992,0 z"
+       transform="matrix(1.5397454,0,0,1.4719643,-97.932275,-17.750188)" />
+  </g>
+</svg>

extensions/cpsection/Makefile.am

@@ -1 @@
-SUBDIRS = aboutme aboutcomputer datetime frame keyboard language network power updater
+SUBDIRS = aboutme aboutcomputer accessibility datetime frame keyboard language network power updater
 
 sugardir = $(pkgdatadir)/extensions/cpsection
 sugar_PYTHON = __init__.py

new file extensions/cpsection/accessibility/Makefile.am

@@ +1 @@
+sugardir = $(pkgdatadir)/extensions/cpsection/accessibility
+
+sugar_PYTHON =          \
+        __init__.py     \
+        model.py        \
+        view.py         

new file extensions/cpsection/accessibility/__init__.py

@@ +1 @@
+# Copyright (C) 2008, OLPC
+#
+# 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+from gettext import gettext as _
+
+CLASS = 'accessibility'
+ICON = 'module-accessibility'
+TITLE = 'Accesibilidad'
+

new file extensions/cpsection/accessibility/model.py

@@ +1 @@
+import subprocess
+import os
+import dbus
+import ConfigParser
+import gconf
+
+from gettext import gettext as _
+from sugar import profile
+
+KEYWORDS = ['mouseKeys', 'stickyKeys', 'bounceKeys']
+
+######################################################
+
+def get_mouseKeys():
+    client = gconf.client_get_default()
+    return client.get_bool("/desktop/sugar/accessibility/mouse_keys")
+
+def set_mouseKeys(activar):
+    client = gconf.client_get_default()
+    client.set_bool("/desktop/sugar/accessibility/mouse_keys", activar)
+    ejecutar_config()
+
+def print_mouseKeys():
+    print str(get_mouseKeys())
+
+######################################################
+
+def get_stickyKeys():    
+    client = gconf.client_get_default()
+    return client.get_bool("/desktop/sugar/accessibility/sticky_keys")
+
+def set_stickyKeys(activar):
+    client = gconf.client_get_default()
+    client.set_bool("/desktop/sugar/accessibility/sticky_keys", activar)
+    ejecutar_config()
+
+def print_stickyKeys():
+    print str(get_stickyKeys())
+
+######################################################
+
+def get_bounceKeys():
+    client = gconf.client_get_default()
+    return client.get_bool("/desktop/sugar/accessibility/bounce_keys")
+
+def set_bounceKeys(activar):
+    client = gconf.client_get_default()
+    client.set_bool("/desktop/sugar/accessibility/bounce_keys", activar)
+    ejecutar_config()
+
+def print_bounceKeys():
+    print str(get_bounceKeys())
+
+######################################################
+
+def ejecutar_config():
+    if get_stickyKeys():
+        cmd_stiky = '+stickykeys'
+    else:
+        cmd_stiky = '-stickykeys'
+    if get_bounceKeys():
+        cmd_bounce = '+bouncekeys'
+    else:
+        cmd_bounce = '-bouncekeys'
+    if get_mouseKeys():
+            subprocess.call(['ax', cmd_bounce, cmd_stiky, '+mousekeys', 'mousemaxspeed','3000', 'mousetimetomax', '1000', '-timeout', '-repeatkeys'])
+    else:
+            subprocess.call(['ax', cmd_bounce, cmd_stiky, '-mousekeys', 'mousemaxspeed', '3000', 'mousetimetomax', '1000', '+timeout', '+repeatkeys'])

new file extensions/cpsection/accessibility/view.py

@@ +1 @@
+# Este archivo usa el encoding: utf-8
+
+import gtk
+from gettext import gettext as _
+
+from sugar.graphics import style
+
+from jarabe import config
+from jarabe.controlpanel.sectionview import SectionView
+from jarabe.controlpanel.inlinealert import InlineAlert
+
+class accessibility(SectionView):
+    def __init__(self, model, alerts=None):
+        SectionView.__init__(self)
+
+        self._model = model
+        self.set_border_width(style.DEFAULT_SPACING * 2)
+        self.set_spacing(style.DEFAULT_SPACING)
+        group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
+     
+        separator_pm = gtk.HSeparator()
+        self.pack_start(separator_pm, expand=False)
+        separator_pm.show()
+
+        label_pm_teclado = gtk.Label(_('Teclado'))
+        label_pm_teclado.set_alignment(0, 0)
+        self.pack_start(label_pm_teclado, expand=False)
+        label_pm_teclado.show()
+
+        box_pm = gtk.VBox()
+        box_pm.set_border_width(style.DEFAULT_SPACING * 2)
+        box_pm.set_spacing(style.DEFAULT_SPACING)        
+        #############################################################
+        self.btn_mousekeys = gtk.CheckButton("  Teclas del ratón")
+        self._mouse_pm_change_handler = self.btn_mousekeys.connect("toggled", self.set_mouseKeys)
+        self.estado_inicial_mouseKeys = self._model.get_mouseKeys() 
+        if self.estado_inicial_mouseKeys:
+            self.btn_mousekeys.set_active(True)
+        else:
+            self.btn_mousekeys.set_active(False)            
+        box_pm.pack_start(self.btn_mousekeys, True, True, 2)
+        self.btn_mousekeys.show()
+
+        lbl_mouse = gtk.Label('        Permite mover el puntero del ratón utilizando un teclado numérico \n        o las teclas de juego.')
+        lbl_mouse.set_alignment(0, 0)
+        box_pm.pack_start(lbl_mouse, True, True, 2)
+        lbl_mouse.show()
+
+        #############################################################
+        self.btn_stickykeys = gtk.CheckButton("  Teclas pegajosas")
+        self._sticky_pm_change_handler = self.btn_stickykeys.connect("toggled", self.set_stickyKeys)
+        self.estado_inicial_stickyKeys = self._model.get_stickyKeys()
+        if self.estado_inicial_stickyKeys:
+            self.btn_stickykeys.set_active(True)
+        else:
+            self.btn_stickykeys.set_active(False)
+        box_pm.pack_start(self.btn_stickykeys, True, True, 2)
+        self.btn_stickykeys.show()
+
+        lbl_sticky = gtk.Label('        Permite realizar las combinaciones de teclas que requieren pulsaciones simultáneas, \n        presionando las teclas de una en una. Ej: ctrl + Q')
+        lbl_sticky.set_alignment(0, 0)
+        box_pm.pack_start(lbl_sticky, True, True, 2)
+        lbl_sticky.show()
+        #############################################################
+        self.btn_bouncekeys = gtk.CheckButton("  Teclas de rebote")
+        self._bounce_pm_change_handler = self.btn_bouncekeys.connect("toggled", self.set_bounceKeys)
+        self.estado_inicial_bounceKeys = self._model.get_bounceKeys()
+        if self.estado_inicial_bounceKeys:
+            self.btn_bouncekeys.set_active(True)
+        else:
+            self.btn_bouncekeys.set_active(False)
+        box_pm.pack_start(self.btn_bouncekeys, True, True, 2)
+        self.btn_bouncekeys.show()
+
+        lbl_bounce = gtk.Label('        Ignora la presión rápida y repetida de una tecla,\n        el sistema la tomará como una única pulsación.')
+        lbl_bounce.set_alignment(0, 0)
+        box_pm.pack_start(lbl_bounce, True, True, 2)
+        lbl_bounce.show()
+
+        #############################################################
+
+        self.pack_start(box_pm, expand=False)
+        box_pm.show()
+    
+    def set_mouseKeys(self, widget):
+        state = widget.get_active()
+        self._model.set_mouseKeys(state)
+
+    def set_stickyKeys(self, widget):
+        state = widget.get_active()
+        self._model.set_stickyKeys(state)
+
+    def set_bounceKeys(self, widget):
+        state = widget.get_active()
+        self._model.set_bounceKeys(state)
+
+    def undo(self):
+        self._model.set_mouseKeys(self.estado_inicial_mouseKeys)
+        self._model.set_stickyKeys(self.estado_inicial_stickyKeys)
+        self._model.set_bounceKeys(self.estado_inicial_bounceKeys)