From 4b302392751f1889158d8459ad63dab6fcd11f74 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 15 May 2023 15:23:46 -0500 Subject: [PATCH] split route-coloring option into Tracks and Buses --- gtk2_ardour/rc_option_editor.cc | 22 +++++++++++++++++----- gtk2_ardour/route_ui.cc | 4 +++- gtk2_ardour/ui_config_vars.h | 3 ++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index f972a865db..013d292ef0 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2945,13 +2945,25 @@ RCOptionEditor::RCOptionEditor () bo = new BoolOption ( "use-palette-for-new-route", - _("Use color-palette to assign color for new tracks/busses"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_palette_for_new_route), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_palette_for_new_route) + _("Use color-palette to assign color for new Tracks"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_palette_for_new_track), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_palette_for_new_track) ); Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), - _("When enabled new Routes are assigned a color from the stripable-color-palette in round-robin fashion.\n" - "When disabled all new Routes will have a neutral color from the theme." + _("When enabled new Tracks are assigned a color from the stripable-color-palette in round-robin fashion.\n" + "When disabled all new Tracks will use the FIRST color from the stripable-color-palette." + )); + add_option (_("Appearance/Colors"), bo); + + bo = new BoolOption ( + "use-palette-for-new-route", + _("Use color-palette to assign color for new Busses"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_palette_for_new_bus), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_palette_for_new_bus) + ); + Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), + _("When enabled new Buses are assigned a color from the stripable-color-palette in round-robin fashion.\n" + "When disabled all new Buses will use the FIRST color from the stripable-color-palette." )); add_option (_("Appearance/Colors"), bo); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 6f17fbf196..d4e8b9027b 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -366,7 +366,9 @@ RouteUI::set_route (std::shared_ptr rp) } if (set_color_from_route()) { - if (UIConfiguration::instance().get_use_palette_for_new_route ()) { + if (_route->is_track() && UIConfiguration::instance().get_use_palette_for_new_track ()) { + set_color (gdk_color_to_rgba (AxisView::round_robin_palette_color ())); + } else if (!_route->is_track() && UIConfiguration::instance().get_use_palette_for_new_bus ()) { set_color (gdk_color_to_rgba (AxisView::round_robin_palette_color ())); } else { string cp = UIConfiguration::instance().get_stripable_color_palette (); diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index 0eb293b03e..b9d5360648 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -123,7 +123,8 @@ UI_CONFIG_VARIABLE (uint32_t, action_table_columns, "action-table-columns", 3) UI_CONFIG_VARIABLE (bool, hide_splash_screen, "hide-splash-screen", true) UI_CONFIG_VARIABLE (bool, check_announcements, "check-announcements,", true) UI_CONFIG_VARIABLE (bool, use_wm_visibility, "use-wm-visibility", true) -UI_CONFIG_VARIABLE (bool, use_palette_for_new_route, "use-palette-for-new-route", true) +UI_CONFIG_VARIABLE (bool, use_palette_for_new_track, "use-palette-for-new-track", true) +UI_CONFIG_VARIABLE (bool, use_palette_for_new_bus, "use-palette-for-new-bus", true) UI_CONFIG_VARIABLE (bool, use_palette_for_new_vca, "use-palette-for-new-vca", true) UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#006E90:#008DB8:#00ACE0:#0AC6FF:#7EE8FA:#AA8E39:#FFEAAA:#D4BA6A:#806515:#554000:#343477:#8080B3:#565695:#1A1A59:#09093B:#2D882D:#88CC88:#55AA55:#116611:#004400") /* Gtk::ColorSelection::palette_to_string */ UI_CONFIG_VARIABLE (bool, use_note_bars_for_velocity, "use-note-bars-for-velocity", true)