From bd9ab55fa068f56c7f4fb060c9f63f6c1cd8ac19 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 7 Jan 2025 12:59:13 -0700 Subject: [PATCH] move zoom in/out buttons to EditingContext and use on the pianoroll --- gtk2_ardour/editing_context.cc | 14 ++++++++++++++ gtk2_ardour/editing_context.h | 4 ++++ gtk2_ardour/editor.cc | 10 ---------- gtk2_ardour/editor.h | 2 -- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc index d2daf04331..79821e33c6 100644 --- a/gtk2_ardour/editing_context.cc +++ b/gtk2_ardour/editing_context.cc @@ -221,6 +221,13 @@ EditingContext::EditingContext (std::string const & name) follow_playhead_button.signal_clicked.connect (sigc::mem_fun (*this, &EditingContext::follow_playhead_clicked)); full_zoom_button.signal_clicked.connect (sigc::mem_fun (*this, &EditingContext::full_zoom_clicked)); + zoom_in_button.set_name ("zoom button"); + zoom_in_button.set_icon (ArdourIcon::ZoomIn); + + zoom_out_button.set_name ("zoom button"); + zoom_out_button.set_icon (ArdourIcon::ZoomOut); + + for (int i = 0; i < 16; i++) { char buf[4]; sprintf(buf, "%d", i+1); @@ -2183,6 +2190,13 @@ EditingContext::register_mouse_mode_actions () void EditingContext::bind_mouse_mode_buttons () { + RefPtr act; + + act = ActionManager::get_action (X_("Editing"), X_("temporal-zoom-in")); + zoom_in_button.set_related_action (act); + act = ActionManager::get_action (X_("Editing"), X_("temporal-zoom-out")); + zoom_out_button.set_related_action (act); + mouse_move_button.set_related_action (get_mouse_mode_action (Editing::MouseObject)); mouse_move_button.set_icon (ArdourWidgets::ArdourIcon::ToolGrab); mouse_move_button.set_name ("mouse mode button"); diff --git a/gtk2_ardour/editing_context.h b/gtk2_ardour/editing_context.h index a8f2441cc1..f794e1e8b8 100644 --- a/gtk2_ardour/editing_context.h +++ b/gtk2_ardour/editing_context.h @@ -523,7 +523,11 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider ArdourWidgets::ArdourButton play_note_selection_button; ArdourWidgets::ArdourButton note_mode_button; ArdourWidgets::ArdourButton follow_playhead_button; + + ArdourWidgets::ArdourButton zoom_in_button; + ArdourWidgets::ArdourButton zoom_out_button; ArdourWidgets::ArdourButton full_zoom_button; + Gtk::Label visible_channel_label; ArdourWidgets::ArdourDropdown visible_channel_selector; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c07d651514..fd7c027bb4 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2691,16 +2691,6 @@ Editor::setup_toolbar () zoom_preset_selector.set_name ("zoom button"); zoom_preset_selector.set_icon (ArdourIcon::ZoomExpand); - zoom_in_button.set_name ("zoom button"); - zoom_in_button.set_icon (ArdourIcon::ZoomIn); - act = ActionManager::get_action (X_("Editing"), X_("temporal-zoom-in")); - zoom_in_button.set_related_action (act); - - zoom_out_button.set_name ("zoom button"); - zoom_out_button.set_icon (ArdourIcon::ZoomOut); - act = ActionManager::get_action (X_("Editing"), X_("temporal-zoom-out")); - zoom_out_button.set_related_action (act); - zoom_out_full_button.set_name ("zoom button"); zoom_out_full_button.set_icon (ArdourIcon::ZoomFull); act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session")); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index fb6204a4a1..aea5de5262 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1722,8 +1722,6 @@ private: /* toolbar */ - ArdourWidgets::ArdourButton zoom_in_button; - ArdourWidgets::ArdourButton zoom_out_button; ArdourWidgets::ArdourButton zoom_out_full_button; ArdourWidgets::ArdourButton tav_expand_button;