From 15a11ba4873755eb370e751f74723d2ce871cfb3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 24 Jan 2013 13:17:07 +0000 Subject: re-tweak overlap-equivalency option as per colin's suggestion, since it is really better git-svn-id: svn://localhost/ardour2/branches/3.0@13987 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/rc_option_editor.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gtk2_ardour/rc_option_editor.cc') diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 2716c656a6..0275922437 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -879,6 +879,7 @@ RCOptionEditor::RCOptionEditor () uint32_t hwcpus = hardware_concurrency (); BoolOption* bo; + BoolComboOption* bco; if (hwcpus > 1) { add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization"))); @@ -1150,7 +1151,7 @@ RCOptionEditor::RCOptionEditor () _("When enabled Ardour will continue to send LTC information even when the transport (playhead) is not moving")); add_option (_("Transport"), _ltc_send_continuously); - _ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5); + _ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5); _ltc_volume_adjustment->set_value (20 * log10(_rc_config->get_ltc_output_volume())); _ltc_volume_adjustment->signal_value_changed().connect (sigc::mem_fun (*this, &RCOptionEditor::ltc_generator_volume_changed)); _ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level"), *_ltc_volume_adjustment); @@ -1190,18 +1191,16 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters) )); - bo = new BoolOption ( + bco = new BoolComboOption ( "use-overlap-equivalency", - _("Use overlap equivalency for regions"), + _("Regions in active edit groups are edited together"), + _("whenever they overlap in time"), + _("only if they have identical length, position and origin"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency), sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency) ); - add_option (_("Editor"), bo); - Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), - _("Regions in active edit groups are edited together:" - "\n\nIf enabled, whenever they overlap in time" - "\n\nIf disabled, only if they have identical length, position and origin")); + add_option (_("Editor"), bco); add_option (_("Editor"), new BoolOption ( -- cgit v1.2.3