diff -ru ibus-1.3.9.org/bus/ibusimpl.c ibus-1.3.9/bus/ibusimpl.c
--- ibus-1.3.9.org/bus/ibusimpl.c 2011-06-02 13:54:52.000000000 +0900
+++ ibus-1.3.9/bus/ibusimpl.c 2011-06-02 14:48:31.481481364 +0900
@@ -199,6 +199,30 @@
}
static void
+bus_ibus_impl_set_enable (BusIBusImpl *ibus,
+ GValue *value)
+{
+ GQuark hotkey = g_quark_from_static_string ("enable");
+ bus_ibus_impl_set_hotkey (ibus, hotkey, value);
+}
+
+static void
+bus_ibus_impl_set_disable (BusIBusImpl *ibus,
+ GValue *value)
+{
+ GQuark hotkey = g_quark_from_static_string ("disable");
+ bus_ibus_impl_set_hotkey (ibus, hotkey, value);
+}
+
+static void
+bus_ibus_impl_set_vi_collaboration (BusIBusImpl *ibus,
+ GValue *value)
+{
+ GQuark hotkey = g_quark_from_static_string ("vi_collaboration");
+ bus_ibus_impl_set_hotkey (ibus, hotkey, value);
+}
+
+static void
bus_ibus_impl_set_next_engine_in_menu (BusIBusImpl *ibus,
GValue *value)
{
@@ -425,6 +449,9 @@
/* Only for backward compatibility, shall be removed later. */
{ "general/hotkey", "prev_engine", bus_ibus_impl_set_previous_engine },
#endif
+ { "general/hotkey", "enable", bus_ibus_impl_set_enable },
+ { "general/hotkey", "disable", bus_ibus_impl_set_disable },
+ { "general/hotkey", "vi_collaboration", bus_ibus_impl_set_vi_collaboration },
{ "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
{ "general", "preload_engines", bus_ibus_impl_set_preload_engines },
{ "general", "use_system_keyboard_layout", bus_ibus_impl_set_use_sys_layout },
@@ -478,6 +505,9 @@
/* Only for backward compatibility, shall be removed later. */
{ "general/hotkey", "prev_engine", bus_ibus_impl_set_previous_engine },
#endif
+ { "general/hotkey", "enable", bus_ibus_impl_set_enable },
+ { "general/hotkey", "disable", bus_ibus_impl_set_disable },
+ { "general/hotkey", "vi_collaboration", bus_ibus_impl_set_vi_collaboration },
{ "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
{ "general", "preload_engines", bus_ibus_impl_set_preload_engines },
{ "general", "use_system_keyboard_layout", bus_ibus_impl_set_use_sys_layout },
@@ -1866,6 +1896,9 @@
static GQuark trigger = 0;
static GQuark next = 0;
static GQuark previous = 0;
+ static GQuark enable = 0;
+ static GQuark disable = 0;
+ static GQuark vi_collaboration = 0;
GQuark event;
GList *engine_list;
@@ -1874,6 +1907,9 @@
trigger = g_quark_from_static_string ("trigger");
next = g_quark_from_static_string ("next-engine-in-menu");
previous = g_quark_from_static_string ("previous-engine");
+ enable = g_quark_from_static_string ("enable");
+ disable = g_quark_from_static_string ("disable");
+ vi_collaboration = g_quark_from_static_string ("vi_collaboration");
}
/* Try global hotkeys first. */
@@ -1912,6 +1948,24 @@
}
return TRUE;
}
+ if (event == enable) {
+ if (!bus_input_context_is_enabled(context)) {
+ bus_input_context_enable (context);
+ }
+ return TRUE;
+ }
+ if (event == disable) {
+ if (bus_input_context_is_enabled(context)) {
+ bus_input_context_disable (context);
+ }
+ return TRUE;
+ }
+ if (event == vi_collaboration) {
+ if (bus_input_context_is_enabled(context)) {
+ bus_input_context_disable (context);
+ }
+ return TRUE;
+ }
if (!ibus->engines_hotkey_profile || !ibus->hotkey_to_engines_map) {
return FALSE;
diff -ru ibus-1.3.9.org/ibus/common.py ibus-1.3.9/ibus/common.py
--- ibus-1.3.9.org/ibus/common.py 2010-11-21 19:27:22.000000000 +0900
+++ ibus-1.3.9/ibus/common.py 2011-06-02 14:49:55.389891578 +0900
@@ -39,9 +39,15 @@
"CONFIG_GENERAL_SHORTCUT_TRIGGER",
"CONFIG_GENERAL_SHORTCUT_NEXT_ENGINE",
"CONFIG_GENERAL_SHORTCUT_PREV_ENGINE",
+ "CONFIG_GENERAL_SHORTCUT_ENABLE",
+ "CONFIG_GENERAL_SHORTCUT_DISABLE",
+ "CONFIG_GENERAL_SHORTCUT_VI_COLLABORATION",
"CONFIG_GENERAL_SHORTCUT_TRIGGER_DEFAULT",
"CONFIG_GENERAL_SHORTCUT_NEXT_ENGINE_DEFAULT",
"CONFIG_GENERAL_SHORTCUT_PREV_ENGINE_DEFAULT",
+ "CONFIG_GENERAL_SHORTCUT_ENABLE_DEFAULT",
+ "CONFIG_GENERAL_SHORTCUT_DISABLE_DEFAULT",
+ "CONFIG_GENERAL_SHORTCUT_VI_COLLABORATION_DEFAULT",
"main",
"main_quit",
"main_iteration",
@@ -153,6 +159,12 @@
CONFIG_GENERAL_SHORTCUT_NEXT_ENGINE_DEFAULT = []
CONFIG_GENERAL_SHORTCUT_PREV_ENGINE = "/general/keyboard_shortcut_prev_engine"
CONFIG_GENERAL_SHORTCUT_PREV_ENGINE_DEFAULT = []
+CONFIG_GENERAL_SHORTCUT_ENABLE = "/general/keyboard_shortcut_enable"
+CONFIG_GENERAL_SHORTCUT_ENABLE_DEFAULT = []
+CONFIG_GENERAL_SHORTCUT_DISABLE = "/general/keyboard_shortcut_disable"
+CONFIG_GENERAL_SHORTCUT_DISABLE_DEFAULT = []
+CONFIG_GENERAL_SHORTCUT_VI_COLLABORATION = "/general/keyboard_shortcut_vi_collaboration"
+CONFIG_GENERAL_SHORTCUT_VI_COLLABORATION_DEFAULT = []
__mainloop = None
diff -ru ibus-1.3.9.org/setup/main.py ibus-1.3.9/setup/main.py
--- ibus-1.3.9.org/setup/main.py 2011-06-02 13:54:52.000000000 +0900
+++ ibus-1.3.9/setup/main.py 2011-06-02 14:50:43.746127978 +0900
@@ -128,6 +128,39 @@
button.connect("clicked", self.__shortcut_button_clicked_cb,
N_("previous input method"), "general/hotkey", "previous_engine", entry)
+ # enable
+ shortcuts = self.__config.get_value(
+ "general/hotkey", "enable",
+ ibus.CONFIG_GENERAL_SHORTCUT_ENABLE_DEFAULT)
+ button = self.__builder.get_object("button_enable")
+ entry = self.__builder.get_object("entry_enable")
+ entry.set_text("; ".join(shortcuts))
+ entry.set_tooltip_text("\n".join(shortcuts))
+ button.connect("clicked", self.__shortcut_button_clicked_cb,
+ N_("enable"), "general/hotkey", "enable", entry)
+
+ # disable
+ shortcuts = self.__config.get_value(
+ "general/hotkey", "disable",
+ ibus.CONFIG_GENERAL_SHORTCUT_DISABLE_DEFAULT)
+ button = self.__builder.get_object("button_disable")
+ entry = self.__builder.get_object("entry_disable")
+ entry.set_text("; ".join(shortcuts))
+ entry.set_tooltip_text("\n".join(shortcuts))
+ button.connect("clicked", self.__shortcut_button_clicked_cb,
+ N_("disable"), "general/hotkey", "disable", entry)
+
+ # vi_collaboration
+ shortcuts = self.__config.get_value(
+ "general/hotkey", "vi_collaboration",
+ ibus.CONFIG_GENERAL_SHORTCUT_VI_COLLABORATION_DEFAULT)
+ button = self.__builder.get_object("button_vi_collaboration")
+ entry = self.__builder.get_object("entry_vi_collaboration")
+ entry.set_text("; ".join(shortcuts))
+ entry.set_tooltip_text("\n".join(shortcuts))
+ button.connect("clicked", self.__shortcut_button_clicked_cb,
+ N_("vi_collaboration"), "general/hotkey", "vi_collaboration", entry)
+
# lookup table orientation
self.__combobox_lookup_table_orientation = self.__builder.get_object("combobox_lookup_table_orientation")
self.__combobox_lookup_table_orientation.set_active(
diff -ru ibus-1.3.9.org/setup/setup.ui ibus-1.3.9/setup/setup.ui
--- ibus-1.3.9.org/setup/setup.ui 2010-11-25 11:24:56.000000000 +0900
+++ ibus-1.3.9/setup/setup.ui 2011-06-02 15:09:40.177727752 +0900
@@ -96,7 +96,7 @@
+
+
+
+ 3
+ 4
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+
+ 4
+ 5
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+
+ 5
+ 6
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+
+ 1
+ 2
+ 4
+ 5
+
+
+
+
+
+ 1
+ 2
+ 5
+ 6
+
+