diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-03 01:54:48 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-03 01:54:48 +0000 |
commit | 9d2d74e51c2e1d5bc0c5f3ef1aedacf5198d8acc (patch) | |
tree | dd0ed05757c5fb685390bf8af7a305304f149c8d /gtk2_ardour | |
parent | f9fb7c680e9cca2070f4511d1828a541f3e610b4 (diff) |
fix/workaround bug in GTK that prevents <release> bindings from working - save/goto view bindings are now Shift-Fn to save, Fn to goto
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@11432 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 30 | ||||
-rw-r--r-- | gtk2_ardour/mnemonic-us.bindings.in | 48 |
2 files changed, 29 insertions, 49 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 6c4ab275e3..02e2ebdd7a 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -6185,29 +6185,6 @@ Editor::goto_visual_state (uint32_t n) void Editor::start_visual_state_op (uint32_t n) { - if (visual_state_op_connection.empty()) { - visual_state_op_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::end_visual_state_op), n), 1000); - } -} - -void -Editor::cancel_visual_state_op (uint32_t n) -{ - if (!visual_state_op_connection.empty()) { - visual_state_op_connection.disconnect(); - goto_visual_state (n); - } else { - //we land here if called from the menu OR if end_visual_state_op has been called - //so check if we are already in visual state n - // XXX not yet checking it at all, but redoing does not hurt - goto_visual_state (n); - } -} - -bool -Editor::end_visual_state_op (uint32_t n) -{ - visual_state_op_connection.disconnect(); save_visual_state (n); PopUp* pup = new PopUp (WIN_POS_MOUSE, 1000, true); @@ -6215,7 +6192,10 @@ Editor::end_visual_state_op (uint32_t n) snprintf (buf, sizeof (buf), _("Saved view %u"), n+1); pup->set_text (buf); pup->touch(); - - return false; // do not call again } +void +Editor::cancel_visual_state_op (uint32_t n) +{ + goto_visual_state (n); +} diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 22df5caebc..7d90dcc82e 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -181,32 +181,32 @@ (gtk_accel_path "<Actions>/Editor/select-range-between-cursors" "F6") (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11") -(gtk_accel_path "<Actions>/Editor/save-visual-state-1" "<%PRIMARY%>F1") -(gtk_accel_path "<Actions>/Editor/save-visual-state-2" "<%PRIMARY%>F2") -(gtk_accel_path "<Actions>/Editor/save-visual-state-3" "<%PRIMARY%>F3") -(gtk_accel_path "<Actions>/Editor/save-visual-state-4" "<%PRIMARY%>F4") -(gtk_accel_path "<Actions>/Editor/save-visual-state-5" "<%PRIMARY%>F5") -(gtk_accel_path "<Actions>/Editor/save-visual-state-6" "<%PRIMARY%>F6") -(gtk_accel_path "<Actions>/Editor/save-visual-state-7" "<%PRIMARY%>F7") -(gtk_accel_path "<Actions>/Editor/save-visual-state-8" "<%PRIMARY%>F8") -(gtk_accel_path "<Actions>/Editor/save-visual-state-9" "<%PRIMARY%>F9") -(gtk_accel_path "<Actions>/Editor/save-visual-state-10" "<%PRIMARY%>F10") -(gtk_accel_path "<Actions>/Editor/save-visual-state-11" "<%PRIMARY%>F11") -(gtk_accel_path "<Actions>/Editor/save-visual-state-12" "<%PRIMARY%>F12") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-1" "<release><%PRIMARY%>F1") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-2" "<release><%PRIMARY%>F2") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-3" "<release><%PRIMARY%>F3") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-4" "<release><%PRIMARY%>F4") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-5" "<release><%PRIMARY%>F5") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-6" "<release><%PRIMARY%>F6") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-7" "<release><%PRIMARY%>F7") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-8" "<release><%PRIMARY%>F8") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-9" "<release><%PRIMARY%>F9") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-10" "<release><%PRIMARY%>F10") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-11" "<release><%PRIMARY%>F11") -(gtk_accel_path "<Actions>/Editor/goto-visual-state-12" "<release><%PRIMARY%>F12") +(gtk_accel_path "<Actions>/Editor/save-visual-state-1" "<%TERTIARY%>F1") +(gtk_accel_path "<Actions>/Editor/save-visual-state-2" "<%TERTIARY%>F2") +(gtk_accel_path "<Actions>/Editor/save-visual-state-3" "<%TERTIARY%>F3") +(gtk_accel_path "<Actions>/Editor/save-visual-state-4" "<%TERTIARY%>F4") +(gtk_accel_path "<Actions>/Editor/save-visual-state-5" "<%TERTIARY%>F5") +(gtk_accel_path "<Actions>/Editor/save-visual-state-6" "<%TERTIARY%>F6") +(gtk_accel_path "<Actions>/Editor/save-visual-state-7" "<%TERTIARY%>F7") +(gtk_accel_path "<Actions>/Editor/save-visual-state-8" "<%TERTIARY%>F8") +(gtk_accel_path "<Actions>/Editor/save-visual-state-9" "<%TERTIARY%>F9") +(gtk_accel_path "<Actions>/Editor/save-visual-state-10" "<%TERTIARY%>F10") +(gtk_accel_path "<Actions>/Editor/save-visual-state-11" "<%TERTIARY%>F11") +(gtk_accel_path "<Actions>/Editor/save-visual-state-12" "<%TERTIARY%>F12") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-1" "F1") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-2" "F2") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-3" "F3") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-4" "F4") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-5" "F5") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-6" "F6") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-7" "F7") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-8" "F8") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-9" "F9") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-10" "F10") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-11" "F11") +(gtk_accel_path "<Actions>/Editor/goto-visual-state-12" "F12") ;; numbers |