From 5524e377a2668e75c1a50c02fcb4cd7a88701e8e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 13 Aug 2010 16:50:15 +0000 Subject: Add shortcut for link object/range mode. Fixes #3242. git-svn-id: svn://localhost/ardour2/branches/3.0@7619 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour.menus.in | 1 + gtk2_ardour/editor.h | 1 + gtk2_ardour/editor_actions.cc | 4 +++- gtk2_ardour/editor_mouse.cc | 2 -- gtk2_ardour/mnemonic-us.bindings.in | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 008d250f00..8d6950b90b 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -215,6 +215,7 @@ + diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index a29b8417a0..55ea12c35e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1544,6 +1544,7 @@ public: Gtk::ToggleButton join_object_range_button; void mouse_mode_toggled (Editing::MouseMode m); + void mouse_mode_object_range_toggled () {} bool ignore_mouse_mode_toggle; Gtk::ToggleButton internal_edit_button; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index f1d20fbed7..8243f02356 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -654,6 +654,8 @@ Editor::register_actions () mouse_select_button.set_name ("MouseModeButton"); mouse_select_button.get_image ()->show (); + act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Link Object / Range Tools"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled)); + act->connect_proxy (join_object_range_button); join_object_range_button.set_image (*(manage (new Image (::get_icon ("tool_object_range"))))); join_object_range_button.set_label (""); join_object_range_button.set_name ("MouseModeButton"); @@ -680,7 +682,7 @@ Editor::register_actions () mouse_audition_button.set_name ("MouseModeButton"); mouse_audition_button.get_image ()->show (); - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Timefx Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); act->connect_proxy (mouse_timefx_button); mouse_timefx_button.set_image (*(manage (new Image (::get_icon("tool_stretch"))))); mouse_timefx_button.set_label (""); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index cab20ce3e8..18ed2c9226 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -326,8 +326,6 @@ Editor::mouse_mode_toggled (MouseMode m) instant_save (); - cerr << "Mouse mode toggled to " << m << endl; - if (!internal_editing()) { if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) { diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 3754591015..5ba5011187 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -148,6 +148,7 @@ This mode provides many different operations on both regions and control points, @mmode|MouseMode/set-mouse-mode-timefx|t|timefx mode @rop|Editor/pitch-shift-region|<@SECONDARY@>t|transpose @eep|Editor/insert-time|<@PRIMARY@>t|insert time +@mmode|MouseMode/set-mouse-mode-object-range|y|link object/range tools @select|Editor/select-all-between-cursors|<@PRIMARY@>u|all enclosed by edit range @select|Editor/select-all-within-cursors|u|all present in edit range @eep|Editor/insert-region|i|insert from region list -- cgit v1.2.3