change GTKOSX macro constant to use __APPLE__ instead
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 1a7bafc032a5642b3667262fc2013866d70741f9..c828a7074c5e5691a0f76835eaf11c9555f2d744 100644 (file)
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/paths_dialog.h>
+#include <gtkmm2ext/window_title.h>
 
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
 
 #include "ardour/audioengine.h"
+#include "ardour/profile.h"
 #include "ardour/dB.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/control_protocol_manager.h"
@@ -52,6 +54,7 @@
 
 #include "ardour_window.h"
 #include "ardour_dialog.h"
+#include "ardour_ui.h"
 #include "gui_thread.h"
 #include "meter_patterns.h"
 #include "midi_tracer.h"
@@ -74,7 +77,7 @@ using namespace ARDOUR_UI_UTILS;
 class ClickOptions : public OptionEditorBox
 {
 public:
-       ClickOptions (RCConfiguration* c, Gtk::Window* p)
+       ClickOptions (RCConfiguration* c)
                : _rc_config (c)
                , _click_browse_button (_("Browse..."))
                , _click_emphasis_browse_button (_("Browse..."))
@@ -82,18 +85,18 @@ public:
                Table* t = manage (new Table (4, 3));
                t->set_spacings (4);
 
-               Label* l = manage (left_aligned_label (_("Use default Click:")));
-               t->attach (*l, 0, 1, 0, 1, FILL);
-               t->attach (_use_default_click_check_button, 1, 2, 0, 1, FILL);
-               _use_default_click_check_button.signal_toggled().connect (
-                   sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
-
-               l = manage (left_aligned_label (_("Emphasis on first beat:")));
+               Label* l = manage (left_aligned_label (_("Emphasis on first beat:")));
                t->attach (*l, 0, 1, 1, 2, FILL);
                t->attach (_use_emphasis_on_click_check_button, 1, 2, 1, 2, FILL);
                _use_emphasis_on_click_check_button.signal_toggled().connect (
                    sigc::mem_fun (*this, &ClickOptions::use_emphasis_on_click_toggled));
 
+               l = manage (left_aligned_label (_("Use default Click:")));
+               t->attach (*l, 0, 1, 0, 1, FILL);
+               t->attach (_use_default_click_check_button, 1, 2, 0, 1, FILL);
+               _use_default_click_check_button.signal_toggled().connect (
+                   sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
+
                l = manage (left_aligned_label (_("Click audio file:")));
                t->attach (*l, 0, 1, 2, 3, FILL);
                t->attach (_click_path_entry, 1, 2, 2, 3, FILL);
@@ -324,22 +327,22 @@ static const struct {
 
        { "Unmodified", 0 },
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 
        /* Command = Meta
           Option/Alt = Mod1
        */
        { "Key|Shift", GDK_SHIFT_MASK },
-       { "Command", GDK_META_MASK },
+       { "Command", GDK_MOD2_MASK },
        { "Control", GDK_CONTROL_MASK },
        { "Option", GDK_MOD1_MASK },
-       { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK },
-       { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK },
-       { "Command-Option-Control", GDK_MOD1_MASK|GDK_META_MASK|GDK_CONTROL_MASK },
+       { "Command-Shift", GDK_MOD2_MASK|GDK_SHIFT_MASK },
+       { "Command-Option", GDK_MOD2_MASK|GDK_MOD1_MASK },
+       { "Command-Option-Control", GDK_MOD2_MASK|GDK_MOD1_MASK|GDK_CONTROL_MASK },
        { "Option-Control", GDK_MOD1_MASK|GDK_CONTROL_MASK },
        { "Option-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
        { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
-       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
+       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD2_MASK },
 
 #else
        { "Key|Shift", GDK_SHIFT_MASK },
@@ -371,7 +374,7 @@ public:
                  _insert_note_button_adjustment (3, 1, 5),
                  _insert_note_button_spin (_insert_note_button_adjustment)
        {
-               const Glib::ustring restart_msg = string_compose (_("\nThis setting will only take effect when your project is saved and %1 is restarted."), PROGRAM_NAME);
+               const Glib::ustring restart_msg = _("\nChanges to this setting will only persist after your project has been saved.");
                /* internationalize and prepare for use with combos */
 
                vector<string> dumb;
@@ -382,7 +385,7 @@ public:
                set_popdown_strings (_edit_modifier_combo, dumb);
                _edit_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_edit_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1 + button 3</b>%2"),  Keyboard::copy_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"),  Keyboard::primary_modifier_name (), restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
                                _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -444,7 +447,7 @@ public:
                set_popdown_strings (_delete_modifier_combo, dumb);
                _delete_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_delete_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1 + button 3</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
                                _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -474,7 +477,7 @@ public:
                set_popdown_strings (_insert_note_modifier_combo, dumb);
                _insert_note_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_insert_note_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1 + button 1</b>%2"), Keyboard::copy_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1 + button 1 (left mouse button)</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
                                _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -511,7 +514,13 @@ public:
                set_popdown_strings (_copy_modifier_combo, dumb);
                _copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::copy_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"),
+#ifdef __APPLE__
+                                                                    Keyboard::secondary_modifier_name (),
+#else
+                                                                    Keyboard::primary_modifier_name (),
+#endif
+                                                                    restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
                                _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -532,7 +541,13 @@ public:
                set_popdown_strings (_constraint_modifier_combo, dumb);
                _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::secondary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"),
+#ifdef __APPLE__
+                                                                    Keyboard::primary_modifier_name (),
+#else
+                                                                    Keyboard::secondary_modifier_name (),
+#endif
+                                                                    restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
                                _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -651,13 +666,13 @@ public:
                /* ignore snap */
                set_popdown_strings (_snap_modifier_combo, dumb);
                _snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
-#ifdef GTKOSX
-               Glib::ustring desc_buf = string compose (_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
+#ifdef __APPLE__
+               Glib::ustring mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
 #else
-               Glib::ustring desc_buf = Keyboard::secondary_modifier_name();
+               Glib::ustring mod_str = Keyboard::secondary_modifier_name();
 #endif
                Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), desc_buf, restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
                                _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
@@ -677,13 +692,13 @@ public:
                /* snap delta */
                set_popdown_strings (_snap_delta_combo, dumb);
                _snap_delta_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_delta_modifier_chosen));
-#ifdef GTKOSX
-               desc_buf = Keyboard::level4_modifier_name ();
+#ifdef __APPLE__
+               mod_str = Keyboard::level4_modifier_name ();
 #else
-               desc_buf = string_compose (_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
+               mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
 #endif
                Gtkmm2ext::UI::instance()->set_tip (_snap_delta_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), desc_buf, restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) Keyboard::snap_delta_modifier ()) {
                                _snap_delta_combo.set_active_text (S_(modifiers[x].name));
@@ -738,9 +753,9 @@ public:
                set_popdown_strings (_fine_adjust_combo, dumb);
                _fine_adjust_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::fine_adjust_modifier_chosen));
 
-               desc_buf = string_compose (_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::tertiary_modifier_name ());
+               mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::tertiary_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_fine_adjust_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), desc_buf, restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) ArdourKeyboard::fine_adjust_modifier ()) {
                                _fine_adjust_combo.set_active_text (S_(modifiers[x].name));
@@ -1039,7 +1054,7 @@ public:
 
                _box->pack_start (*h, false, false);
 
-               set_note (_("Adjusting the scale require an application restart to re-layout."));
+               set_note (_("Adjusting the scale requires an application restart to re-layout."));
 
                _dpi_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &FontScalingOptions::dpi_changed));
        }
@@ -1069,6 +1084,68 @@ private:
        HScale _dpi_slider;
 };
 
+class VstTimeOutSliderOption : public OptionEditorBox
+{
+public:
+       VstTimeOutSliderOption (RCConfiguration* c)
+               : _rc_config (c)
+               , _timeout_adjustment (0, 0, 3000, 50, 50)
+               , _timeout_slider (_timeout_adjustment)
+       {
+               _timeout_slider.set_digits (0);
+               _timeout_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &VstTimeOutSliderOption::timeout_changed));
+
+               _timeout_slider.set_draw_value(false);
+               _timeout_slider.add_mark(   0,  Gtk::POS_TOP, _("\u221e")); // infinity
+               _timeout_slider.add_mark( 300,  Gtk::POS_TOP, _("30 sec"));
+               _timeout_slider.add_mark( 600,  Gtk::POS_TOP, _("1 min"));
+               _timeout_slider.add_mark(1200,  Gtk::POS_TOP, _("2 mins"));
+               _timeout_slider.add_mark(1800,  Gtk::POS_TOP, _("3 mins"));
+               _timeout_slider.add_mark(2400,  Gtk::POS_TOP, _("4 mins"));
+               _timeout_slider.add_mark(3000,  Gtk::POS_TOP, _("5 mins"));
+
+               Gtkmm2ext::UI::instance()->set_tip(_timeout_slider,
+                        _("Specify the default timeout for plugin instantiation. Plugins that require more time to load will be blacklisted. A value of 0 disables the timeout."));
+
+               Label* l = manage (left_aligned_label (_("Scan Time Out:")));
+               HBox* h = manage (new HBox);
+               h->set_spacing (4);
+               h->pack_start (*l, false, false);
+               h->pack_start (_timeout_slider, true, true);
+
+               _box->pack_start (*h, false, false);
+       }
+
+       void parameter_changed (string const & p)
+       {
+               if (p == "vst-scan-timeout") {
+                       int const x = _rc_config->get_vst_scan_timeout();
+                       _timeout_adjustment.set_value (x);
+               }
+       }
+
+       void set_state_from_config ()
+       {
+               parameter_changed ("vst-scan-timeout");
+       }
+
+private:
+
+       void timeout_changed ()
+       {
+               int x = floor(_timeout_adjustment.get_value());
+               _rc_config->set_vst_scan_timeout(x);
+       }
+
+       RCConfiguration* _rc_config;
+       Adjustment _timeout_adjustment;
+       HScale _timeout_slider;
+};
+
+
+
+
+
 class ClipLevelOptions : public OptionEditorBox
 {
 public:
@@ -1267,9 +1344,8 @@ private:
 class ControlSurfacesOptions : public OptionEditorBox
 {
 public:
-       ControlSurfacesOptions (Gtk::Window& parent)
-               : _parent (parent)
-               , _ignore_view_change (0)
+       ControlSurfacesOptions ()
+               : _ignore_view_change (0)
        {
                _store = ListStore::create (_model);
                _view.set_model (_store);
@@ -1281,18 +1357,29 @@ public:
 
                _box->pack_start (_view, false, false);
 
+               Gtk::HBox* edit_box = manage (new Gtk::HBox);
+               edit_box->set_spacing(3);
+               _box->pack_start (*edit_box, false, false);
+               edit_box->show ();
+               
                Label* label = manage (new Label);
-               label->set_markup (string_compose (X_("<i>%1</i>"), _("Double-click on a name to edit settings for an enabled protocol")));
-
-               _box->pack_start (*label, false, false);
+               label->set_text (_("Click to edit the settings for selected protocol ( it must be ENABLED first ):"));
+               edit_box->pack_start (*label, false, false);
                label->show ();
 
+               edit_button = manage (new Button(_("Show Protocol Settings")));
+               edit_button->signal_clicked().connect (sigc::mem_fun(*this, &ControlSurfacesOptions::edit_btn_clicked));
+               edit_box->pack_start (*edit_button, true, true);
+               edit_button->set_sensitive (false);
+               edit_button->show ();
+
                ControlProtocolManager& m = ControlProtocolManager::instance ();
                m.ProtocolStatusChange.connect (protocol_status_connection, MISSING_INVALIDATOR,
                                                boost::bind (&ControlSurfacesOptions::protocol_status_changed, this, _1), gui_context());
 
                _store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::view_changed));
                _view.signal_button_press_event().connect_notify (sigc::mem_fun(*this, &ControlSurfacesOptions::edit_clicked));
+               _view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::selection_changed));
        }
 
        void parameter_changed (std::string const &)
@@ -1335,6 +1422,16 @@ private:
                }
        }
 
+       void selection_changed ()
+       {
+               //enable the Edit button when a row is selected for editing
+               TreeModel::Row row = *(_view.get_selection()->get_selected());
+               if (row && row[_model.enabled])
+                       edit_button->set_sensitive (true);
+               else
+                       edit_button->set_sensitive (false);
+       }
+       
        void view_changed (TreeModel::Path const &, TreeModel::iterator const & i)
        {
                TreeModel::Row r = *i;
@@ -1369,12 +1466,8 @@ private:
                }
        }
 
-       void edit_clicked (GdkEventButton* ev)
+       void edit_btn_clicked ()
        {
-               if (ev->type != GDK_2BUTTON_PRESS) {
-                       return;
-               }
-
                std::string name;
                ControlProtocolInfo* cpi;
                TreeModel::Row row;
@@ -1395,19 +1488,30 @@ private:
                        static_cast<ArdourWindow*>(box->get_parent())->present();
                        return;
                }
-               string title = row[_model.name];
+               WindowTitle title (Glib::get_application_name());
+               title += row[_model.name];
+               title += _("Configuration");
                /* once created, the window is managed by the surface itself (as ->get_parent())
                 * Surface's tear_down_gui() is called on session close, when de-activating
                 * or re-initializing a surface.
                 * tear_down_gui() hides an deletes the Window if it exists.
                 */
-               ArdourWindow* win = new ArdourWindow (_parent, title);
+               ArdourWindow* win = new ArdourWindow (*((Gtk::Window*) _view.get_toplevel()), title.get_string());
                win->set_title ("Control Protocol Options");
                win->add (*box);
                box->show ();
                win->present ();
        }
 
+       void edit_clicked (GdkEventButton* ev)
+       {
+               if (ev->type != GDK_2BUTTON_PRESS) {
+                       return;
+               }
+
+               edit_btn_clicked();
+       }
+
         class ControlSurfacesModelColumns : public TreeModelColumnRecord
        {
        public:
@@ -1429,9 +1533,9 @@ private:
        Glib::RefPtr<ListStore> _store;
        ControlSurfacesModelColumns _model;
        TreeView _view;
-        Gtk::Window& _parent;
         PBD::ScopedConnection protocol_status_connection;
         uint32_t _ignore_view_change;
+       Gtk::Button* edit_button;
 };
 
 class VideoTimelineOptions : public OptionEditorBox
@@ -1552,239 +1656,6 @@ private:
        CheckButton _video_advanced_setup_button;
 };
 
-class PluginOptions : public OptionEditorBox
-{
-public:
-       PluginOptions (RCConfiguration* c)
-               : _rc_config (c)
-               , _display_plugin_scan_progress (_("Always Display Plugin Scan Progress"))
-               , _discover_vst_on_start (_("Scan for [new] VST Plugins on Application Start"))
-               , _discover_au_on_start (_("Scan for AudioUnit Plugins on Application Start"))
-               , _verbose_plugin_scan (_("Verbose Plugin Scan"))
-               , _timeout_adjustment (0, 0, 3000, 50, 50)
-               , _timeout_slider (_timeout_adjustment)
-       {
-               Label *l;
-               std::stringstream ss;
-               Table* t = manage (new Table (2, 6));
-               t->set_spacings (4);
-               Button* b;
-               int n = 0;
-
-               ss << "<b>" << _("General") << "</b>";
-               l = manage (left_aligned_label (ss.str()));
-               l->set_use_markup (true);
-               t->attach (*manage (new Label ("")), 0, 3, n, n+1, FILL | EXPAND); ++n;
-               t->attach (*l, 0, 2, n, n+1, FILL | EXPAND); ++n;
-
-               b = manage (new Button (_("Scan for Plugins")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::refresh_clicked));
-               t->attach (*b, 0, 2, n, n+1, FILL); ++n;
-
-               t->attach (_display_plugin_scan_progress, 0, 2, n, n+1); ++n;
-               _display_plugin_scan_progress.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::display_plugin_scan_progress_toggled));
-               Gtkmm2ext::UI::instance()->set_tip (_display_plugin_scan_progress,
-                                           _("<b>When enabled</b> a popup window showing plugin scan progress is displayed for indexing (cache load) and discovery (detect new plugins)"));
-
-#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT)
-               _timeout_slider.set_digits (0);
-               _timeout_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &PluginOptions::timeout_changed));
-
-               Gtkmm2ext::UI::instance()->set_tip(_timeout_slider,
-                        _("Specify the default timeout for plugin instantiation in 1/10 seconds. Plugins that require more time to load will be blacklisted. A value of 0 disables the timeout."));
-
-               l = manage (left_aligned_label (_("Scan Time Out [deciseconds]")));;
-               HBox* h = manage (new HBox);
-               h->set_spacing (4);
-               h->pack_start (*l, false, false);
-               h->pack_start (_timeout_slider, true, true);
-               t->attach (*h, 0, 2, n, n+1); ++n;
-
-               ss.str("");
-               ss << "<b>" << _("VST") << "</b>";
-               l = manage (left_aligned_label (ss.str()));
-               l->set_use_markup (true);
-               t->attach (*manage (new Label ("")), 0, 3, n, n+1, FILL | EXPAND); ++n;
-               t->attach (*l, 0, 2, n, n+1, FILL | EXPAND); ++n;
-
-               b = manage (new Button (_("Clear VST Cache")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::clear_vst_cache_clicked));
-               t->attach (*b, 0, 1, n, n+1, FILL);
-
-               b = manage (new Button (_("Clear VST Blacklist")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::clear_vst_blacklist_clicked));
-               t->attach (*b, 1, 2, n, n+1, FILL);
-               ++n;
-
-               t->attach (_discover_vst_on_start, 0, 2, n, n+1); ++n;
-               _discover_vst_on_start.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::discover_vst_on_start_toggled));
-               Gtkmm2ext::UI::instance()->set_tip (_discover_vst_on_start,
-                                           _("<b>When enabled</b> new VST plugins are searched, tested and added to the cache index on application start. When disabled new plugins will only be available after triggering a 'Scan' manually"));
-
-#ifdef LXVST_SUPPORT
-               t->attach (*manage (right_aligned_label (_("Linux VST Path:"))), 0, 1, n, n+1);
-               b = manage (new Button (_("Edit")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_lxvst_path_clicked));
-               t->attach (*b, 1, 2, n, n+1, FILL); ++n;
-#endif
-
-#ifdef WINDOWS_VST_SUPPORT
-               t->attach (*manage (right_aligned_label (_("Windows VST Path:"))), 0, 1, n, n+1);
-               b = manage (new Button (_("Edit")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_vst_path_clicked));
-               t->attach (*b, 1, 2, n, n+1, FILL); ++n;
-
-               // currently verbose logging is only implemented for Windows VST.
-               t->attach (_verbose_plugin_scan, 0, 2, n, n+1); ++n;
-               _verbose_plugin_scan.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::verbose_plugin_scan_toggled));
-               Gtkmm2ext::UI::instance()->set_tip (_verbose_plugin_scan,
-                                           _("<b>When enabled</b> additional information for every plugin is added to the Log Window."));
-#endif
-#endif // any VST
-
-#ifdef AUDIOUNIT_SUPPORT
-               ss.str("");
-               ss << "<b>" << _("Audio Unit") << "</b>";
-               l = manage (left_aligned_label (ss.str()));
-               l->set_use_markup (true);
-               t->attach (*manage (new Label ("")), 0, 3, n, n+1, FILL | EXPAND); ++n;
-               t->attach (*l, 0, 2, n, n+1, FILL | EXPAND); ++n;
-
-               t->attach (_discover_au_on_start, 0, 2, n, n+1); ++n;
-               _discover_au_on_start.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::discover_au_on_start_toggled));
-               Gtkmm2ext::UI::instance()->set_tip (_discover_au_on_start,
-                                           _("<b>When enabled</b> Audio Unit Plugins are discovered on application start. When disabled AU plugins will only be available after triggering a 'Scan' manually. The first successful scan will enable AU auto-scan, Any crash during plugin discovery will disable it."));
-
-               ++n;
-               b = manage (new Button (_("Clear AU Cache")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::clear_au_cache_clicked));
-               t->attach (*b, 0, 1, n, n+1, FILL);
-
-               b = manage (new Button (_("Clear AU Blacklist")));
-               b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::clear_au_blacklist_clicked));
-               t->attach (*b, 1, 2, n, n+1, FILL);
-               ++n;
-#endif
-
-               _box->pack_start (*t,true,true);
-       }
-
-       void parameter_changed (string const & p) {
-               if (p == "show-plugin-scan-window") {
-                       bool const x = UIConfiguration::instance().get_show_plugin_scan_window();
-                       _display_plugin_scan_progress.set_active (x);
-               }
-               else if (p == "discover-vst-on-start") {
-                       bool const x = _rc_config->get_discover_vst_on_start();
-                       _discover_vst_on_start.set_active (x);
-               }
-               else if (p == "vst-scan-timeout") {
-                       int const x = _rc_config->get_vst_scan_timeout();
-                       _timeout_adjustment.set_value (x);
-               }
-               else if (p == "discover-audio-units") {
-                       bool const x = _rc_config->get_discover_audio_units();
-                       _discover_au_on_start.set_active (x);
-               }
-               else if (p == "verbose-plugin-scan") {
-                       bool const x = _rc_config->get_verbose_plugin_scan();
-                       _verbose_plugin_scan.set_active (x);
-               }
-       }
-
-       void set_state_from_config () {
-               parameter_changed ("show-plugin-scan-window");
-               parameter_changed ("discover-vst-on-start");
-               parameter_changed ("vst-scan-timeout");
-               parameter_changed ("discover-audio-units");
-               parameter_changed ("verbose-plugin-scan");
-       }
-
-private:
-       RCConfiguration* _rc_config;
-       CheckButton _display_plugin_scan_progress;
-       CheckButton _discover_vst_on_start;
-       CheckButton _discover_au_on_start;
-       CheckButton _verbose_plugin_scan;
-       Adjustment _timeout_adjustment;
-       HScale _timeout_slider;
-
-       void display_plugin_scan_progress_toggled () {
-               bool const x = _display_plugin_scan_progress.get_active();
-               UIConfiguration::instance().set_show_plugin_scan_window(x);
-       }
-
-       void discover_vst_on_start_toggled () {
-               bool const x = _discover_vst_on_start.get_active();
-               _rc_config->set_discover_vst_on_start(x);
-       }
-
-       void discover_au_on_start_toggled () {
-               bool const x = _discover_au_on_start.get_active();
-               _rc_config->set_discover_audio_units(x);
-       }
-
-       void verbose_plugin_scan_toggled () {
-               bool const x = _verbose_plugin_scan.get_active();
-               _rc_config->set_verbose_plugin_scan(x);
-       }
-
-       void timeout_changed () {
-               int x = floor(_timeout_adjustment.get_value());
-               _rc_config->set_vst_scan_timeout(x);
-       }
-
-       void clear_vst_cache_clicked () {
-               PluginManager::instance().clear_vst_cache();
-       }
-
-       void clear_vst_blacklist_clicked () {
-               PluginManager::instance().clear_vst_blacklist();
-       }
-
-       void clear_au_cache_clicked () {
-               PluginManager::instance().clear_au_cache();
-       }
-
-       void clear_au_blacklist_clicked () {
-               PluginManager::instance().clear_au_blacklist();
-       }
-
-
-       void edit_vst_path_clicked () {
-               Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
-                               _("Set Windows VST Search Path"),
-                               _rc_config->get_plugin_path_vst(),
-                               PluginManager::instance().get_default_windows_vst_path()
-                       );
-               ResponseType r = (ResponseType) pd->run ();
-               pd->hide();
-               if (r == RESPONSE_ACCEPT) {
-                       _rc_config->set_plugin_path_vst(pd->get_serialized_paths());
-               }
-               delete pd;
-       }
-
-       // todo consolidate with edit_vst_path_clicked..
-       void edit_lxvst_path_clicked () {
-               Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
-                               _("Set Linux VST Search Path"),
-                               _rc_config->get_plugin_path_lxvst(),
-                               PluginManager::instance().get_default_lxvst_path()
-                               );
-               ResponseType r = (ResponseType) pd->run ();
-               pd->hide();
-               if (r == RESPONSE_ACCEPT) {
-                       _rc_config->set_plugin_path_lxvst(pd->get_serialized_paths());
-               }
-               delete pd;
-       }
-
-       void refresh_clicked () {
-               PluginManager::instance().refresh();
-       }
-};
-
 
 /** A class which allows control of visibility of some editor components usign
  *  a VisibilityGroup.  The caller should pass in a `dummy' VisibilityGroup
@@ -1850,6 +1721,7 @@ private:
 
 RCOptionEditor::RCOptionEditor ()
        : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
+       , Tabbable (*this, _("Preferences")) /* pack self-as-vbox into tabbable */
         , _rc_config (Config)
        , _mixer_strip_visibility ("mixer-element-visibility")
 {
@@ -1893,6 +1765,8 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
                     ));
 
+       add_option (_("Misc"), new OptionEditorHeading (_("Session Management")));
+
        add_option (_("Misc"),
             new BoolOption (
                     "periodic-safety-backups",
@@ -1901,8 +1775,6 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
                     ));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Session Management")));
-
        add_option (_("Misc"),
             new BoolOption (
                     "only-copy-imported-files",
@@ -1929,7 +1801,7 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Misc"), new OptionEditorHeading (_("Click")));
 
-       add_option (_("Misc"), new ClickOptions (_rc_config, this));
+       add_option (_("Misc"), new ClickOptions (_rc_config));
 
        add_option (_("Misc"),
             new FaderOption (
@@ -1961,6 +1833,7 @@ RCOptionEditor::RCOptionEditor ()
 
        /* TRANSPORT */
 
+       add_option (_("Transport"), new OptionEditorHeading (S_("Playhead Behaviour")));
        add_option (_("Transport"), new OptionEditorHeading (S_("Transport Options")));
 
        BoolOption* tsf;
@@ -2050,6 +1923,23 @@ RCOptionEditor::RCOptionEditor ()
                                                   "that occurs when fast-forwarding or rewinding through some kinds of audio"));
        add_option (_("Transport"), tsf);
 
+       ComboOption<float>* psc = new ComboOption<float> (
+                    "preroll-seconds",
+                    _("Preroll"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_preroll_seconds),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_preroll_seconds)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (psc->tip_widget(),
+                                           (_("The amount of preroll (in seconds) to apply when <b>Play with Preroll</b> is initiated.\n\n"
+                                              "If <b>Follow Edits</b> is enabled, the preroll is applied to the playhead position when a region is selected or trimmed.")));
+       psc->add (0.0, _("0 (no pre-roll)"));
+       psc->add (0.1, _("0.1 second"));
+       psc->add (0.25, _("0.25 second"));
+       psc->add (0.5, _("0.5 second"));
+       psc->add (1.0, _("1.0 second"));
+       psc->add (2.0, _("2.0 seconds"));
+       add_option (_("Transport"), psc);
+       
        add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave")));
 
        _sync_source = new ComboOption<SyncSource> (
@@ -2131,6 +2021,7 @@ RCOptionEditor::RCOptionEditor ()
        _ltc_port->set_popdown_strings (physical_inputs);
 
        populate_sync_options ();
+       AudioEngine::instance()->Running.connect (engine_started_connection, MISSING_INVALIDATOR, boost::bind (&RCOptionEditor::populate_sync_options, this), gui_context());
 
        add_option (_("Transport"), _ltc_port);
 
@@ -2166,12 +2057,27 @@ RCOptionEditor::RCOptionEditor ()
                 _("Specify the Peak Volume of the generated LTC signal in dbFS. A good value is  0dBu ^= -18dbFS in an EBU calibrated system"));
 
        add_option (_("Transport"), _ltc_volume_slider);
-       parameter_changed ("send-ltc");
-
-       parameter_changed ("sync-source");
 
        /* EDITOR */
 
+       add_option (_("Editor"),
+            new BoolOption (
+                    "rubberbanding-snaps-to-grid",
+                    _("Make rubberband selection rectangle snap to the grid"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
+                    ));
+
+       bo = new BoolOption (
+                    "name-new-markers",
+                    _("Name new markers"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_name_new_markers),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_name_new_markers)
+               );
+       add_option (_("Editor"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("If enabled, popup a dialog when a new marker is created to allow its name to be set as it is created."
+                                                               "\n\nYou can always rename markers by right-clicking on them"));
+
        add_option (S_("Editor"),
             new BoolOption (
                     "draggable-playhead",
@@ -2180,14 +2086,6 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
                     ));
 
-       add_option (_("Editor"),
-            new BoolOption (
-                    "automation-follows-regions",
-                    _("Move relevant automation when audio regions are moved"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_follows_regions),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
-                    ));
-
        add_option (_("Editor"),
             new BoolOption (
                     "show-track-meters",
@@ -2204,6 +2102,60 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_editor_meter)
                     ));
 
+if (!Profile->get_mixbus()) {
+       add_option (_("Editor"),
+                   new BoolOption (
+                           "show-zoom-tools",
+                           _("Show zoom toolbar (if torn off)"),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_zoom_tools),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_zoom_tools)
+                           ));
+
+       add_option (_("Editor"),
+                   new BoolOption (
+                           "use-mouse-position-as-zoom-focus-on-scroll",
+                           _("Always use mouse cursor position as zoom focus when zooming using mouse scroll wheel"),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_mouse_position_as_zoom_focus_on_scroll),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_mouse_position_as_zoom_focus_on_scroll)
+                           ));
+}  // !mixbus
+
+       add_option (_("Editor"),
+                   new BoolOption (
+                           "update-editor-during-summary-drag",
+                           _("Update editor window during drags of the summary"),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_update_editor_during_summary_drag),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_update_editor_during_summary_drag)
+                           ));
+
+       add_option (_("Editor"),
+           new BoolOption (
+                   "autoscroll-editor",
+                   _("Auto-scroll editor window when dragging near its edges"),
+                   sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_autoscroll_editor),
+                   sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_autoscroll_editor)
+                   ));
+
+       add_option (_("Editor"),
+            new BoolComboOption (
+                    "show-region-gain-envelopes",
+                    _("Show gain envelopes in audio regions"),
+                    _("in all modes"),
+                    _("only in Draw and Internal Edit modes"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_region_gain),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_region_gain)
+                    ));
+
+       add_option (_("Editor"), new OptionEditorHeading (_("Editor Behavior")));
+
+       add_option (_("Editor"),
+            new BoolOption (
+                    "automation-follows-regions",
+                    _("Move relevant automation when audio regions are moved"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_follows_regions),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
+                    ));
+
        ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
                        "default-fade-shape",
                        _("Default fade shape"),
@@ -2245,30 +2197,42 @@ RCOptionEditor::RCOptionEditor ()
        lm->add (Manual, _("manual layering"));
        add_option (_("Editor"), lm);
 
-       add_option (_("Editor"),
-            new BoolOption (
-                    "rubberbanding-snaps-to-grid",
-                    _("Make rubberband selection rectangle snap to the grid"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
-                    ));
+       ComboOption<RegionSelectionAfterSplit> *rsas = new ComboOption<RegionSelectionAfterSplit> (
+                   "region-selection-after-split",
+                   _("After splitting selected regions, select"),
+                   sigc::mem_fun (*_rc_config, &RCConfiguration::get_region_selection_after_split),
+                   sigc::mem_fun (*_rc_config, &RCConfiguration::set_region_selection_after_split));
 
-       add_option (_("Editor"),
+       // TODO: decide which of these modes are really useful
+       rsas->add(None, _("no regions"));
+       // rsas->add(NewlyCreatedLeft, _("newly-created regions before the split"));
+       // rsas->add(NewlyCreatedRight, _("newly-created regions after the split"));
+       rsas->add(NewlyCreatedBoth, _("newly-created regions"));
+       // rsas->add(Existing, _("unmodified regions in the existing selection"));
+       // rsas->add(ExistingNewlyCreatedLeft, _("existing selection and newly-created regions before the split"));
+       // rsas->add(ExistingNewlyCreatedRight, _("existing selection and newly-created regions after the split"));
+       rsas->add(ExistingNewlyCreatedBoth, _("existing selection and newly-created regions"));
+
+       add_option (_("Editor"), rsas);
+       
+       add_option (_("Editor"), new OptionEditorHeading (_("Waveforms")));
+
+if (!Profile->get_mixbus()) {
+       add_option (_("Editor"),
             new BoolOption (
                     "show-waveforms",
                     _("Show waveforms in regions"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms)
                     ));
+}  // !mixbus
 
        add_option (_("Editor"),
-            new BoolComboOption (
-                    "show-region-gain-envelopes",
-                    _("Show gain envelopes in audio regions"),
-                    _("in all modes"),
-                    _("only in Draw and Internal Edit modes"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_region_gain),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_region_gain)
+            new BoolOption (
+                    "show-waveforms-while-recording",
+                    _("Show waveforms for audio while it is being recorded"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms_while_recording),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms_while_recording)
                     ));
 
        ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
@@ -2297,67 +2261,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Editor"), new ClipLevelOptions ());
 
-       add_option (_("Editor"),
-            new BoolOption (
-                    "show-waveforms-while-recording",
-                    _("Show waveforms for audio while it is being recorded"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms_while_recording),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms_while_recording)
-                    ));
-
-       add_option (_("Editor"),
-                   new BoolOption (
-                           "show-zoom-tools",
-                           _("Show zoom toolbar"),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_zoom_tools),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_zoom_tools)
-                           ));
-
-       add_option (_("Editor"),
-                   new BoolOption (
-                           "update-editor-during-summary-drag",
-                           _("Update editor window during drags of the summary"),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_update_editor_during_summary_drag),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_update_editor_during_summary_drag)
-                           ));
-
-       bo = new BoolOption (
-                    "name-new-markers",
-                    _("Name new markers"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_name_new_markers),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_name_new_markers)
-               );
-
-       add_option (_("Editor"), bo);
-       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("If enabled, popup a dialog when a new marker is created to allow its name to be set as it is created."
-                                                               "\n\nYou can always rename markers by right-clicking on them"));
-
-       add_option (_("Editor"),
-           new BoolOption (
-                   "autoscroll-editor",
-                   _("Auto-scroll editor window when dragging near its edges"),
-                   sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_autoscroll_editor),
-                   sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_autoscroll_editor)
-                   ));
-
-       ComboOption<RegionSelectionAfterSplit> *rsas = new ComboOption<RegionSelectionAfterSplit> (
-                   "region-selection-after-split",
-                   _("After splitting selected regions, select"),
-                   sigc::mem_fun (*_rc_config, &RCConfiguration::get_region_selection_after_split),
-                   sigc::mem_fun (*_rc_config, &RCConfiguration::set_region_selection_after_split));
-
-       // TODO: decide which of these modes are really useful
-       rsas->add(None, _("no regions"));
-       // rsas->add(NewlyCreatedLeft, _("newly-created regions before the split"));
-       // rsas->add(NewlyCreatedRight, _("newly-created regions after the split"));
-       rsas->add(NewlyCreatedBoth, _("newly-created regions"));
-       // rsas->add(Existing, _("unmodified regions in the existing selection"));
-       // rsas->add(ExistingNewlyCreatedLeft, _("existing selection and newly-created regions before the split"));
-       // rsas->add(ExistingNewlyCreatedRight, _("existing selection and newly-created regions after the split"));
-       rsas->add(ExistingNewlyCreatedBoth, _("existing selection and newly-created regions"));
-
-       add_option (_("Editor"), rsas);
-
 
        /* AUDIO */
 
@@ -2393,6 +2296,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
                     ));
 
+if (!Profile->get_mixbus()) {
        add_option (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses")));
 
        add_option (_("Audio"),
@@ -2427,6 +2331,7 @@ RCOptionEditor::RCOptionEditor ()
        oac->add (ManualConnect, _("manually"));
 
        add_option (_("Audio"), oac);
+}  // !mixbus
 
        add_option (_("Audio"), new OptionEditorHeading (_("Denormals")));
 
@@ -2517,14 +2422,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Solo / mute"), new OptionEditorHeading (_("Solo")));
 
-       add_option (_("Solo / mute"),
-            new FaderOption (
-                    "solo-mute-gain",
-                    _("Solo-in-place mute cut (dB)"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_gain),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_gain)
-                    ));
-
        _solo_control_is_listen_control = new BoolOption (
                "solo-control-is-listen-control",
                _("Solo controls are Listen controls"),
@@ -2534,6 +2431,38 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Solo / mute"), _solo_control_is_listen_control);
 
+       add_option (_("Solo / mute"),
+            new BoolOption (
+                    "exclusive-solo",
+                    _("Exclusive solo"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_exclusive_solo),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_exclusive_solo)
+                    ));
+
+       add_option (_("Solo / mute"),
+            new BoolOption (
+                    "show-solo-mutes",
+                    _("Show solo muting"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_solo_mutes),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
+                    ));
+
+       add_option (_("Solo / mute"),
+            new BoolOption (
+                    "solo-mute-override",
+                    _("Soloing overrides muting"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_override),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
+                    ));
+
+       add_option (_("Solo / mute"),
+            new FaderOption (
+                    "solo-mute-gain",
+                    _("Solo-in-place mute cut (dB)"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_gain),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_gain)
+                    ));
+
        _listen_position = new ComboOption<ListenPosition> (
                "listen-position",
                _("Listen Position"),
@@ -2570,32 +2499,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Solo / mute"), pa);
 
-       parameter_changed ("use-monitor-bus");
-
-       add_option (_("Solo / mute"),
-            new BoolOption (
-                    "exclusive-solo",
-                    _("Exclusive solo"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_exclusive_solo),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_exclusive_solo)
-                    ));
-
-       add_option (_("Solo / mute"),
-            new BoolOption (
-                    "show-solo-mutes",
-                    _("Show solo muting"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_solo_mutes),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
-                    ));
-
-       add_option (_("Solo / mute"),
-            new BoolOption (
-                    "solo-mute-override",
-                    _("Soloing overrides muting"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_override),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
-                    ));
-
        add_option (_("Solo / mute"), new OptionEditorHeading (_("Default track / bus muting options")));
 
        add_option (_("Solo / mute"),
@@ -2640,6 +2543,8 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
                     ));
 
+       add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Preferences")));
+
        add_option (_("MIDI"),
                    new SpinOption<float> (
                            "midi-readahead",
@@ -2650,6 +2555,49 @@ RCOptionEditor::RCOptionEditor ()
                            "", 1.0, 1
                            ));
 
+       add_option (_("MIDI"),
+            new SpinOption<int32_t> (
+                    "initial-program-change",
+                    _("Initial program change"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_initial_program_change),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_initial_program_change),
+                    -1, 65536, 1, 10
+                    ));
+
+       add_option (_("MIDI"),
+                   new BoolOption (
+                           "display-first-midi-bank-as-zero",
+                           _("Display first MIDI bank/program as 0"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
+                           ));
+
+       add_option (_("MIDI"),
+            new BoolOption (
+                    "never-display-periodic-midi",
+                    _("Never display periodic MIDI messages (MTC, MIDI Clock)"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
+                    ));
+
+       add_option (_("MIDI"),
+            new BoolOption (
+                    "sound-midi-notes",
+                    _("Sound MIDI notes as they are selected in the editor"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_sound_midi_notes),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_sound_midi_notes)
+                    ));
+
+       add_option (_("MIDI"),
+                   new BoolOption (
+                           "midi-feedback",
+                           _("Send MIDI control feedback"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_feedback),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback)
+                           ));
+
+       add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Clock")));
+
        add_option (_("MIDI"),
                    new BoolOption (
                            "send-midi-clock",
@@ -2658,6 +2606,8 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
                            ));
 
+       add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Time Code (MTC)")));
+
        add_option (_("MIDI"),
                    new BoolOption (
                            "send-mtc",
@@ -2675,6 +2625,8 @@ RCOptionEditor::RCOptionEditor ()
                            0, 20, 1, 5
                            ));
 
+       add_option (_("MIDI"), new OptionEditorHeading (_("Midi Machine Control (MMC)")));
+
        add_option (_("MIDI"),
                    new BoolOption (
                            "mmc-control",
@@ -2691,14 +2643,6 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mmc)
                            ));
 
-       add_option (_("MIDI"),
-                   new BoolOption (
-                           "midi-feedback",
-                           _("Send MIDI control feedback"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_feedback),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback)
-                           ));
-
        add_option (_("MIDI"),
             new SpinOption<uint8_t> (
                     "mmc-receive-device-id",
@@ -2717,39 +2661,6 @@ RCOptionEditor::RCOptionEditor ()
                     0, 128, 1, 10
                     ));
 
-       add_option (_("MIDI"),
-            new SpinOption<int32_t> (
-                    "initial-program-change",
-                    _("Initial program change"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_initial_program_change),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_initial_program_change),
-                    -1, 65536, 1, 10
-                    ));
-
-       add_option (_("MIDI"),
-                   new BoolOption (
-                           "display-first-midi-bank-as-zero",
-                           _("Display first MIDI bank/program as 0"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
-                           ));
-
-       add_option (_("MIDI"),
-            new BoolOption (
-                    "never-display-periodic-midi",
-                    _("Never display periodic MIDI messages (MTC, MIDI Clock)"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
-                    ));
-
-       add_option (_("MIDI"),
-            new BoolOption (
-                    "sound-midi-notes",
-                    _("Sound MIDI notes as they are selected"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_sound_midi_notes),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_sound_midi_notes)
-                    ));
-
        add_option (_("MIDI"), new OptionEditorHeading (_("Midi Audition")));
 
        ComboOption<std::string>* audition_synth = new ComboOption<std::string> (
@@ -2801,7 +2712,7 @@ RCOptionEditor::RCOptionEditor ()
 
        /* Control Surfaces */
 
-       add_option (_("Control Surfaces"), new ControlSurfacesOptions (*this));
+       add_option (_("Control Surfaces"), new ControlSurfacesOptions);
 
        ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
                "remote-model",
@@ -2819,8 +2730,123 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Video"), new VideoTimelineOptions (_rc_config));
 
 #if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
-       /* Plugin options (currrently VST only) */
-       add_option (_("Plugins"), new PluginOptions (_rc_config));
+       add_option (_("Plugins"), new OptionEditorHeading (_("General")));
+
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Scan for Plugins"),
+                               sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
+
+       bo = new BoolOption (
+                       "show-plugin-scan-window",
+                       _("Always Display Plugin Scan Progress"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_plugin_scan_window),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_plugin_scan_window)
+                       );
+       add_option (_("Plugins"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> a popup window showing plugin scan progress is displayed for indexing (cache load) and discovery (detect new plugins)"));
+
+#endif
+
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT)
+       add_option (_("Plugins"), new OptionEditorHeading (_("VST")));
+
+       bo = new BoolOption (
+                       "discover-vst-on-start",
+                       _("Scan for [new] VST Plugins on Application Start"),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_discover_vst_on_start),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_discover_vst_on_start)
+                       );
+       add_option (_("Plugins"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           _("<b>When enabled</b> new VST plugins are searched, tested and added to the cache index on application start. When disabled new plugins will only be available after triggering a 'Scan' manually"));
+
+#ifdef WINDOWS_VST_SUPPORT
+       // currently verbose logging is only implemented for Windows VST.
+       bo = new BoolOption (
+                       "verbose-plugin-scan",
+                       _("Verbose Plugin Scan"),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_verbose_plugin_scan),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_verbose_plugin_scan)
+                       );
+       add_option (_("Plugins"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           _("<b>When enabled</b> additional information for every plugin is added to the Log Window."));
+#endif
+
+       add_option (_("Plugins"), new VstTimeOutSliderOption (_rc_config));
+
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Clear"),
+                               sigc::mem_fun (*this, &RCOptionEditor::clear_vst_cache),
+                               _("VST Cache:")));
+
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Clear"),
+                               sigc::mem_fun (*this, &RCOptionEditor::clear_vst_blacklist),
+                               _("VST Blacklist:")));
+#endif
+
+#ifdef LXVST_SUPPORT
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Edit"),
+                               sigc::mem_fun (*this, &RCOptionEditor::edit_lxvst_path),
+                       _("Linux VST Path:")));
+
+       add_option (_("Plugins"),
+                       new RcConfigDisplay (
+                               "plugin-path-lxvst",
+                               _("Path:"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugin_path_lxvst),
+                               ':'));
+#endif
+
+#ifdef WINDOWS_VST_SUPPORT
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Edit"),
+                               sigc::mem_fun (*this, &RCOptionEditor::edit_vst_path),
+                       _("Windows VST Path:")));
+       add_option (_("Plugins"),
+                       new RcConfigDisplay (
+                               "plugin-path-vst",
+                               _("Path:"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugin_path_vst),
+                               ';'));
+#endif
+
+#ifdef AUDIOUNIT_SUPPORT
+       add_option (_("Plugins"), new OptionEditorHeading (_("Audio Unit")));
+
+       bo = new BoolOption (
+                       "discover-audio-units",
+                       _("Scan for AudioUnit Plugins on Application Start"),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_discover_audio_units),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_discover_audio_units)
+                       );
+       add_option (_("Plugins"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           _("<b>When enabled</b> Audio Unit Plugins are discovered on application start. When disabled AU plugins will only be available after triggering a 'Scan' manually. The first successful scan will enable AU auto-scan, Any crash during plugin discovery will disable it."));
+
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Clear"),
+                               sigc::mem_fun (*this, &RCOptionEditor::clear_au_cache),
+                               _("AU Cache:")));
+
+       add_option (_("Plugins"),
+                       new RcActionButton (_("Clear"),
+                               sigc::mem_fun (*this, &RCOptionEditor::clear_au_blacklist),
+                               _("AU Blacklist:")));
+#endif
+
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT || defined HAVE_LV2)
+       add_option (_("Plugins"), new OptionEditorHeading (_("Plugin GUI")));
+       add_option (_("Plugins"),
+            new BoolOption (
+                    "open-gui-after-adding-plugin",
+                    _("Automatically open the plugin GUI when adding a new plugin"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_open_gui_after_adding_plugin),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_open_gui_after_adding_plugin)
+                    ));
 #endif
 
        /* INTERFACE */
@@ -2876,20 +2902,25 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
                     ));
 
-#ifndef GTKOSX
+#ifndef __APPLE__
        /* font scaling does nothing with GDK/Quartz */
        add_option (S_("Preferences|GUI"), new FontScalingOptions ());
 #endif
 
-       add_option (S_("GUI"),
+       add_option (S_("Preferences|GUI"),
                    new BoolOption (
                            "super-rapid-clock-update",
-                           _("update transport clock display at FPS instead of every 100ms"),
+                           _("Update transport clock display at FPS instead of every 100ms"),
                            sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_super_rapid_clock_update),
                            sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_super_rapid_clock_update)
                            ));
 
 
+#ifndef GTKOSX
+       /* font scaling does nothing with GDK/Quartz */
+       add_option (S_("Preferences|GUI"), new FontScalingOptions ());
+#endif
+
        /* Image cache size */
 
        Gtk::Adjustment *ics = manage (new Gtk::Adjustment(0, 1, 1024, 10)); /* 1 MB to 1GB in steps of 10MB */
@@ -2905,6 +2936,7 @@ RCOptionEditor::RCOptionEditor ()
                 _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
        add_option (S_("Preferences|GUI"), sics);
 
+if (!ARDOUR::Profile->get_mixbus()) {
        /* Lock GUI timeout */
 
        Gtk::Adjustment *lts = manage (new Gtk::Adjustment(0, 0, 1000, 1, 10));
@@ -2919,6 +2951,7 @@ RCOptionEditor::RCOptionEditor ()
                (slts->tip_widget(),
                 _("Lock GUI after this many idle seconds (zero to never lock)"));
        add_option (S_("Preferences|GUI"), slts);
+} // !mixbus
 
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
@@ -3101,6 +3134,11 @@ RCOptionEditor::RCOptionEditor ()
 
        ThemeManager* tm = manage (new ThemeManager);
        add_page (_("Theme"), *tm);
+
+       //trigger some parameter-changed messages which affect widget-visibility or -sensitivity
+       parameter_changed ("send-ltc");
+       parameter_changed ("sync-source");
+       parameter_changed ("use-monitor-bus");
 }
 
 void
@@ -3145,6 +3183,56 @@ void RCOptionEditor::ltc_generator_volume_changed () {
        _rc_config->set_ltc_output_volume (pow(10, _ltc_volume_adjustment->get_value() / 20));
 }
 
+void RCOptionEditor::plugin_scan_refresh () {
+       PluginManager::instance().refresh();
+}
+
+void RCOptionEditor::clear_vst_cache () {
+       PluginManager::instance().clear_vst_cache();
+}
+
+void RCOptionEditor::clear_vst_blacklist () {
+       PluginManager::instance().clear_vst_blacklist();
+}
+
+void RCOptionEditor::clear_au_cache () {
+       PluginManager::instance().clear_au_cache();
+}
+
+void RCOptionEditor::clear_au_blacklist () {
+       PluginManager::instance().clear_au_blacklist();
+}
+
+void RCOptionEditor::edit_lxvst_path () {
+       Glib::RefPtr<Gdk::Window> win = get_parent_window ();
+       Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+                       *this, _("Set Linux VST Search Path"),
+                       _rc_config->get_plugin_path_lxvst(),
+                       PluginManager::instance().get_default_lxvst_path()
+                       );
+       ResponseType r = (ResponseType) pd->run ();
+       pd->hide();
+       if (r == RESPONSE_ACCEPT) {
+               _rc_config->set_plugin_path_lxvst(pd->get_serialized_paths());
+       }
+       delete pd;
+}
+
+void RCOptionEditor::edit_vst_path () {
+       Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+                       *this, _("Set Windows VST Search Path"),
+                       _rc_config->get_plugin_path_vst(),
+                       PluginManager::instance().get_default_windows_vst_path()
+                       );
+       ResponseType r = (ResponseType) pd->run ();
+       pd->hide();
+       if (r == RESPONSE_ACCEPT) {
+               _rc_config->set_plugin_path_vst(pd->get_serialized_paths());
+       }
+       delete pd;
+}
+
+
 void
 RCOptionEditor::populate_sync_options ()
 {
@@ -3163,4 +3251,21 @@ RCOptionEditor::populate_sync_options ()
                        _rc_config->set_sync_source(sync_opts.front());
                }
        }
+
+       parameter_changed ("sync-source");
+}
+
+Gtk::Window*
+RCOptionEditor::use_own_window (bool and_fill_it)
+{
+       bool new_window = !own_window();
+
+       Gtk::Window* win = Tabbable::use_own_window (and_fill_it);
+
+       if (win && new_window) {
+               win->set_name ("PreferencesWindow");
+               ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Preferences"), this);
+       }
+
+       return win;
 }