diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2010-10-21 17:30:42 +0900 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-10-21 18:14:55 +0900 |
| commit | 15db48fc217cb6e91c91e1819f2347dfdac905e0 (patch) | |
| tree | fe9adf0d43028a75f7988a0f9d881945cfa052f5 | |
| parent | 96b64a2eff1fb4c9bec4e712b47b23a7900f44e7 (diff) | |
| download | ibus-15db48fc217cb6e91c91e1819f2347dfdac905e0.tar.gz | |
Fix keyval and state in __keycode_button_clicked_cb
| -rw-r--r-- | data/ibus.schemas.in | 2 | ||||
| -rw-r--r-- | setup/keyboardshortcut.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in index 4695d0b1..aa66aa50 100644 --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in @@ -18,7 +18,7 @@ <owner>ibus</owner> <type>list</type> <list_type>string</list_type> - <default>[Control+space,Zenkaku_Hankaku,Alt+Zenkaku_Hankaku,Alt+grave,Hangul,Alt+Release+Alt_R]</default> + <default>[Control+space,Zenkaku_Hankaku,Alt+Kanji,Alt+grave,Hangul,Alt+Release+Alt_R]</default> <locale name="C"> <short>Trigger shortcut keys</short> <long>The shortcut keys for turning input method on or off</long> diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py index 58d15ee9..bde6f50f 100644 --- a/setup/keyboardshortcut.py +++ b/setup/keyboardshortcut.py @@ -235,16 +235,19 @@ class KeyboardShortcutSelection(gtk.VBox): dlg.set_markup(message) dlg.set_title(_("Please press a key (or a key combination)")) - def __key_release_event(d, k, out): + def __key_press_event(d, k, out): out.append(k.copy()) + + def __key_release_event(d, k, out): d.response(gtk.RESPONSE_OK) - dlg.connect("key-release-event", __key_release_event, out) + dlg.connect("key-press-event", __key_press_event, out) + dlg.connect("key-release-event", __key_release_event, None) id = dlg.run() dlg.destroy() if id != gtk.RESPONSE_OK or not out: return - keyevent = out[0] + keyevent = out[len(out) - 1] state = keyevent.state & (gdk.CONTROL_MASK | \ gdk.SHIFT_MASK | \ gdk.MOD1_MASK | \ |