ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Use "Arrangement" in GUI instead of Section 

Reserve Section for time-selection without track selection
This commit is contained in:
Robin Gareus 2023-08-28 21:02:43 +02:00
parent 498c113750
commit 2f6a0abf04
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
16 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour.menus.in
View File

@ -541,7 +541,7 @@
<menuitem action="toggle-range-ruler"/>
<menuitem action="toggle-loop-punch-ruler"/>
<menuitem action="toggle-cd-marker-ruler"/>
<menuitem action="toggle-section-ruler"/>
<menuitem action="toggle-arrangement-ruler"/>
<menuitem action="toggle-marker-ruler"/>
<menuitem action="toggle-cue-marker-ruler"/>
<separator/>

4
gtk2_ardour/editor.cc
View File

@ -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 ());

2
gtk2_ardour/editor_actions.cc
View File

@ -728,7 +728,7 @@ Editor::register_actions ()
ruler_range_action = Glib::RefPtr<ToggleAction>::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<ToggleAction>::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<ToggleAction>::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<ToggleAction>::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<ToggleAction>::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<ToggleAction>::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<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-cue-marker-ruler"), _("Cue Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility)));

8
gtk2_ardour/editor_canvas.cc
View File

@ -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"));

10
gtk2_ardour/editor_markers.cc
View File

@ -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)) {

6
gtk2_ardour/editor_rulers.cc
View File

@ -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);

2
gtk2_ardour/ruler_dialog.cc
View File

@ -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");
}

4
gtk2_ardour/themes/blueberry_milk-ardour.colors
View File

@ -50,6 +50,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="theme:bg"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="widget:blue darker"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -175,7 +176,7 @@
<ColorAlias name="location marker" alias="theme:contrasting alt"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:green"/>
<ColorAlias name="location section marker" alias="theme:contrasting clock"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting clock"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -374,7 +375,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="neutral:foregroundest"/>
<ColorAlias name="selected region base" alias="widget:ruddy"/>
<ColorAlias name="selected time axis frame" alias="alert:blue"/>

4
gtk2_ardour/themes/caineville-ardour.colors
View File

@ -51,6 +51,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="theme:bg"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="widget:bg"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -176,7 +177,7 @@
<ColorAlias name="location marker" alias="theme:contrasting alt"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:green"/>
<ColorAlias name="location section marker" alias="theme:contrasting clock"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting clock"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -375,7 +376,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="theme:contrasting alt"/>
<ColorAlias name="selected time axis frame" alias="alert:ruddy"/>

4
gtk2_ardour/themes/clear_gray-ardour.colors
View File

@ -51,6 +51,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="neutral:foreground2"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="widget:blue darker"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -176,7 +177,7 @@
<ColorAlias name="location marker" alias="theme:contrasting"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:green"/>
<ColorAlias name="location section marker" alias="theme:contrasting clock"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting clock"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -375,7 +376,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="alert:ruddy"/>
<ColorAlias name="selected time axis frame" alias="alert:ruddy"/>

4
gtk2_ardour/themes/cubasish-ardour.colors
View File

@ -51,6 +51,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="neutral:foreground"/>
<ColorAlias name="arrangement marker bar" alias="neutral:backgroundest"/>
<ColorAlias name="audio automation track fill" alias="theme:contrasting clock"/>
<ColorAlias name="audio bus base" alias="widget:blue darker"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -176,7 +177,7 @@
<ColorAlias name="location marker" alias="widget:blue"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:green"/>
<ColorAlias name="location section marker" alias="theme:contrasting alt"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -375,7 +376,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:backgroundest"/>
<ColorAlias name="selected midi note frame" alias="alert:cyan"/>
<ColorAlias name="selected region base" alias="theme:contrasting clock"/>
<ColorAlias name="selected time axis frame" alias="widget:blue"/>

4
gtk2_ardour/themes/dark-ardour.colors
View File

@ -52,6 +52,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="theme:bg"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="widget:blue darker"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -177,7 +178,7 @@
<ColorAlias name="location marker" alias="theme:contrasting less"/>
<ColorAlias name="location punch" alias="widget:ruddy"/>
<ColorAlias name="location range" alias="theme:contrasting less"/>
<ColorAlias name="location section marker" alias="theme:contrasting alt"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -376,7 +377,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="alert:ruddy"/>
<ColorAlias name="selected time axis frame" alias="alert:ruddy"/>

4
gtk2_ardour/themes/diehard3-ardour.colors
View File

@ -52,6 +52,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="theme:bg"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="widget:blue"/>
<ColorAlias name="audio master bus base" alias="neutral:background"/>
@ -177,7 +178,7 @@
<ColorAlias name="location marker" alias="theme:contrasting clock"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:green"/>
<ColorAlias name="location section marker" alias="theme:contrasting alt"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -377,7 +378,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="alert:ruddy"/>
<ColorAlias name="selected time axis frame" alias="alert:ruddy"/>

4
gtk2_ardour/themes/recbox-ardour.colors
View File

@ -52,6 +52,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="theme:bg"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="widget:blue darker"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -177,7 +178,7 @@
<ColorAlias name="location marker" alias="theme:contrasting clock"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:green"/>
<ColorAlias name="location section marker" alias="theme:contrasting alt"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -376,7 +377,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="alert:ruddy"/>
<ColorAlias name="selected time axis frame" alias="alert:ruddy"/>

4
gtk2_ardour/themes/unastudia-ardour.colors
View File

@ -50,6 +50,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="neutral:background2"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="neutral:background2"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -175,7 +176,7 @@
<ColorAlias name="location marker" alias="theme:contrasting clock"/>
<ColorAlias name="location punch" alias="alert:ruddy"/>
<ColorAlias name="location range" alias="alert:blue"/>
<ColorAlias name="location section marker" alias="theme:contrasting alt"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -373,7 +374,6 @@
<ColorAlias name="secondary delta clock: background" alias="theme:bg2"/>
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="neutral:foregroundest"/>

4
gtk2_ardour/themes/xcolors-ardour.colors
View File

@ -51,6 +51,7 @@
<ColorAliases>
<ColorAlias name="active crossfade" alias="neutral:foreground"/>
<ColorAlias name="arrange base" alias="theme:bg"/>
<ColorAlias name="arrangement marker bar" alias="neutral:background2"/>
<ColorAlias name="audio automation track fill" alias="theme:bg"/>
<ColorAlias name="audio bus base" alias="neutral:background"/>
<ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
@ -176,7 +177,7 @@
<ColorAlias name="location marker" alias="alert:yellow"/>
<ColorAlias name="location punch" alias="alert:red"/>
<ColorAlias name="location range" alias="alert:greenish"/>
<ColorAlias name="location section marker" alias="theme:contrasting alt"/>
<ColorAlias name="location arrangement marker" alias="theme:contrasting alt"/>
<ColorAlias name="lock button: fill active" alias="widget:bg"/>
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
@ -375,7 +376,6 @@
<ColorAlias name="secondary delta clock: cursor" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: edited text" alias="theme:contrasting alt"/>
<ColorAlias name="secondary delta clock: text" alias="theme:contrasting alt"/>
<ColorAlias name="section marker bar" alias="neutral:background2"/>
<ColorAlias name="selected midi note frame" alias="alert:ruddy"/>
<ColorAlias name="selected region base" alias="alert:ruddy"/>
<ColorAlias name="selected time axis frame" alias="alert:ruddy"/>