ardour/livetrax
13
0
Fork 0
Code

Add shortcut for link object/range mode. Fixes #3242.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7619 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-08-13 16:50:15 +00:00
parent 30bc7d4607
commit 5524e377a2
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/ardour.menus.in
View File

@ -215,6 +215,7 @@
<menuitem action='set-mouse-mode-gain'/>
<menuitem action='set-mouse-mode-zoom'/>
<menuitem action='set-mouse-mode-timefx'/>
<menuitem action='set-mouse-mode-object-range'/>
<separator/>
<menuitem action='toggle-internal-edit'/>
<separator/>

1
gtk2_ardour/editor.h
View File

@ -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;

4
gtk2_ardour/editor_actions.cc
View File

@ -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 ("");

2
gtk2_ardour/editor_mouse.cc
View File

@ -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) {

1
gtk2_ardour/mnemonic-us.bindings.in
View File

@ -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