diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2013-10-12 12:17:20 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2013-10-12 12:17:20 +0200 |
| commit | e695590b6e36070a68fd3fb62947b178781ad707 (patch) | |
| tree | ff18bf6625f01e56417eda8ba27e6e2e8f1c1c45 /plugins/gtkui | |
| parent | b11cee15a7867130a37b473a764b2d708dd80d10 (diff) | |
gtkui: allow to use any keys as hotkeys (no gtk_accelerator_valid test); removed the default gtkwindow ctrl+tab bindings
Diffstat (limited to 'plugins/gtkui')
| -rw-r--r-- | plugins/gtkui/callbacks.c | 2 | ||||
| -rw-r--r-- | plugins/gtkui/gtkui.c | 4 | ||||
| -rw-r--r-- | plugins/gtkui/hotkeys.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index dca77f97..01f112fc 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -315,7 +315,7 @@ void on_find_activate (GtkMenuItem *menuitem, gpointer user_data) { - search_start (); + search_start (); } void diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 84efce7b..bf5a3bc4 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -988,6 +988,10 @@ gtkui_thread (void *ctx) { gtk_binding_entry_remove (binding_set, GDK_KEY_Return, 0); gtk_binding_entry_remove (binding_set, GDK_KEY_ISO_Enter, 0); gtk_binding_entry_remove (binding_set, GDK_KEY_KP_Enter, 0); + gtk_binding_entry_remove (binding_set, GDK_KEY_Tab, GDK_CONTROL_MASK); + gtk_binding_entry_remove (binding_set, GDK_KEY_Tab, GDK_CONTROL_MASK|GDK_SHIFT_MASK); + gtk_binding_entry_remove (binding_set, GDK_KEY_KP_Tab, GDK_CONTROL_MASK); + gtk_binding_entry_remove (binding_set, GDK_KEY_KP_Tab, GDK_CONTROL_MASK|GDK_SHIFT_MASK); // initialize default hotkey mapping struct stat st; diff --git a/plugins/gtkui/hotkeys.c b/plugins/gtkui/hotkeys.c index 1d82f203..a8d4ee67 100644 --- a/plugins/gtkui/hotkeys.c +++ b/plugins/gtkui/hotkeys.c @@ -757,6 +757,7 @@ on_hotkeys_set_key_key_press_event (GtkWidget *widget, } } +#if 0 if (!gtk_accelerator_valid (accel_key, accel_mods)) { gtk_button_set_label (GTK_BUTTON (widget), _("Invalid key combination! try again!")); @@ -764,6 +765,7 @@ on_hotkeys_set_key_key_press_event (GtkWidget *widget, goto out; } +#endif last_accel_key = accel_key; last_accel_mask = accel_mods; get_keycombo_string (last_accel_key, last_accel_mask, name); |