From 5b112e489ba1bf2d49e54eeb00488ff29d75fbe7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 26 Nov 2024 21:20:11 -0700 Subject: [PATCH] move zoom in/out actions into shared "Editing" group --- gtk2_ardour/ardour.keys.in | 5 +++-- gtk2_ardour/editing_context.cc | 3 +++ gtk2_ardour/editing_context.h | 1 + gtk2_ardour/editor.cc | 4 ++-- gtk2_ardour/editor_actions.cc | 2 -- gtk2_ardour/midi_cue_editor.cc | 6 ++++++ gtk2_ardour/midi_cue_editor.h | 1 + libs/ctrl-interface/control_protocol/basic_ui.cc | 4 ++-- libs/surfaces/faderport/gui.cc | 4 ++-- libs/surfaces/maschine2/callbacks.cc | 4 ++-- libs/surfaces/wiimote/wiimote.cc | 4 ++-- share/midi_maps/midikb_wiimote.map | 4 ++-- 12 files changed, 26 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index 131dd6f976..fe6f6f6c14 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -106,8 +106,9 @@ This mode provides many different operations on both regions and control points, ;; punctuation -@vis|Editor/temporal-zoom-in| equal|zoom in -@vis|Editor/temporal-zoom-out| minus|zoom out +@editing|Editing/temporal-zoom-in| equal|zoom in +@editing|Editing/temporal-zoom-out| minus|zoom out + @vis|Editor/expand-tracks| <@TERTIARY@>plus|expand track height @vis|Editor/shrink-tracks| <@SECONDARY@><@TERTIARY@>plus|shrink track height @vis|Editor/zoom-to-session| <@SECONDARY@><@TERTIARY@>underscore|zoom to session diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc index 5642880207..c0ae35d923 100644 --- a/gtk2_ardour/editing_context.cc +++ b/gtk2_ardour/editing_context.cc @@ -260,6 +260,9 @@ EditingContext::register_common_actions (Bindings* common_bindings) _common_actions = ActionManager::create_action_group (common_bindings, X_("Editing")); + reg_sens (_common_actions, "temporal-zoom-out", _("Zoom Out"), []() { current_editing_context()->temporal_zoom_step (true); }); + reg_sens (_common_actions, "temporal-zoom-in", _("Zoom In"), []() { current_editing_context()->temporal_zoom_step (false); }); + undo_action = reg_sens (_common_actions, "undo", S_("Command|Undo"), []() { current_editing_context()->undo(1U) ; }); redo_action = reg_sens (_common_actions, "redo", _("Redo"), []() { current_editing_context()->redo(1U) ; }); alternate_redo_action = reg_sens (_common_actions, "alternate-redo", _("Redo"), []() { current_editing_context()->redo(1U) ; }); diff --git a/gtk2_ardour/editing_context.h b/gtk2_ardour/editing_context.h index eb04b62baf..367961547d 100644 --- a/gtk2_ardour/editing_context.h +++ b/gtk2_ardour/editing_context.h @@ -178,6 +178,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider virtual void set_selected_midi_region_view (MidiRegionView&); + virtual void temporal_zoom_step (bool zoom_out) = 0; samplecnt_t get_current_zoom () const { return samples_per_pixel; } double timeline_origin() const { return _timeline_origin; } diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 8932f52ac3..c298856bd4 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2713,12 +2713,12 @@ Editor::setup_toolbar () zoom_in_button.set_name ("zoom button"); zoom_in_button.set_icon (ArdourIcon::ZoomIn); - act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in")); + 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_("Editor"), X_("temporal-zoom-out")); + 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"); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index a5982c1d67..b4ae312a24 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -296,8 +296,6 @@ Editor::register_actions () reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::cancel_visual_state_op), i - 1)); } - reg_sens (editor_actions, "temporal-zoom-out", _("Zoom Out"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true)); - reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)); reg_sens (editor_actions, "zoom-to-extents", _("Zoom to Extents"), sigc::mem_fun(*this, &Editor::temporal_zoom_extents)); reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Both)); diff --git a/gtk2_ardour/midi_cue_editor.cc b/gtk2_ardour/midi_cue_editor.cc index d2a4c90f42..e1e58b1ec0 100644 --- a/gtk2_ardour/midi_cue_editor.cc +++ b/gtk2_ardour/midi_cue_editor.cc @@ -1815,6 +1815,12 @@ MidiCueEditor::set (TriggerReference & tref) } } +void +MidiCueEditor::temporal_zoom_step (bool zoom_out) +{ + std::cerr << "MCE: zoom step out ? " << zoom_out << std::endl; +} + void MidiCueEditor::unset () { diff --git a/gtk2_ardour/midi_cue_editor.h b/gtk2_ardour/midi_cue_editor.h index d52b1cf755..4ce026bec3 100644 --- a/gtk2_ardour/midi_cue_editor.h +++ b/gtk2_ardour/midi_cue_editor.h @@ -58,6 +58,7 @@ class MidiCueEditor : public CueEditor double visible_canvas_width() const { return _visible_canvas_width; } samplecnt_t current_page_samples() const; + void temporal_zoom_step (bool zoom_out); void get_per_region_note_selection (std::list > > > >&) const {} diff --git a/libs/ctrl-interface/control_protocol/basic_ui.cc b/libs/ctrl-interface/control_protocol/basic_ui.cc index 5a1dbc7e7f..07955844af 100644 --- a/libs/ctrl-interface/control_protocol/basic_ui.cc +++ b/libs/ctrl-interface/control_protocol/basic_ui.cc @@ -760,8 +760,8 @@ void BasicUI::zoom_1_min() { access_action("Editor/zoom_1_min"); } void BasicUI::zoom_5_min() { access_action("Editor/zoom_5_min"); } void BasicUI::zoom_10_min() { access_action("Editor/zoom_10_min"); } void BasicUI::zoom_to_session() { access_action("Editor/zoom-to-session"); } -void BasicUI::temporal_zoom_in() { access_action("Editor/temporal-zoom-in"); } -void BasicUI::temporal_zoom_out() { access_action("Editor/temporal-zoom-out"); } +void BasicUI::temporal_zoom_in() { access_action("Editing/temporal-zoom-in"); } +void BasicUI::temporal_zoom_out() { access_action("Editing/temporal-zoom-out"); } void BasicUI::scroll_up_1_track() { access_action("Editor/step-tracks-up"); } void BasicUI::scroll_dn_1_track() { access_action("Editor/step-tracks-down"); } diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index 594e2b39d8..c95e0f1615 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -392,8 +392,8 @@ FPGUI::build_proj_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) actions.push_back (make_pair (string (_("Zoom to Session")), string (X_("Editor/zoom-to-session")))); #if 0 - actions.push_back (make_pair (string (_("Zoom In")), string (X_("Editor/temporal-zoom-in")))); - actions.push_back (make_pair (string (_("Zoom Out")), string (X_("Editor/temporal-zoom-out")))); + actions.push_back (make_pair (string (_("Zoom In")), string (X_("Editing/temporal-zoom-in")))); + actions.push_back (make_pair (string (_("Zoom Out")), string (X_("Editing/temporal-zoom-out")))); #endif build_action_combo (cb, actions, FaderPort::Proj, bs); diff --git a/libs/surfaces/maschine2/callbacks.cc b/libs/surfaces/maschine2/callbacks.cc index b842527129..08b4d2ace9 100644 --- a/libs/surfaces/maschine2/callbacks.cc +++ b/libs/surfaces/maschine2/callbacks.cc @@ -348,9 +348,9 @@ Maschine2::encoder_master (int delta) case MST_NONE: if (_ctrl->button (M2Contols::BtnShift, M2Contols::ModNone)->active ()) { if (delta > 0) { - AccessAction ("Editor", "temporal-zoom-in"); + AccessAction ("Editing", "temporal-zoom-in"); } else { - AccessAction ("Editor", "temporal-zoom-out"); + AccessAction ("Editing", "temporal-zoom-out"); } } else { if (delta > 0) { diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc index a6ab558685..0b79ce3823 100644 --- a/libs/surfaces/wiimote/wiimote.cc +++ b/libs/surfaces/wiimote/wiimote.cc @@ -417,12 +417,12 @@ WiimoteControlProtocol::wiimote_callback (int mesg_count, union cwiid_mesg mesg[ // + = zoom in if (b & CWIID_BTN_PLUS) { - access_action ("Editor/temporal-zoom-in"); + access_action ("Editing/temporal-zoom-in"); } // - = zoom out if (b & CWIID_BTN_MINUS) { - access_action ("Editor/temporal-zoom-out"); + access_action ("Editing/temporal-zoom-out"); } // home = no-op diff --git a/share/midi_maps/midikb_wiimote.map b/share/midi_maps/midikb_wiimote.map index 740bb6c9bf..83b09c117f 100644 --- a/share/midi_maps/midikb_wiimote.map +++ b/share/midi_maps/midikb_wiimote.map @@ -37,9 +37,9 @@ - + - +