remove some cruft with previous commits. remove option link-region-and-track-selecti...

[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 940a601ce99ba808290d26cc715ddc4e70087aad..9efe9a9440d182af6a616fefff14418722528b80 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
 {
@@ -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"),
@@ -1569,6 +1572,25 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_editor_meter)
                     ));
 
+       ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
+                       "default-fade-shape",
+                       _("Default fade shape"),
+                       sigc::mem_fun (*_rc_config,
+                               &RCConfiguration::get_default_fade_shape),
+                       sigc::mem_fun (*_rc_config,
+                               &RCConfiguration::set_default_fade_shape)
+                       );
+
+       fadeshape->add (FadeLinear,
+                       _("Linear (for highly correlated material)"));
+       fadeshape->add (FadeConstantPower, _("Constant power"));
+       fadeshape->add (FadeSymmetric, _("Symmetric"));
+       fadeshape->add (FadeSlow, _("Slow"));
+       fadeshape->add (FadeFast, _("Fast"));
+
+       add_option (_("Editor"), fadeshape);
+
+
        bco = new BoolComboOption (
                     "use-overlap-equivalency",
                     _("Regions in active edit groups are edited together"),
@@ -2155,6 +2177,21 @@ RCOptionEditor::RCOptionEditor ()
                            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.
        */