From 2f6a0abf04b9ab3b7dd0ab132755b4a391fa8225 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 28 Aug 2023 21:02:43 +0200 Subject: [PATCH] Use "Arrangement" in GUI instead of Section Reserve Section for time-selection without track selection --- gtk2_ardour/ardour.menus.in | 2 +- gtk2_ardour/editor.cc | 4 ++-- gtk2_ardour/editor_actions.cc | 2 +- gtk2_ardour/editor_canvas.cc | 8 ++++---- gtk2_ardour/editor_markers.cc | 10 +++++++--- gtk2_ardour/editor_rulers.cc | 6 +++--- gtk2_ardour/ruler_dialog.cc | 2 +- gtk2_ardour/themes/blueberry_milk-ardour.colors | 4 ++-- gtk2_ardour/themes/caineville-ardour.colors | 4 ++-- gtk2_ardour/themes/clear_gray-ardour.colors | 4 ++-- gtk2_ardour/themes/cubasish-ardour.colors | 4 ++-- gtk2_ardour/themes/dark-ardour.colors | 4 ++-- gtk2_ardour/themes/diehard3-ardour.colors | 4 ++-- gtk2_ardour/themes/recbox-ardour.colors | 4 ++-- gtk2_ardour/themes/unastudia-ardour.colors | 4 ++-- gtk2_ardour/themes/xcolors-ardour.colors | 4 ++-- 16 files changed, 37 insertions(+), 33 deletions(-) diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 459557a028..43353e17be 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -541,7 +541,7 @@ - + diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6fa22b200a..f0919ee80e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -339,7 +339,7 @@ Editor::Editor () , range_mark_label (_("Range Markers")) , transport_mark_label (_("Loop/Punch Ranges")) , cd_mark_label (_("CD Markers")) - , section_mark_label (_("Sections")) + , section_mark_label (_("Arrangement")) , cue_mark_label (_("Cue Markers")) , videotl_label (_("Video Timeline")) , videotl_group (0) @@ -703,7 +703,7 @@ Editor::Editor () add_notebook_page (_("Sources"), _sources->widget ()); add_notebook_page (_("Regions"), _regions->widget ()); add_notebook_page (_("Clips"), _trigger_clip_picker); - add_notebook_page (_("Sections"), _sections->widget ()); + add_notebook_page (_("Arrangement"), _sections->widget ()); add_notebook_page (_("Snapshots"), _snapshots->widget ()); add_notebook_page (_("Track & Bus Groups"), _route_groups->widget ()); add_notebook_page (_("Ranges & Marks"), _locations->widget ()); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 47022ceb7b..7dbce7dec2 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -728,7 +728,7 @@ Editor::register_actions () ruler_range_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-range-ruler"), _("Range Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); ruler_loop_punch_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-loop-punch-ruler"), _("Loop/Punch Ranges"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); ruler_cd_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-cd-marker-ruler"), _("CD Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); - ruler_section_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-section-ruler"), _("Section Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_section_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-arrangement-ruler"), _("Arrangement"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); ruler_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-marker-ruler"), _("Location Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); ruler_cue_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-cue-marker-ruler"), _("Cue Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 68dd77bc8f..48aed1c0b4 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -171,7 +171,7 @@ Editor::initialize_canvas () tempo_meta_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 4.0) + 1.0)); CANVAS_DEBUG_NAME (tempo_meta_group, "tempo meta group"); section_marker_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 5.0) + 1.0)); - CANVAS_DEBUG_NAME (tempo_meta_group, "Section marker group"); + CANVAS_DEBUG_NAME (tempo_meta_group, "Arranger marker group"); tempo_group = new ArdourCanvas::Container (tempo_meta_group, ArdourCanvas::Duple (0.0, 0.0)); CANVAS_DEBUG_NAME (tempo_group, "tempo group"); mapping_group = new ArdourCanvas::Container (tempo_meta_group, ArdourCanvas::Duple (0.0, 0.0)); @@ -221,7 +221,7 @@ Editor::initialize_canvas () CANVAS_DEBUG_NAME (cd_marker_bar, "CD Marker Bar"); section_marker_bar = new ArdourCanvas::Rectangle (section_marker_group, ArdourCanvas::Rect (0.0, timebar_top, ArdourCanvas::COORD_MAX, timebar_btm)); - CANVAS_DEBUG_NAME (section_marker_bar, "Section Marker Bar"); + CANVAS_DEBUG_NAME (section_marker_bar, "Arranger Marker Bar"); cue_marker_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0)); cue_marker_bar = new ArdourCanvas::Rectangle (cue_marker_group, ArdourCanvas::Rect (0.0, timebar_top, ArdourCanvas::COORD_MAX, timebar_btm)); @@ -275,7 +275,7 @@ Editor::initialize_canvas () meter_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), meter_bar, MeterBarItem, "meter bar")); marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), marker_bar, MarkerBarItem, "marker bar")); cd_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), cd_marker_bar, CdMarkerBarItem, "cd marker bar")); - section_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), section_marker_bar, SectionMarkerBarItem, "section marker bar")); + section_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), section_marker_bar, SectionMarkerBarItem, "arrangement marker bar")); cue_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), cue_marker_bar, CueMarkerBarItem, "cd marker bar")); videotl_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_group)); range_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_bar_event), range_marker_bar, RangeMarkerBarItem, "range marker bar")); @@ -1089,7 +1089,7 @@ Editor::color_handler() cd_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("cd marker bar", "marker bar")); cd_marker_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator")); - section_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("section marker bar", "marker bar")); + section_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("arrangement marker bar", "marker bar")); section_marker_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator")); cue_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("cd marker bar", "marker bar")); diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index c4b0c462d6..aef7730835 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -108,7 +108,7 @@ Editor::add_new_location_internal (Location* location) if (location->is_cd_marker()) { color = X_("location cd marker"); } else if (location->is_section()) { - color = X_("location section marker"); + color = X_("location arrangement marker"); } else if (location->is_mark()) { color = X_("location marker"); } else if (location->is_auto_loop()) { @@ -425,7 +425,7 @@ Editor::location_flags_changed (Location *location) if (location->is_cd_marker()) { lam->set_color ("location cd marker"); } else if (location->is_section()) { - lam->set_color ("location section marker"); + lam->set_color ("location arrangement marker"); } else if (location->is_mark()) { lam->set_color ("location marker"); } else if (location->is_auto_punch()) { @@ -714,7 +714,11 @@ Editor::mouse_add_new_marker (timepos_t where, Location::Flags extra_flags, int3 /* XXX i18n needed for cue letter names */ markername = string_compose (_("cue %1"), cue_marker_name (cue_id)); } else { - namebase = _("mark"); + if (flags & Location::IsSection) { + namebase = _("verse"); + } else { + namebase = _("mark"); + } _session->locations()->next_available_name (markername, namebase); if (!choose_new_marker_name (markername)) { diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index d2d4b838a4..390a794656 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -246,7 +246,7 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t) break; case SectionMarkerBarItem: - ruler_items.push_back (MenuElem (_("New Section Marker"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, Location::Flags(Location::IsMark | Location::IsSection), 0))); + ruler_items.push_back (MenuElem (_("New Arrangement Marker"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, Location::Flags(Location::IsMark | Location::IsSection), 0))); break; case CueMarkerBarItem: @@ -345,7 +345,7 @@ Editor::store_ruler_visibility () node->set_property (X_("rangemarker"), ruler_range_action->get_active()); node->set_property (X_("transportmarker"), ruler_loop_punch_action->get_active()); node->set_property (X_("cdmarker"), ruler_cd_marker_action->get_active()); - node->set_property (X_("section"), ruler_section_action->get_active()); + node->set_property (X_("arrangement"), ruler_section_action->get_active()); node->set_property (X_("marker"), ruler_marker_action->get_active()); node->set_property (X_("cuemarker"), ruler_cue_marker_action->get_active()); node->set_property (X_("videotl"), ruler_video_action->get_active()); @@ -406,7 +406,7 @@ Editor::restore_ruler_visibility () } } - if (node->get_property ("section", yn)) { + if (node->get_property ("arrangement", yn)) { ruler_section_action->set_active (yn); } else { ruler_section_action->set_active (true); diff --git a/gtk2_ardour/ruler_dialog.cc b/gtk2_ardour/ruler_dialog.cc index e57d37468c..35344fa1eb 100644 --- a/gtk2_ardour/ruler_dialog.cc +++ b/gtk2_ardour/ruler_dialog.cc @@ -55,7 +55,7 @@ RulerDialog::RulerDialog () connect_action (range_button, "range-ruler"); connect_action (mark_button, "marker-ruler"); connect_action (cdmark_button, "cd-marker-ruler"); - connect_action (section_button, "section-ruler"); + connect_action (section_button, "arrangement-ruler"); connect_action (cuemark_button, "cue-marker-ruler"); connect_action (video_button, "video-ruler"); } diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors index 8196fcdab0..fd9104c599 100644 --- a/gtk2_ardour/themes/blueberry_milk-ardour.colors +++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors @@ -50,6 +50,7 @@ + @@ -175,7 +176,7 @@ - + @@ -374,7 +375,6 @@ - diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors index 31dd990eb0..cdde95d03f 100644 --- a/gtk2_ardour/themes/caineville-ardour.colors +++ b/gtk2_ardour/themes/caineville-ardour.colors @@ -51,6 +51,7 @@ + @@ -176,7 +177,7 @@ - + @@ -375,7 +376,6 @@ - diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors index bdf3353b23..8f4ad4eb88 100644 --- a/gtk2_ardour/themes/clear_gray-ardour.colors +++ b/gtk2_ardour/themes/clear_gray-ardour.colors @@ -51,6 +51,7 @@ + @@ -176,7 +177,7 @@ - + @@ -375,7 +376,6 @@ - diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors index a9296699df..4fecb87ef0 100644 --- a/gtk2_ardour/themes/cubasish-ardour.colors +++ b/gtk2_ardour/themes/cubasish-ardour.colors @@ -51,6 +51,7 @@ + @@ -176,7 +177,7 @@ - + @@ -375,7 +376,6 @@ - diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors index 7a95dbe0b0..e4288cfc25 100644 --- a/gtk2_ardour/themes/dark-ardour.colors +++ b/gtk2_ardour/themes/dark-ardour.colors @@ -52,6 +52,7 @@ + @@ -177,7 +178,7 @@ - + @@ -376,7 +377,6 @@ - diff --git a/gtk2_ardour/themes/diehard3-ardour.colors b/gtk2_ardour/themes/diehard3-ardour.colors index a191186ed8..b537fe6fa3 100644 --- a/gtk2_ardour/themes/diehard3-ardour.colors +++ b/gtk2_ardour/themes/diehard3-ardour.colors @@ -52,6 +52,7 @@ + @@ -177,7 +178,7 @@ - + @@ -377,7 +378,6 @@ - diff --git a/gtk2_ardour/themes/recbox-ardour.colors b/gtk2_ardour/themes/recbox-ardour.colors index 5918e03cbc..8fe5f822ea 100644 --- a/gtk2_ardour/themes/recbox-ardour.colors +++ b/gtk2_ardour/themes/recbox-ardour.colors @@ -52,6 +52,7 @@ + @@ -177,7 +178,7 @@ - + @@ -376,7 +377,6 @@ - diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors index a10dbaef57..c0f47062f8 100644 --- a/gtk2_ardour/themes/unastudia-ardour.colors +++ b/gtk2_ardour/themes/unastudia-ardour.colors @@ -50,6 +50,7 @@ + @@ -175,7 +176,7 @@ - + @@ -373,7 +374,6 @@ - diff --git a/gtk2_ardour/themes/xcolors-ardour.colors b/gtk2_ardour/themes/xcolors-ardour.colors index e269a15e55..c4ba12fa99 100644 --- a/gtk2_ardour/themes/xcolors-ardour.colors +++ b/gtk2_ardour/themes/xcolors-ardour.colors @@ -51,6 +51,7 @@ + @@ -176,7 +177,7 @@ - + @@ -375,7 +376,6 @@ -