From c48c09c08030feea5f34ee7bf7e72620645f2bcf Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 30 Mar 2021 17:02:57 -0500 Subject: [PATCH] Recover waveform-gradient-depth slider for ardour, and timeline-item-gradient-depth for mixbus These items were likely a casualty of a merge when re-laying out the preferences panel --- gtk2_ardour/rc_option_editor.cc | 37 +++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 24bfb6cb45..6d6d61bdd1 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2439,19 +2439,6 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_style_led) )); - if (!Profile->get_mixbus()) { - HSliderOption *gui_hs; - gui_hs = new HSliderOption( - "timeline-item-gradient-depth", - _("Waveforms color gradient depth"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_gradient_depth), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_gradient_depth), - 0, 1.0, 0.05 - ); - gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED); - add_option (_("Appearance"), gui_hs); - } - if (!Profile->get_mixbus()) { vector icon_sets = ::get_icon_sets (); if (icon_sets.size() > 1) { @@ -2555,6 +2542,30 @@ RCOptionEditor::RCOptionEditor () )); + HSliderOption *gui_hs; + + if (!Profile->get_mixbus()) { + gui_hs = new HSliderOption( + "waveform-gradient-depth", + _("Waveforms color gradient depth"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_gradient_depth), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_gradient_depth), + 0, 1.0, 0.05 + ); + gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED); + add_option (_("Appearance/Editor"), gui_hs); + } + + gui_hs = new HSliderOption( + "timeline-item-gradient-depth", + _("Timeline item gradient depth"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_timeline_item_gradient_depth), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_timeline_item_gradient_depth), + 0, 1.0, 0.05 + ); + gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED); + add_option (_("Appearance/Editor"), gui_hs); + ComboOption* emode = new ComboOption ( "time-axis-name-ellipsize-mode", _("Track name ellipsize mode"),