smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

move zoom in/out buttons to EditingContext and use on the pianoroll

Browse source
This commit is contained in:
Paul Davis 2025-01-07 12:59:13 -07:00
parent 89c6c46f65
commit bd9ab55fa0
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/editing_context.cc
View file

@ -221,6 +221,13 @@ EditingContext::EditingContext (std::string const & name)
follow_playhead_button.signal_clicked.connect (sigc::mem_fun (*this, &EditingContext::follow_playhead_clicked)); 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)); 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++) { for (int i = 0; i < 16; i++) {
char buf[4]; char buf[4];
sprintf(buf, "%d", i+1); sprintf(buf, "%d", i+1);
@ -2183,6 +2190,13 @@ EditingContext::register_mouse_mode_actions ()
void void
EditingContext::bind_mouse_mode_buttons () EditingContext::bind_mouse_mode_buttons ()
{ {
RefPtr<Action> 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_related_action (get_mouse_mode_action (Editing::MouseObject));
mouse_move_button.set_icon (ArdourWidgets::ArdourIcon::ToolGrab); mouse_move_button.set_icon (ArdourWidgets::ArdourIcon::ToolGrab);
mouse_move_button.set_name ("mouse mode button"); mouse_move_button.set_name ("mouse mode button");

4
gtk2_ardour/editing_context.h
View file

@ -523,7 +523,11 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
ArdourWidgets::ArdourButton play_note_selection_button; ArdourWidgets::ArdourButton play_note_selection_button;
ArdourWidgets::ArdourButton note_mode_button; ArdourWidgets::ArdourButton note_mode_button;
ArdourWidgets::ArdourButton follow_playhead_button; ArdourWidgets::ArdourButton follow_playhead_button;
ArdourWidgets::ArdourButton zoom_in_button;
ArdourWidgets::ArdourButton zoom_out_button;
ArdourWidgets::ArdourButton full_zoom_button; ArdourWidgets::ArdourButton full_zoom_button;
Gtk::Label visible_channel_label; Gtk::Label visible_channel_label;
ArdourWidgets::ArdourDropdown visible_channel_selector; ArdourWidgets::ArdourDropdown visible_channel_selector;

10
gtk2_ardour/editor.cc
View file

@ -2691,16 +2691,6 @@ Editor::setup_toolbar ()
zoom_preset_selector.set_name ("zoom button"); zoom_preset_selector.set_name ("zoom button");
zoom_preset_selector.set_icon (ArdourIcon::ZoomExpand); 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_name ("zoom button");
zoom_out_full_button.set_icon (ArdourIcon::ZoomFull); zoom_out_full_button.set_icon (ArdourIcon::ZoomFull);
act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session")); act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));

2
gtk2_ardour/editor.h
View file

@ -1722,8 +1722,6 @@ private:
/* toolbar */ /* toolbar */
ArdourWidgets::ArdourButton zoom_in_button;
ArdourWidgets::ArdourButton zoom_out_button;
ArdourWidgets::ArdourButton zoom_out_full_button; ArdourWidgets::ArdourButton zoom_out_full_button;
ArdourWidgets::ArdourButton tav_expand_button; ArdourWidgets::ArdourButton tav_expand_button;