change all GUI config files (GTK RC and our own XML config files) to use product...

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 378057b1b3b67b541a526aef68eda9991eec769e..9a636ec2f85c3c1fadab502d1326a2063a11b2b8 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -44,6 +44,7 @@
 
 #include "canvas/wave_view.h"
 
+#include "ardour_ui.h"
 #include "ardour_window.h"
 #include "ardour_dialog.h"
 #include "gui_thread.h"
@@ -60,6 +61,7 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 class ClickOptions : public OptionEditorBox
 {
@@ -1228,7 +1230,7 @@ private:
 RCOptionEditor::RCOptionEditor ()
        : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
         , _rc_config (Config)
-       , _mixer_strip_visibility ("mixer-strip-visibility")
+       , _mixer_strip_visibility ("mixer-element-visibility")
 {
        /* MISC */
 
@@ -1358,6 +1360,7 @@ RCOptionEditor::RCOptionEditor ()
        Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), 
                                            string_compose (_("<b>When enabled</b> %1 will stop recording if an over- or underrun is detected by the audio engine"),
                                                            PROGRAM_NAME));
+       add_option (_("Transport"), tsf);
 
        tsf = new BoolOption (
                     "loop-is-mode",
@@ -1537,12 +1540,12 @@ RCOptionEditor::RCOptionEditor ()
 
        /* EDITOR */
 
-       add_option (_("Editor"),
+       add_option (S_("Editor"),
             new BoolOption (
-                    "link-region-and-track-selection",
-                    _("Link selection of regions and tracks"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_region_and_track_selection),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_region_and_track_selection)
+                    "draggable-playhead",
+                    _("Allow dragging of playhead"),
+                    sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_draggable_playhead),
+                    sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_draggable_playhead)
                     ));
 
        add_option (_("Editor"),
@@ -2169,20 +2172,35 @@ RCOptionEditor::RCOptionEditor ()
        add_option (S_("GUI"),
                    new BoolOption (
                            "super-rapid-clock-update",
-                           _("update transport clock display every 40ms instead of every 100ms"),
+                           _("update transport clock display at FPS instead of every 100ms"),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::get_super_rapid_clock_update),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_super_rapid_clock_update)
                            ));
 
+       /* Lock GUI timeout */
+
+       Gtk::Adjustment *lts = manage (new Gtk::Adjustment(0, 0, 1000, 1, 10));
+       HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
+                                               _("Lock timeout (seconds)"),
+                                               lts,
+                                               sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_lock_gui_after_seconds),
+                                               sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_lock_gui_after_seconds)
+                       );
+       slts->scale().set_digits (0);
+       Gtkmm2ext::UI::instance()->set_tip
+               (slts->tip_widget(),
+                _("Lock GUI after this many idle seconds (zero to never lock)"));
+       add_option (S_("Preferences|GUI"), slts);
+
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
        */
+       _mixer_strip_visibility.add (0, X_("Input"), _("Input"));
        _mixer_strip_visibility.add (0, X_("PhaseInvert"), _("Phase Invert"));
-       _mixer_strip_visibility.add (0, X_("SoloSafe"), _("Solo Safe"));
-       _mixer_strip_visibility.add (0, X_("SoloIsolated"), _("Solo Isolated"));
+       _mixer_strip_visibility.add (0, X_("RecMon"), _("Record & Monitor"));
+       _mixer_strip_visibility.add (0, X_("SoloIsoLock"), _("Solo Iso / Lock"));
+       _mixer_strip_visibility.add (0, X_("Output"), _("Output"));
        _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
-       _mixer_strip_visibility.add (0, X_("Group"), _("Group"));
-       _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
        
        add_option (
                S_("Preferences|GUI"),
@@ -2202,7 +2220,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
                     ));
 
-       add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Metering")));
+       add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering")));
 
        ComboOption<float>* mht = new ComboOption<float> (
                "meter-hold",
@@ -2216,7 +2234,7 @@ RCOptionEditor::RCOptionEditor ()
        mht->add (MeterHoldMedium, _("medium"));
        mht->add (MeterHoldLong, _("long"));
 
-       add_option (S_("Preferences|GUI"), mht);
+       add_option (S_("Preferences|Metering"), mht);
 
        ComboOption<float>* mfo = new ComboOption<float> (
                "meter-falloff",
@@ -2235,7 +2253,7 @@ RCOptionEditor::RCOptionEditor ()
        mfo->add (METER_FALLOFF_FASTER,   _("faster [46dB/sec]"));
        mfo->add (METER_FALLOFF_FASTEST,  _("fastest [70dB/sec]"));
 
-       add_option (S_("Preferences|GUI"), mfo);
+       add_option (S_("Preferences|Metering"), mfo);
 
        ComboOption<MeterLineUp>* mlu = new ComboOption<MeterLineUp> (
                "meter-line-up-level",
@@ -2251,7 +2269,7 @@ RCOptionEditor::RCOptionEditor ()
 
        Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-marks and color-knee point for dBFS scale DPM, set reference level for IEC1/Nordic, IEC2 PPM and VU meter."));
 
-       add_option (S_("Preferences|GUI"), mlu);
+       add_option (S_("Preferences|Metering"), mlu);
 
        ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
                "meter-line-up-din",
@@ -2267,7 +2285,7 @@ RCOptionEditor::RCOptionEditor ()
 
        Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter."));
 
-       add_option (S_("Preferences|GUI"), mld);
+       add_option (S_("Preferences|Metering"), mld);
 
        ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
                "meter-vu-standard",
@@ -2281,7 +2299,7 @@ RCOptionEditor::RCOptionEditor ()
        mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)"));
        mvu->add (MeteringVUeight,    _("0VU = +8dBu"));
 
-       add_option (S_("Preferences|GUI"), mvu);
+       add_option (S_("Preferences|Metering"), mvu);
 
        Gtk::Adjustment *mpk = manage (new Gtk::Adjustment(0, -10, 0, .1, .1));
        HSliderOption *mpks = new HSliderOption("meter-peak",
@@ -2295,9 +2313,9 @@ RCOptionEditor::RCOptionEditor ()
                (mpks->tip_widget(),
                 _("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));
 
-       add_option (S_("Preferences|GUI"), mpks);
+       add_option (S_("Preferences|Metering"), mpks);
 
-       add_option (S_("Preferences|GUI"),
+       add_option (S_("Preferences|Metering"),
             new BoolOption (
                     "meter-style-led",
                     _("LED meter style"),