diff options
author | fujiwarat <takao.fujiwara1@gmail.com> | 2012-10-19 17:42:23 +0900 |
---|---|---|
committer | fujiwarat <takao.fujiwara1@gmail.com> | 2012-10-19 17:42:23 +0900 |
commit | d5fd7c7277ca7116181e35a325a1234ded7368c2 (patch) | |
tree | 62105883192972a139bf755b8a5efbc59f0ebaa9 /setup | |
parent | 3800c47df3c2a7306f37589647d67220f8426524 (diff) | |
download | ibus-anthy-d5fd7c7277ca7116181e35a325a1234ded7368c2.tar.gz |
Added us layout table for Kana.
Diffstat (limited to 'setup')
-rw-r--r-- | setup/anthyprefs.py.in | 115 | ||||
-rw-r--r-- | setup/main.py | 31 |
2 files changed, 140 insertions, 6 deletions
diff --git a/setup/anthyprefs.py.in b/setup/anthyprefs.py.in index ba89330..3135d93 100644 --- a/setup/anthyprefs.py.in +++ b/setup/anthyprefs.py.in @@ -544,11 +544,11 @@ _config = { }, 'kana_typing_rule': { - 'method': 'default', + 'method': 'jp', 'newkeys': [], }, - 'kana_typing_rule/default': { + 'kana_typing_rule/jp': { # no modifiers keys '1' : 'ぬ', '2' : 'ふ', @@ -613,7 +613,7 @@ _config = { '(' : 'ゅ', ')' : 'ょ', '~' : 'を', - '=' : 'ほ', + '=' : 'ゑ', '|' : 'ー', 'Q' : 'た', @@ -660,6 +660,115 @@ _config = { '¥' : 'ー', }, + 'kana_typing_rule/us': { + # no modifiers keys + '`' : 'ろ', + '1' : 'ぬ', + '2' : 'ふ', + '3' : 'あ', + '4' : 'う', + '5' : 'え', + '6' : 'お', + '7' : 'や', + '8' : 'ゆ', + '9' : 'よ', + '0' : 'わ', + '-' : 'ほ', + '=' : 'へ', + + 'q' : 'た', + 'w' : 'て', + 'e' : 'い', + 'r' : 'す', + 't' : 'か', + 'y' : 'ん', + 'u' : 'な', + 'i' : 'に', + 'o' : 'ら', + 'p' : 'せ', + '[' : '゛', + ']' : '゜', + # '\\' : 'ー', + '\\' : 'む', + + 'a' : 'ち', + 's' : 'と', + 'd' : 'し', + 'f' : 'は', + 'g' : 'き', + 'h' : 'く', + 'j' : 'ま', + 'k' : 'の', + 'l' : 'り', + ';' : 'れ', + '\'' : 'け', + + 'z' : 'つ', + 'x' : 'さ', + 'c' : 'そ', + 'v' : 'ひ', + 'b' : 'こ', + 'n' : 'み', + 'm' : 'も', + ',' : 'ね', + '.' : 'る', + '/' : 'め', + + # shift modifiered keys + '~' : 'ろ', + '!' : 'ぬ', + '@' : 'ふ', + '#' : 'ぁ', + '$' : 'ぅ', + '%' : 'ぇ', + '^' : 'ぉ', + '&' : 'ゃ', + '*' : 'ゅ', + '(' : 'ょ', + ')' : 'を', + '_' : 'ー', + '+' : 'ゑ', + + 'Q' : 'た', + 'W' : 'て', + 'E' : 'ぃ', + 'R' : 'す', + 'T' : 'ヵ', + 'Y' : 'ん', + 'U' : 'な', + 'I' : 'に', + 'O' : 'ら', + 'P' : 'せ', + '{' : '「', + + '}' : '」', + + '|' : 'む', + + 'A' : 'ち', + 'S' : 'と', + 'D' : 'し', + 'F' : 'ゎ', + 'G' : 'き', + 'H' : 'く', + 'J' : 'ま', + 'K' : 'の', + 'L' : 'り', + ':' : 'れ', + '"' : 'ヶ', + + 'Z' : 'っ', + 'X' : 'さ', + 'C' : 'そ', + 'V' : 'ゐ', + 'B' : 'こ', + 'M' : 'も', + 'N' : 'み', + '<' : '、', + '>' : '。', + + '?' : '・', + }, 'thumb': { 'keyboard_layout_mode': True, 'keyboard_layout': 0, diff --git a/setup/main.py b/setup/main.py index 134e52c..c26ca56 100644 --- a/setup/main.py +++ b/setup/main.py @@ -427,6 +427,12 @@ class AnthySetup(object): entry_left.show() label_right.show() entry_right.show() + elif mode == 'kana': + hbox_combo.show() + label_left.hide() + entry_left.hide() + label_right.hide() + entry_right.hide() else: hbox_combo.hide() label_left.hide() @@ -494,7 +500,8 @@ class AnthySetup(object): dlg.set_title(_("Customize Kana Key Table")) label.set_label(_("_Kana Key Table:")) label_output.set_label(_("_Output Chars")) - list_labels = [['default', _("Default")]] + list_labels = [['jp', _("Japanese Keyboard Layout")], + ['us', _("U.S. Keyboard Layout")]] self.__show_dialog_custom_key_table_extention(mode) elif mode == 'thumb': dlg.set_title(_("Customize Thumb Shift Key Table")) @@ -530,7 +537,7 @@ class AnthySetup(object): if mode == 'kana': method = prefs.get_value('kana_typing_rule', 'method') if method == None: - method = 'default' + method = 'jp' tv = self.__get_kana_treeview_custom_key_table(method) if mode == 'thumb': method = prefs.get_value('thumb_typing_rule', 'method') @@ -539,7 +546,15 @@ class AnthySetup(object): tv = self.__get_thumb_treeview_custom_key_table(method) self.__connect_dialog_custom_key_table_buttons(mode) - combobox.set_active(0) + + id = 0 + # thumb uses all tables so the default is always 0. + if mode != 'thumb': + for index, labels in enumerate(list_labels): + if labels[0] == method: + id = index + break + combobox.set_active(id) combobox.connect('changed', self.on_cb_custom_key_table_changed, mode) id = dlg.run() @@ -995,6 +1010,12 @@ class AnthySetup(object): set_sensitive(name, flg) def on_selection_custom_key_table_changed(self, widget, id): + l, i = widget.get_selected() + # if 'combobox_custom_key_table' is changed, + # 'treeview_custom_key_table' also receives this signal + # but no selection. + if i == None: + return button = self.__builder.get_object('button_remove_custom_key') button.set_sensitive(True) @@ -1054,6 +1075,7 @@ class AnthySetup(object): self.__builder.get_object('btn_apply').set_sensitive(True) def on_cb_custom_key_table_changed(self, widget, user_data): + prefs = self.prefs tv = self.__builder.get_object('treeview_custom_key_table') mode = user_data id = widget.get_active() @@ -1067,8 +1089,11 @@ class AnthySetup(object): if mode == 'romaji': tv = self.__get_romaji_treeview_custom_key_table(method) elif mode == 'kana': + prefs.set_value('kana_typing_rule', 'method', method) + self.__builder.get_object('btn_apply').set_sensitive(True) tv = self.__get_kana_treeview_custom_key_table(method) elif mode == 'thumb': + # thumb uses all tables so do not save the method. tv = self.__get_thumb_treeview_custom_key_table(method) def on_sb_changed(self, widget): |