diff options
| -rw-r--r-- | extensions/cpsection/keyboard/model.py | 53 | ||||
| -rw-r--r-- | extensions/cpsection/keyboard/view.py | 97 |
2 files changed, 76 insertions, 74 deletions
diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py index 258de78..123e336 100644 --- a/extensions/cpsection/keyboard/model.py +++ b/extensions/cpsection/keyboard/model.py @@ -21,65 +21,64 @@ import gobject import gconf -_GRP_NAME = 'grp' # The XKB name for group switch options +_GROUP_NAME = 'grp' # The XKB name for group switch options _LAYOUTS_KEY = '/desktop/sugar/peripherals/keyboard/layouts' _OPTIONS_KEY = '/desktop/sugar/peripherals/keyboard/options' _MODEL_KEY = '/desktop/sugar/peripherals/keyboard/model' -class XKB(gobject.GObject): +class KeyboardManager(object): def __init__(self, display): - gobject.GObject.__init__(self) - self._engine = xklavier.Engine(display) - self._configreg = xklavier.ConfigRegistry(self._engine) - self._configreg.load(False) + self._configregistry = xklavier.ConfigRegistry(self._engine) + self._configregistry.load(False) self._configrec = xklavier.ConfigRec() self._configrec.get_from_server(self._engine) self._gconf_client = gconf.client_get_default() - def _populate_one(self, c_reg, item, store): + def _populate_one(self, config_registry, item, store): store.append([item.get_description(), item.get_name()]) - def _populate_two(self, c_reg, item, subitem, store): + def _populate_two(self, config_registry, item, subitem, store): layout = item.get_name() if subitem: - desc = '%s, %s' % (subitem.get_description(), \ + description = '%s, %s' % (subitem.get_description(), \ item.get_description()) variant = subitem.get_name() else: - desc = 'Default layout, %s' % item.get_description() + description = 'Default layout, %s' % item.get_description() variant = '' - store.append([desc, ('%s(%s)' % (layout, variant))]) + store.append([description, ('%s(%s)' % (layout, variant))]) def get_models(self): """Return list of supported keyboard models""" models = [] - self._configreg.foreach_model(self._populate_one, models) + self._configregistry.foreach_model(self._populate_one, models) models.sort() return models def get_languages(self): """Return list of supported keyboard languages""" languages = [] - self._configreg.foreach_language(self._populate_one, languages) + self._configregistry.foreach_language(self._populate_one, languages) languages.sort() return languages def get_layouts_for_language(self, language): """Return list of supported keyboard layouts for a given language""" layouts = [] - self._configreg.foreach_language_variant(language, self._populate_two, \ - layouts) + self._configregistry.foreach_language_variant(language, \ + self._populate_two, layouts) layouts.sort() return layouts - def get_options_grp(self): + def get_options_group(self): """Return list of supported options for switching keyboard group""" options = [] - self._configreg.foreach_option(_GRP_NAME, self._populate_one, options) + self._configregistry.foreach_option(_GROUP_NAME, self._populate_one, \ + options) options.sort() return options @@ -93,33 +92,33 @@ class XKB(gobject.GObject): def get_current_layouts(self): """Return the enabled keyboard layouts with variants""" - layouts = self._gconf_client.get_list(_LAYOUTS_KEY, 'string') + layouts = self._gconf_client.get_list(_LAYOUTS_KEY, gconf.VALUE_STRING) if layouts: return layouts layouts = self._configrec.get_layouts() variants = self._configrec.get_variants() - ret = [] + layout_list = [] i = 0 for layout in layouts: if len(variants) <= i or variants[i] == '': - ret.append('%s(%s)' % (layout, '')) + layout_list.append('%s(%s)' % (layout, '')) else: - ret.append('%s(%s)' % (layout, variants[i])) + layout_list.append('%s(%s)' % (layout, variants[i])) i += 1 - return ret + return layout_list - def get_current_option_grp(self): + def get_current_option_group(self): """Return the enabled option for switching keyboard group""" - options = self._gconf_client.get_list(_OPTIONS_KEY, 'string') + options = self._gconf_client.get_list(_OPTIONS_KEY, gconf.VALUE_STRING) if not options: options = self._configrec.get_options() for option in options: - if option.startswith(_GRP_NAME): + if option.startswith(_GROUP_NAME): return option return None @@ -134,10 +133,10 @@ class XKB(gobject.GObject): self._configrec.set_model(model) self._configrec.activate(self._engine) - def set_option_grp(self, option_grp): + def set_option_group(self, option_group): """Sets the supplied option for switching keyboard group""" #XXX: Merge, not overwrite previous options - options = [option_grp] + options = [option_group] self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, options) self._configrec.set_options(options) self._configrec.activate(self._engine) diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py index cd97733..f9e4548 100644 --- a/extensions/cpsection/keyboard/view.py +++ b/extensions/cpsection/keyboard/view.py @@ -43,9 +43,9 @@ class LayoutCombo(gtk.HBox): (gobject.TYPE_STRING, gobject.TYPE_INT)) } - def __init__(self, xkb, n): + def __init__(self, keyboard_manager, n): gtk.HBox.__init__(self) - self._xkb = xkb + self._keyboard_manager = keyboard_manager self._index = n self.set_border_width(style.DEFAULT_SPACING) @@ -60,7 +60,7 @@ class LayoutCombo(gtk.HBox): self._klang_store = gtk.ListStore(gobject.TYPE_STRING, \ gobject.TYPE_STRING) - for description, name in self._xkb.get_languages(): + for description, name in self._keyboard_manager.get_languages(): self._klang_store.append([name, description]) self._klang_combo = gtk.ComboBox(model = self._klang_store) @@ -103,14 +103,14 @@ class LayoutCombo(gtk.HBox): def get_layout(self): """Gets the selected layout (with variant)""" - iter = self._kvariant_combo.get_active_iter() + it = self._kvariant_combo.get_active_iter() model = self._kvariant_combo.get_model() - return model.get(iter, 0)[0] + return model.get(it, 0)[0] def _set_kvariant_store(self, lang): self._kvariant_store = gtk.ListStore(gobject.TYPE_STRING, \ gobject.TYPE_STRING) - for description, name in self._xkb.get_layouts_for_language(lang): + for description, name in self._keyboard_manager.get_layouts_for_language(lang): self._kvariant_store.append([name, description]) self._kvariant_combo.set_model(self._kvariant_store) self._kvariant_combo.set_active(0) @@ -149,7 +149,7 @@ class Keyboard(SectionView): self._layout_table = gtk.Table(rows = 4, columns = 2, \ homogeneous = False) - self._xkb = model.XKB(self.get_display()) + self._keyboard_manager = model.KeyboardManager(self.get_display()) self._layout_combo_list = [] self._layout_addremovebox_list = [] @@ -188,7 +188,7 @@ class Keyboard(SectionView): kmodel_store = gtk.ListStore(gobject.TYPE_STRING, \ gobject.TYPE_STRING) - for description, name in self._xkb.get_models(): + for description, name in self._keyboard_manager.get_models(): kmodel_store.append([name, description]) kmodel_combo = gtk.ComboBox(model = kmodel_store) @@ -196,7 +196,7 @@ class Keyboard(SectionView): kmodel_combo.pack_start(cell) kmodel_combo.add_attribute(cell, 'text', 1) - self._kmodel = self._xkb.get_current_model() + self._kmodel = self._keyboard_manager.get_current_model() for row in kmodel_store: if self._kmodel in row[0]: kmodel_combo.set_active_iter(row.iter) @@ -218,10 +218,10 @@ class Keyboard(SectionView): it = combobox.get_active_iter() model = combobox.get_model() self._selected_kmodel = model.get(it, 0)[0] - if self._selected_kmodel == self._xkb.get_current_model(): + if self._selected_kmodel == self._keyboard_manager.get_current_model(): return try: - self._xkb.set_model(self._selected_kmodel) + self._keyboard_manager.set_model(self._selected_kmodel) except: pass #TODO: Show error @@ -229,47 +229,48 @@ class Keyboard(SectionView): def _setup_group_switch_option(self): """Adds the controls for changing the group switch option of keyboard""" - separator_grp_option = gtk.HSeparator() - self._vbox.pack_start(separator_grp_option, expand=False) - separator_grp_option.show_all() + separator_group_option = gtk.HSeparator() + self._vbox.pack_start(separator_group_option, expand=False) + separator_group_option.show_all() - label_grp_option = gtk.Label(_('Key(s) to change layout')) - label_grp_option.set_alignment(0, 0) - self._vbox.pack_start(label_grp_option, expand=False) - label_grp_option.show_all() + label_group_option = gtk.Label(_('Key(s) to change layout')) + label_group_option.set_alignment(0, 0) + self._vbox.pack_start(label_group_option, expand=False) + label_group_option.show_all() - box_grp_option = gtk.VBox() - box_grp_option.set_border_width(style.DEFAULT_SPACING * 2) - box_grp_option.set_spacing(style.DEFAULT_SPACING) + box_group_option = gtk.VBox() + box_group_option.set_border_width(style.DEFAULT_SPACING * 2) + box_group_option.set_spacing(style.DEFAULT_SPACING) - grp_option_store = gtk.ListStore(gobject.TYPE_STRING, \ + group_option_store = gtk.ListStore(gobject.TYPE_STRING, \ gobject.TYPE_STRING) - for description, name in self._xkb.get_options_grp(): - grp_option_store.append([name, description]) + for description, name in self._keyboard_manager.get_options_group(): + group_option_store.append([name, description]) - grp_option_combo = gtk.ComboBox(model = grp_option_store) + group_option_combo = gtk.ComboBox(model = group_option_store) cell = gtk.CellRendererText() - grp_option_combo.pack_start(cell) - grp_option_combo.add_attribute(cell, 'text', 1) + group_option_combo.pack_start(cell) + group_option_combo.add_attribute(cell, 'text', 1) - self._group_switch_option = self._xkb.get_current_option_grp() + self._group_switch_option = \ + self._keyboard_manager.get_current_option_group() if not self._group_switch_option: - grp_option_combo.set_active(0) + group_option_combo.set_active(0) else: found = False - for row in grp_option_store: + for row in group_option_store: if self._group_switch_option in row[0]: - grp_option_combo.set_active_iter(row.iter) + group_option_combo.set_active_iter(row.iter) found = True break if not found: - grp_option_combo.set_active(0) + group_option_combo.set_active(0) - box_grp_option.pack_start(grp_option_combo, expand = False) - self._vbox.pack_start(box_grp_option, expand=False) - box_grp_option.show_all() + box_group_option.pack_start(group_option_combo, expand = False) + self._vbox.pack_start(box_group_option, expand=False) + box_group_option.show_all() - grp_option_combo.connect('changed', \ + group_option_combo.connect('changed', \ self.__group_switch_changed_cb) def __group_switch_changed_cb(self, combobox): @@ -283,10 +284,11 @@ class Keyboard(SectionView): model = combobox.get_model() self._selected_group_switch_option = model.get(it, 0)[0] if self._selected_group_switch_option == \ - self._xkb.get_current_option_grp(): + self._keyboard_manager.get_current_option_group(): return try: - self._xkb.set_option_grp(self._selected_group_switch_option) + self._keyboard_manager.set_option_group(\ + self._selected_group_switch_option) except: pass #TODO: Show error @@ -303,13 +305,13 @@ class Keyboard(SectionView): label_klayout.show_all() self._vbox.pack_start(label_klayout, expand=False) - self._klayouts = self._xkb.get_current_layouts() - for i in range(0, self._xkb.get_max_layouts()): + self._klayouts = self._keyboard_manager.get_current_layouts() + for i in range(0, self._keyboard_manager.get_max_layouts()): add_remove_box = self.__create_add_remove_box() self._layout_addremovebox_list.append(add_remove_box) self._layout_table.attach(add_remove_box, 1, 2, i, i+1) - layout_combo = LayoutCombo(self._xkb, i) + layout_combo = LayoutCombo(self._keyboard_manager, i) layout_combo.connect('selection-changed', \ self.__layout_combo_selection_changed_cb) self._layout_combo_list.append(layout_combo) @@ -335,7 +337,7 @@ class Keyboard(SectionView): # First row - no need for showing remove btn add, remove = box.get_children() remove.props.visible = False - if i == self._xkb.get_max_layouts(): + if i == self._keyboard_manager.get_max_layouts(): # Last row - no need for showing add btn add, remove = box.get_children() add.props.visible = False @@ -390,10 +392,11 @@ class Keyboard(SectionView): self.__layout_timeout_cb) def __layout_timeout_cb(self): - if self._selected_klayouts == self._xkb.get_current_layouts(): + if self._selected_klayouts == \ + self._keyboard_manager.get_current_layouts(): return try: - self._xkb.set_layouts(self._selected_klayouts) + self._keyboard_manager.set_layouts(self._selected_klayouts) except: pass #TODO: Show error @@ -402,7 +405,7 @@ class Keyboard(SectionView): def undo(self): """Reverts back to the original keyboard configuration""" - self._xkb.set_model(self._kmodel) - self._xkb.set_layouts(self._klayouts) - self._xkb.set_option_grp(self._group_switch_option) + self._keyboard_manager.set_model(self._kmodel) + self._keyboard_manager.set_layouts(self._klayouts) + self._keyboard_manager.set_option_group(self._group_switch_option) |