From 4f5a40fe1a689ff5baab8716d987bd57075f1ac9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 13 May 2013 10:52:20 +0900
Subject: Added customizable Hiragana_Katakana key.

---
 engine/engine.py       |  6 +++---
 setup/anthyprefs.py.in | 16 ++++++++++++++--
 setup/main.py          |  3 ---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/engine/engine.py b/engine/engine.py
index c947878..8a56e8f 100644
--- a/engine/engine.py
+++ b/engine/engine.py
@@ -2043,9 +2043,6 @@ class Engine(IBus.EngineSimple):
         if state & (IBus.ModifierType.CONTROL_MASK | IBus.ModifierType.MOD1_MASK):
             return False
 
-        if keyval == IBus.KEY_Hiragana_Katakana:
-            self.__preedit_ja_string.set_hiragana_katakana(True)
-        
         if (IBus.KEY_exclam <= keyval <= IBus.KEY_asciitilde or
             keyval == IBus.KEY_yen):
             if Engine.__typing_mode == jastring.TYPING_MODE_KANA:
@@ -2771,3 +2768,6 @@ class Engine(IBus.EngineSimple):
         setup_cmd = path.join(config.LIBEXECDIR, 'ibus-setup-anthy')
         Engine.__setup_pid = os.spawnl(os.P_NOWAIT, setup_cmd, 'ibus-setup-anthy')
 
+    def __cmd_hiragana_for_latin_with_shift(self, keyval, state):
+        self.__preedit_ja_string.set_hiragana_katakana(True)
+
diff --git a/setup/anthyprefs.py.in b/setup/anthyprefs.py.in
index 3bd72cc..65c872d 100644
--- a/setup/anthyprefs.py.in
+++ b/setup/anthyprefs.py.in
@@ -277,14 +277,16 @@ _cmd_keys = [
     'on_off',
     'circle_input_mode',
     'circle_kana_mode',
+    'circle_typing_method',
+    'circle_dict_method',
     'latin_mode',
     'wide_latin_mode',
     'hiragana_mode',
     'katakana_mode',
     'half_katakana_mode',
 #    'cancel_pseudo_ascii_mode_key',
-    'circle_typing_method',
-    'circle_dict_method',
+
+    'hiragana_for_latin_with_shift',
 
     'insert_space',
     'insert_alternate_space',
@@ -1196,6 +1198,8 @@ _shortcut_default = {
 
     'dict_admin': ['F11'],
     'add_word': ['F12'],
+
+    'hiragana_for_latin_with_shift': ['Hiragana_Katakana'],
 }
 
 _config['shortcut/default'] = dict.fromkeys(_cmd_keys, [])
@@ -1255,7 +1259,10 @@ _shortcut_atok = {
     'convert_to_wide_latin': ['F9', 'Ctrl+P'],
     'convert_to_latin': ['F10', 'Ctrl+at'],
 
+    'dict_admin': ['F11'],
     'add_word': ['Ctrl+F7'],
+
+    'hiragana_for_latin_with_shift': ['Ctrl+J'],
 }
 
 _config['shortcut/atok'] = dict.fromkeys(_cmd_keys, [])
@@ -1305,6 +1312,11 @@ _shortcut_wnn = {
     'convert_to_half': ['F8'],
     'convert_to_wide_latin': ['F9'],
     'convert_to_latin': ['F10'],
+
+    'dict_admin': ['F11'],
+    'add_word': ['F12'],
+
+    'hiragana_for_latin_with_shift': ['Hiragana_Katakana'],
 }
 
 _config['shortcut/wnn'] = dict.fromkeys(_cmd_keys, [])
diff --git a/setup/main.py b/setup/main.py
index 20b29e7..056807b 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -1621,9 +1621,6 @@ class AnthySetup(object):
         ls = self.__builder.get_object('shortcut').get_model()
         ls.clear()
 
-        for a in widget.get_model():
-            print a[0]
-
         sec = self._get_shortcut_sec()
         for k in self.prefs.keys(sec):
             ls.append([k, l_to_s(self.prefs.get_value(sec, k))])
-- 
cgit v1.2.1