diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2013-05-11 18:03:02 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2013-05-11 18:03:02 +0900 |
| commit | 37caf0b0d9afefad1055846dd3e4389fd4f2a792 (patch) | |
| tree | a91504e56c5a43df3a437b034e964d4b264381b6 | |
| parent | d363288fac669fb2528b0bb01d4cd154b1c8bbee (diff) | |
| download | ibus-anthy-37caf0b0d9afefad1055846dd3e4389fd4f2a792.tar.gz | |
Added Zenkaku_Hankaku to on-off keys.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | engine/engine.py | 5 | ||||
| -rw-r--r-- | setup/Makefile.am | 1 | ||||
| -rw-r--r-- | setup/anthyprefs.py.in | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ad0887f..db392cb 100644 --- a/configure.ac +++ b/configure.ac @@ -297,6 +297,15 @@ else AM_CONDITIONAL(HAVE_PRIVATE_PNG, false) fi +dnl - check on-off keys +AC_ARG_WITH(on-off-keys, + [AC_HELP_STRING([--with-on-off-keys="'KEY1','KEY2',..."], + [Anthy default on-off keys. default=" + 'Zenkaku_Hankaku', 'Ctrl+J'".])], + [ON_OFF_KEYS="$withval"], + [ON_OFF_KEYS="'Zenkaku_Hankaku', 'Ctrl+J'"]) +AC_SUBST(ON_OFF_KEYS) + dnl - check hotkeys for ibus-anthy which is used for ibus bridge mode. dnl - Normally you don't need this so could be HOTKEYS="no" AC_ARG_WITH(hotkeys, @@ -443,6 +452,7 @@ ANTHY_ZIPCODE_FILE $ANTHY_ZIPCODE_FILE KASUMI_EXEC_FILE $KASUMI_EXEC_FILE KASUMI_ICON_FILE $KASUMI_ICON_FILE ICON_PREFERENCE $ICON_PREFERENCE +ON_OFF_KEYS $ON_OFF_KEYS HOTKEYS_XML $HOTKEYS_XML SYMBOL_XML $SYMBOL_XML LAYOUT_XML $LAYOUT_XML diff --git a/engine/engine.py b/engine/engine.py index 01b1c92..944280e 100644 --- a/engine/engine.py +++ b/engine/engine.py @@ -2090,10 +2090,9 @@ class Engine(IBus.EngineSimple): #mod_keys def __set_input_mode(self, mode): - if not self._chk_mode('0'): - return False - self.__input_mode_activate(mode, IBus.PropState.CHECKED) + self.__reset() + self.__invalidate() return True diff --git a/setup/Makefile.am b/setup/Makefile.am index 8b13a3c..8e1605e 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -80,6 +80,7 @@ anthyprefs.py: anthyprefs.py.in sed -e "s|\@ANTHY_ZIPCODE_FILE\@|$(ANTHY_ZIPCODE_FILE)|g" \ -e "s|\@KASUMI_EXEC_FILE\@|$(KASUMI_EXEC_FILE)|g" \ -e "s|\@KASUMI_ICON_FILE\@|$(KASUMI_ICON_FILE)|g" \ + -e "s|\@ON_OFF_KEYS\@|$(ON_OFF_KEYS)|g" \ -e "s|\@VERSION\@|$(VERSION)|g" \ -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \ $< > $@ diff --git a/setup/anthyprefs.py.in b/setup/anthyprefs.py.in index b388aeb..d4a1f81 100644 --- a/setup/anthyprefs.py.in +++ b/setup/anthyprefs.py.in @@ -1136,7 +1136,7 @@ _config = { } _shortcut_default = { - 'on_off': ['Ctrl+J'], + 'on_off': [@ON_OFF_KEYS@], 'circle_input_mode': ['Ctrl+comma', 'Ctrl+less'], 'circle_kana_mode': ['Ctrl+period', 'Ctrl+greater', 'Hiragana_Katakana'], # 'cancel_pseudo_ascii_mode_key': ['Escape'], |