Ticket #1341: sugar-1341.2.patch

extensions/cpsection/keyboard/model.py

@@ -87 +87 @@
         if model:
             return model
         else:
-            return self._configrec.get_model()
+            model = self._configrec.get_model()
+            self.set_model(model)
+            return model
 
     def get_current_layouts(self):
         """Return the enabled keyboard layouts with variants"""
@@ -107 +109 @@
                 layout_list.append('%s(%s)' % (layout, variants[i]))
             i += 1
 
+        self.set_layouts(layout_list)
+
         return layout_list
 
     def get_current_option_group(self):
         """Return the enabled option for switching keyboard group"""
         options = self._gconf_client.get_list(_OPTIONS_KEY, gconf.VALUE_STRING)
-        
+
         if not options:
             options = self._configrec.get_options()
+            self.set_option_group(options)
 
         for option in options:
             if option.startswith(_GROUP_NAME):
                 return option
-        
+
         return None
     
     def get_max_layouts(self):
@@ -135 +140 @@
     def set_option_group(self, option_group):
         """Sets the supplied option for switching keyboard group"""
         #XXX: Merge, not overwrite previous options
-        options = [option_group]
+        options = [option_group or '' ]
         self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, options)
         self._configrec.set_options(options)
         self._configrec.activate(self._engine)

new file extensions/cpsection/keyboard/p

@@ +1 @@
+diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py
+index a5721cd..ab2cd88 100644
+--- a/extensions/cpsection/keyboard/model.py
++++ b/extensions/cpsection/keyboard/model.py
+@@ -18,6 +18,7 @@
+ 
+ import xklavier
+ import gconf
++import logging
+ 
+ 
+ _GROUP_NAME = 'grp' # The XKB name for group switch options
+@@ -87,7 +88,10 @@ class KeyboardManager(object):
+         if model:
+             return model
+         else:
+-            return self._configrec.get_model()
++            model = self._configrec.get_model()
++            logging.error('> %r', model)
++            self._gconf_client.set_string(_MODEL_KEY, model)
++            return model
+ 
+     def get_current_layouts(self):
+         """Return the enabled keyboard layouts with variants"""
+@@ -107,14 +111,21 @@ class KeyboardManager(object):
+                 layout_list.append('%s(%s)' % (layout, variants[i]))
+             i += 1
+ 
++        logging.error('>> %r', layout_list)
++        self._gconf_client.set_list(_LAYOUTS_KEY, gconf.VALUE_STRING,
++                layout_list)
++
+         return layout_list
+ 
+     def get_current_option_group(self):
+         """Return the enabled option for switching keyboard group"""
+         options = self._gconf_client.get_list(_OPTIONS_KEY, gconf.VALUE_STRING)
+-        
++
+         if not options:
+             options = self._configrec.get_options()
++            logging.error('>>> %r', options)
++            self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING,
++                    options)
+ 
+         for option in options:
+             if option.startswith(_GROUP_NAME):
+@@ -128,6 +139,7 @@ class KeyboardManager(object):
+ 
+     def set_model(self, model):
+         """Sets the supplied keyboard model"""
++        logging.error('-> %r', model)
+         self._gconf_client.set_string(_MODEL_KEY, model)
+         self._configrec.set_model(model)
+         self._configrec.activate(self._engine)
+@@ -135,13 +147,18 @@ class KeyboardManager(object):
+     def set_option_group(self, option_group):
+         """Sets the supplied option for switching keyboard group"""
+         #XXX: Merge, not overwrite previous options
+-        options = [option_group]
++        if option_group is None:
++            options = []
++        else:
++            options = [option_group]
++        logging.error('->>> %r', options)
+         self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, options)
+         self._configrec.set_options(options)
+         self._configrec.activate(self._engine)
+ 
+     def set_layouts(self, layouts):
+         """Sets the supplied keyboard layouts (with variants)"""
++        logging.error('->> %r', layouts)
+         self._gconf_client.set_list(_LAYOUTS_KEY, gconf.VALUE_STRING, layouts)
+         layouts_list = []
+         variants_list = []
+diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
+index 04edc4d..074d298 100644
+--- a/extensions/cpsection/keyboard/view.py
++++ b/extensions/cpsection/keyboard/view.py
+@@ -30,7 +30,7 @@ CLASS = 'Language'
+ ICON = 'module-keyboard'
+ TITLE = _('Keyboard')
+ 
+-_APPLY_TIMEOUT = 3000
++_APPLY_TIMEOUT = 500
+ 
+ #TODO: This cpsection adds checks for xklavier in bin/sugar-session and
+ #      src/jarabe/controlpanel/gui.py. We should get rid of these checks

extensions/cpsection/keyboard/view.py

@@ -30 +30 @@
 ICON = 'module-keyboard'
 TITLE = _('Keyboard')
 
-_APPLY_TIMEOUT = 3000
+_APPLY_TIMEOUT = 500
 
 #TODO: This cpsection adds checks for xklavier in bin/sugar-session and
 #      src/jarabe/controlpanel/gui.py. We should get rid of these checks