diff options
| -rw-r--r-- | gtk2_ardour/editor.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index b1c279985b..fa4ad25bff 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3054,9 +3054,7 @@ Editor::setup_toolbar () Glib::RefPtr<SizeGroup> mouse_mode_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL); mouse_mode_size_group->add_widget (smart_mode_button); mouse_mode_size_group->add_widget (mouse_move_button); - if (!Profile->get_mixbus()) { - mouse_mode_size_group->add_widget (mouse_cut_button); - } + mouse_mode_size_group->add_widget (mouse_cut_button); mouse_mode_size_group->add_widget (mouse_select_button); mouse_mode_size_group->add_widget (mouse_timefx_button); if (!Profile->get_mixbus()) { @@ -3093,8 +3091,9 @@ Editor::setup_toolbar () mouse_mode_hbox->pack_start (mouse_move_button, false, false); mouse_mode_hbox->pack_start (mouse_select_button, false, false); + mouse_mode_hbox->pack_start (mouse_cut_button, false, false); + if (!ARDOUR::Profile->get_mixbus()) { - mouse_mode_hbox->pack_start (mouse_cut_button, false, false); mouse_mode_hbox->pack_start (mouse_audition_button, false, false); } diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 86d2f1bf5a..adb783ca54 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -531,12 +531,10 @@ Editor::register_actions () mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent); mouse_content_button.set_name ("mouse mode button"); - if(!Profile->get_mixbus()) { - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut)); - mouse_cut_button.set_related_action (act); - mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut); - mouse_cut_button.set_name ("mouse mode button"); - } + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut)); + mouse_cut_button.set_related_action (act); + mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut); + mouse_cut_button.set_name ("mouse mode button"); ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true)); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 833e909ded..22476d5d62 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -274,7 +274,6 @@ Editor::set_mouse_mode (MouseMode m, bool force) } if (ARDOUR::Profile->get_mixbus()) { - if (m == MouseCut) m = MouseObject; if (m == MouseAudition) m = MouseRange; } @@ -292,7 +291,6 @@ void Editor::mouse_mode_toggled (MouseMode m) { if (ARDOUR::Profile->get_mixbus()) { - if (m == MouseCut) m = MouseObject; if (m == MouseAudition) m = MouseRange; } |