Fixed the custom tables with new keys.

6 files changed, 135 insertions, 43 deletions

diff --git a/engine/kana.py b/engine/kana.py
index 8f5f6c3..d98852e 100644
--- a/engine/kana.py
+++ b/engine/kana.py
@@ -55,6 +55,10 @@ class KanaSegment(segment.Segment):
         if section != None:
             if enchars in prefs.keys(section):
                 value = unicode(str(prefs.get_value(section, enchars)))
+            else:
+                value = prefs.get_value_direct(section, enchars)
+                if value != None:
+                    value = unicode(str(value))
             if value == '':
                 value = None
             if value == None:
diff --git a/engine/romaji.py b/engine/romaji.py
index b3a54bd..3f28ff6 100644
--- a/engine/romaji.py
+++ b/engine/romaji.py
@@ -58,6 +58,10 @@ class RomajiSegment(segment.Segment):
         if section != None:
             if enchars in prefs.keys(section):
                 value = unicode(str(prefs.get_value(section, enchars)))
+            else:
+                value = prefs.get_value_direct(section, enchars)
+                if value != None:
+                    value = unicode(str(value))
             if value == '':
                 value = None
             if value == None:
diff --git a/engine/thumb.py b/engine/thumb.py
index 1ea582a..1745cc5 100644
--- a/engine/thumb.py
+++ b/engine/thumb.py
@@ -228,6 +228,7 @@ class ThumbShiftKeyboard:
         self.__layout = 0
         self.__fmv_extension = 2
         self.__handakuten = False
+        self.__thumb_typing_rule_section_base = None
         self.__thumb_typing_rule_section = None
         self.__init_thumb_typing_rule()
         self.__init_layout_table()
@@ -243,7 +244,9 @@ class ThumbShiftKeyboard:
         method = prefs.get_value('thumb_typing_rule', 'method')
         if method == None:
             method = _THUMB_BASIC_METHOD
-        self.__thumb_typing_rule_section = 'thumb_typing_rule/' + method
+        self.__thumb_typing_rule_section_base = 'thumb_typing_rule'
+        self.__thumb_typing_rule_section = \
+            self.__thumb_typing_rule_section_base + '/' + method
         if self.__thumb_typing_rule_section not in prefs.sections():
             self.__thumb_typing_rule_section = None
 
@@ -252,27 +255,34 @@ class ThumbShiftKeyboard:
             self.__table.clear()
         if self.__r_table != {}:
             self.__r_table.clear()
+        section_base = self.__thumb_typing_rule_section_base
         section = self.__thumb_typing_rule_section
         if section != None:
             prefs = self.__prefs
             for k in prefs.keys(section):
                 value = prefs.get_value(section, k)
-                if value == None or len(value) != 3 or \
-                   (str(value[0]) == '' and \
-                    str(value[1]) == '' and str(value[2]) == ''):
-                    continue
-                value = [unicode(str(value[0])),
-                         unicode(str(value[1])),
-                         unicode(str(value[2]))]
-                self.__table[ord(k)] = value
-                for c in value:
-                    self.__r_table[c] = k
+                self.__set_bus_table(k, value)
+            for k in prefs.get_value(section_base, 'newkeys'):
+                value = prefs.get_value_direct(section, k)
+                self.__set_bus_table(k, value)
         else:
             for k in _table.keys():
                 self.__table[ord(k)] = _table_static[k]
                 for c in _table_static[k]:
                     self.__r_table[c] = k
 
+    def __set_bus_table(self, key, value):
+        if value == None or len(value) != 3 or \
+            (str(value[0]) == '' and \
+             str(value[1]) == '' and str(value[2]) == ''):
+            return
+        value = [unicode(str(value[0])),
+                 unicode(str(value[1])),
+                 unicode(str(value[2]))]
+        self.__table[ord(key)] = value
+        for c in value:
+            self.__r_table[c] = key
+
     def __reset_layout_table(self, init,
                              j_table_label, j_table,
                              a_table_label, a_table,
@@ -292,18 +302,17 @@ class ThumbShiftKeyboard:
             sub_table = f_table
         if method == None or sub_table == None:
             return
-        base_section = self.__thumb_typing_rule_section
-        sub_section = 'thumb_typing_rule/' + method
-        if base_section != None:
+        section_base = self.__thumb_typing_rule_section_base
+        section = self.__thumb_typing_rule_section
+        sub_section = section_base + '/' + method
+        if section != None:
             prefs = self.__prefs
             for k in prefs.keys(sub_section):
                 value = prefs.get_value(sub_section, k)
-                if len(value) == 3 and value[0] == '' and \
-                    value[1] == '' and value[2] == '':
-                    continue
-                self.__table[ord(k)] = value
-                for c in value:
-                    self.__r_table[c] = k
+                self.__set_bus_table(k, value)
+            for k in prefs.get_value(section_base, method + '_newkeys'):
+                value = prefs.get_value_direct(sub_section, k)
+                self.__set_bus_table(k, value)
         else:
             for k in sub_table.keys():
                 self.__table[ord(unicode(k))] = sub_table[k]
@@ -479,6 +488,7 @@ class ThumbShiftKeyboard:
 
 class ThumbShiftSegment(segment.Segment):
     _prefs = None
+    _thumb_typing_rule_section_base = None
     _thumb_typing_rule_section = None
     _r_table = {}
 
@@ -500,7 +510,9 @@ class ThumbShiftSegment(segment.Segment):
         method = prefs.get_value('thumb_typing_rule', 'method')
         if method == None:
             method = _THUMB_BASIC_METHOD
-        cls._thumb_typing_rule_section = 'thumb_typing_rule/' + method
+        cls._thumb_typing_rule_section_base = 'thumb_typing_rule'
+        cls._thumb_typing_rule_section = \
+            cls._thumb_typing_rule_section_base + '/' + method
         if cls._thumb_typing_rule_section not in prefs.sections():
             cls._thumb_typing_rule_section = None
         cls._init_layout_table()
@@ -509,25 +521,33 @@ class ThumbShiftSegment(segment.Segment):
     def _init_layout_table(cls):
         if cls._r_table != {}:
             cls._r_table.clear()
+        section_base = cls._thumb_typing_rule_section_base
         section = cls._thumb_typing_rule_section
         if section != None:
             prefs = cls._prefs
             for k in prefs.keys(section):
                 value = prefs.get_value(section, k)
-                if value == None or len(value) != 3 or \
-                   (str(value[0]) == '' and \
-                    str(value[1]) == '' and str(value[2]) == ''):
-                    continue
-                value = [unicode(str(value[0])),
-                         unicode(str(value[1])),
-                         unicode(str(value[2]))]
-                for c in value:
-                    cls._r_table[c] = k
+                cls._set_bus_table(k, value)
+            for k in prefs.get_value(section_base, 'newkeys'):
+                value = prefs.get_value_direct(section, k)
+                cls._set_bus_table(k, value)
         else:
             for k in _table.keys():
                 for c in _table_static[k]:
                     cls._r_table[c] = k
 
+    @classmethod
+    def _set_bus_table(cls, key, value):
+        if value == None or len(value) != 3 or \
+            (str(value[0]) == '' and \
+             str(value[1]) == '' and str(value[2]) == ''):
+            return
+        value = [unicode(str(value[0])),
+                 unicode(str(value[1])),
+                 unicode(str(value[2]))]
+        for c in value:
+            cls._r_table[c] = key
+
     def is_finished(self):
         return not (self._jachars in _UNFINISHED_HIRAGANA)
 
diff --git a/setup/anthyprefs.py.in b/setup/anthyprefs.py.in
index d05c41a..5e39eec 100644
--- a/setup/anthyprefs.py.in
+++ b/setup/anthyprefs.py.in
@@ -243,6 +243,11 @@ _config = {
 
     'romaji_typing_rule': {
         'method': 'default',
+        # The newkeys list is saved for every romaji_typing_rule/$method
+        # so that prefs.get_value_direct() is not used.
+        # prefs.fetch_section() doesn't get the keys if they exist
+        # in gconf only.
+        'newkeys': [],
     },
 
     'romaji_typing_rule/default': {
@@ -485,6 +490,7 @@ _config = {
 
     'kana_typing_rule': {
         'method': 'default',
+        'newkeys': [],
     },
 
     'kana_typing_rule/default': {
@@ -612,6 +618,16 @@ _config = {
 
     'thumb_typing_rule': {
         'method': 'base',
+        'newkeys': [],
+        'nicola_j_table_newkeys': [],
+        'nicola_a_table_newkeys': [],
+        'nicola_f_table_newkeys': [],
+        'kb231_j_fmv_table_newkeys': [],
+        'kb231_a_fmv_table_newkeys': [],
+        'kb231_f_fmv_table_newkeys': [],
+        'kb611_j_fmv_table_newkeys': [],
+        'kb611_a_fmv_table_newkeys': [],
+        'kb611_f_fmv_table_newkeys': [],
     },
 
     'thumb_typing_rule/base': {
diff --git a/setup/main.py b/setup/main.py
index 6093d43..1971c5b 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -249,13 +249,20 @@ class AnthySetup(object):
         rule = {}
         ls = gtk.ListStore(str, str, str)
         tv = self.xml.get_widget('treeview_custom_key_table')
-        section = 'romaji_typing_rule/' + str(method)
+        section_base = 'romaji_typing_rule'
+        section = section_base + '/' + str(method)
         for key in prefs.keys(section):
             key = str(key)
             value = prefs.get_value(section, key)
             # config.set_value(key, None) is not supported.
             if value != None and value != '':
                 rule[key] = str(value)
+        for key in prefs.get_value(section_base, 'newkeys'):
+            key = str(key)
+            value = self.prefs.get_value_direct(section, key)
+            # config.set_value(key, None) is not supported.
+            if value != None and value != '':
+                rule[key] = str(value)
         for key, value in sorted(rule.items(), \
             cmp = self.__japanese_tuple_sort):
             ls.append(['romaji', key, value])
@@ -271,13 +278,20 @@ class AnthySetup(object):
         rule = {}
         ls = gtk.ListStore(str, str, str)
         tv = self.xml.get_widget('treeview_custom_key_table')
-        section = 'kana_typing_rule/' + str(method)
+        section_base = 'kana_typing_rule'
+        section = section_base + '/' + str(method)
         for key in prefs.keys(section):
             key = str(key)
             value = prefs.get_value(section, key)
             # config.set_value(key, None) is not supported.
             if value != None and value != '':
                 rule[key] = str(value)
+        for key in prefs.get_value(section_base, 'newkeys'):
+            key = str(key)
+            value = self.prefs.get_value_direct(section, key)
+            # config.set_value(key, None) is not supported.
+            if value != None and value != '':
+                rule[key] = str(value)
         for key, value in sorted(rule.items(), \
             cmp = self.__japanese_tuple_sort):
             ls.append(['kana', key, value])
@@ -293,7 +307,8 @@ class AnthySetup(object):
         rule = {}
         ls = gtk.ListStore(str, str, str, str, str)
         tv = self.xml.get_widget('treeview_custom_key_table')
-        section = 'thumb_typing_rule/' + str(method)
+        section_base = 'thumb_typing_rule'
+        section = section_base + '/' + str(method)
         for key in prefs.keys(section):
             key = str(key)
             value = prefs.get_value(section, key)
@@ -306,6 +321,18 @@ class AnthySetup(object):
                 rule[key][0] = str(value[0])
                 rule[key][1] = str(value[1])
                 rule[key][2] = str(value[2])
+        for key in prefs.get_value(section_base, 'newkeys'):
+            key = str(key)
+            value = self.prefs.get_value_direct(section, key)
+            # config.set_value(key, None) is not supported.
+            if value != None and len(value) == 3 and \
+                ((value[0] != None and value[0] != '') or \
+                 (value[1] != None and value[1] != '') or \
+                 (value[2] != None and value[2] != '')):
+                rule[key] = {}
+                rule[key][0] = str(value[0])
+                rule[key][1] = str(value[1])
+                rule[key][2] = str(value[2])
         for key, value in sorted(rule.items(), \
             cmp = self.__japanese_thumb_sort):
             ls.append(['thumb', key, value[0], value[2], value[1]])
@@ -846,7 +873,7 @@ class AnthySetup(object):
         model_combobox = combobox.get_model()
         method = model_combobox[id][1]
         type = user_data
-        section = None
+        section_base = None
         key = input.get_text()
         value = output.get_text()
         left_text = left.get_text()
@@ -866,17 +893,27 @@ class AnthySetup(object):
             return
 
         if type == 'romaji':
-            section = 'romaji_typing_rule/' + method
+            section_base = 'romaji_typing_rule'
             model.append([type, key, value])
         elif type == 'kana':
-            section = 'kana_typing_rule/' + method
+            section_base = 'kana_typing_rule'
             model.append([type, key, value])
         elif type == 'thumb':
-            section = 'thumb_typing_rule/' + method
+            section_base = 'thumb_typing_rule'
             model.append([type, key, value, left_text, right_text])
-        if section == None:
+        if section_base == None:
             self.__run_message_dialog(_("Your custom key is not assigned in any sections. Maybe a bug."))
             return
+        section = section_base + '/' + method
+        if key not in prefs.keys(section):
+            # ibus does not support gconf_client_all_entries().
+            # prefs.fetch_section() doesn't get the keys if they exist
+            # in gconf only.
+            # Use newkeys for that way.
+            newkeys = prefs.get_value(section_base, 'newkeys')
+            if key not in newkeys:
+                newkeys.append(key)
+                prefs.set_value(section_base, 'newkeys', newkeys)
         if type != 'thumb':
             prefs.set_value(section, key, value)
         else:
@@ -897,16 +934,21 @@ class AnthySetup(object):
         l, i = tv.get_selection().get_selected()
         type = l[i][0]
         key = l[i][1]
-        section = None
+        section_base = None
         if type == 'romaji':
-            section = 'romaji_typing_rule/' + method
+            section_base = 'romaji_typing_rule'
         elif type == 'kana':
-            section = 'kana_typing_rule/' + method
+            section_base = 'kana_typing_rule'
         elif type == 'thumb':
-            section = 'thumb_typing_rule/' + method
-        if section == None:
+            section_base = 'thumb_typing_rule'
+        if section_base == None:
             self.__run_message_dialog(_("Your custom key is not assigned in any sections. Maybe a bug."))
             return
+        section = section_base + '/' + method
+        newkeys = prefs.get_value(section_base, 'newkeys')
+        if key in newkeys:
+            newkeys.remove(key)
+            prefs.set_value(section_base, 'newkeys', newkeys)
         # config.set_value(key, None) is not supported.
         if type != 'thumb':
             prefs.set_value(section, key, '')
diff --git a/setup/prefs.py b/setup/prefs.py
index 66f2cd6..2b56908 100644
--- a/setup/prefs.py
+++ b/setup/prefs.py
@@ -56,6 +56,12 @@ class Prefs(object):
             except:
                 return self.default[section][key]
 
+    def get_value_direct(self, section, key, default=None):
+        s = section
+        section = '/'.join(
+            [s for s in '/'.join([self._prefix, section]).split('/') if s])
+        return self._config.get_value(section, key, default)
+
     def set_value(self, section, key, value):
         if section not in self.sections():
             self.set_new_section(section)