From 250fe06ec776eda2b2dc33ea38a1beb3b0d54b9b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 3 Sep 2014 21:13:56 -0400 Subject: [PATCH] add Editor::_tool_cut_button to refer to button defined in ui/editor_window.xml and connect it to cut/split tool functionality --- gtk2_ardour/editor.cc | 14 ++------------ gtk2_ardour/editor.h | 2 +- gtk2_ardour/editor_actions.cc | 5 +---- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index d3eaa7b549..1853d90075 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -267,8 +267,9 @@ Editor::Editor () , _master_bus_ui_home (get_container ("master_bus_ui_home")) , vpacker (get_v_box ("vpacker")) , _tool_marker_button (get_waves_button ("tool_marker_button")) - , _tool_zoom_button (get_waves_button ("tool_zoom_button")) , _tool_arrow_button (get_waves_button ("tool_arrow_button")) + , _tool_zoom_button (get_waves_button ("tool_zoom_button")) + , _tool_cut_button (get_waves_button ("tool_cut_button")) , _temporal_zoom_adjustment (get_adjustment ("temporal_zoom_adjustment")) , _vertical_zoom_adjustment (get_adjustment ("vertical_zoom_adjustment")) , _vertical_zoom_fader (get_fader ("vertical_zoom_fader")) @@ -2876,16 +2877,6 @@ Editor::setup_toolbar () mouse_mode_hbox->set_spacing (2); - if (!ARDOUR::Profile->get_trx()) { - mouse_mode_hbox->pack_start (smart_mode_button, false, false); - mouse_mode_hbox->pack_start (mouse_cut_button, false, false); - mouse_mode_hbox->pack_start (mouse_gain_button, false, false); - mouse_mode_hbox->pack_start (mouse_timefx_button, false, false); - mouse_mode_hbox->pack_start (mouse_audition_button, false, false); - mouse_mode_hbox->pack_start (mouse_draw_button, false, false); - mouse_mode_hbox->pack_start (internal_edit_button, false, false, 8); - } - mouse_mode_vbox->pack_start (*mouse_mode_hbox); mouse_mode_align->add (*mouse_mode_vbox); @@ -3132,7 +3123,6 @@ void Editor::setup_tooltips () { ARDOUR_UI::instance()->set_tip (smart_mode_button, _("Smart Mode (add Range functions to Object mode)")); - ARDOUR_UI::instance()->set_tip (mouse_cut_button, _("Cut Mode (split Regions)")); ARDOUR_UI::instance()->set_tip (mouse_draw_button, _("Draw/Edit MIDI Notes")); ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Region Gain")); ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions and MIDI Notes")); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 34ae532bc4..df58bcb9a9 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1621,13 +1621,13 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD WavesButton& _tool_arrow_button; ArdourButton mouse_gain_button; WavesButton& _tool_zoom_button; + WavesButton& _tool_cut_button; Gtk::Adjustment& _temporal_zoom_adjustment; Gtk::Adjustment& _vertical_zoom_adjustment; Gtkmm2ext::Fader& _vertical_zoom_fader; ArdourButton mouse_timefx_button; ArdourButton mouse_audition_button; - ArdourButton mouse_cut_button; ArdourButton smart_mode_button; Glib::RefPtr smart_mode_action; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index a58d3e6c79..0aed7096ec 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -482,10 +482,7 @@ Editor::register_actions () mouse_timefx_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_image (::get_icon("tool_cut")); - mouse_cut_button.add_elements (ArdourButton::Inset ); - mouse_cut_button.set_name ("mouse mode button"); + _tool_cut_button.set_related_action (act); ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true));