X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=97b81d8c1dff958ef41000a2c1fecf6cddb3a347;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=2ba4c50424f47f24562f424e2cedf3a841b7739b;hpb=a34f24d8de7432996f79384bf3f48e5e6b749bb3;p=ardour.git

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2ba4c50424..97b81d8c1d 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -37,11 +37,13 @@
 #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,8 @@
 
 #include "ardour_window.h"
 #include "ardour_dialog.h"
+#include "ardour_ui.h"
+#include "color_theme_manager.h"
 #include "gui_thread.h"
 #include "meter_patterns.h"
 #include "midi_tracer.h"
@@ -62,7 +66,7 @@
 #include "keyboard.h"
 #include "theme_manager.h"
 #include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -74,7 +78,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 +86,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);
@@ -108,7 +112,7 @@ public:
 		    sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
 		t->attach (_click_emphasis_browse_button, 2, 3, 3, 4, FILL);
 
-		_box->pack_start (*t, false, false);
+		_box->pack_start (*t, true, false);
 
 		_click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));
 		_click_emphasis_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_changed));
@@ -324,22 +328,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 +375,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 after your project has been saved and %1 has been restarted."), PROGRAM_NAME);
+		const std::string 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 +386,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 +448,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 +478,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 +515,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 +542,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,10 +667,10 @@ 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 mod_str = string compose (_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
+#ifdef __APPLE__
+		std::string mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
 #else
-		Glib::ustring mod_str = Keyboard::secondary_modifier_name();
+		std::string mod_str = Keyboard::secondary_modifier_name();
 #endif
 		Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
 						    (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
@@ -677,10 +693,10 @@ 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
+#ifdef __APPLE__
 		mod_str = Keyboard::level4_modifier_name ();
 #else
-		mod_str = 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"), mod_str, restart_msg)));
@@ -738,7 +754,7 @@ public:
 		set_popdown_strings (_fine_adjust_combo, dumb);
 		_fine_adjust_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::fine_adjust_modifier_chosen));
 
-		mod_str = 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"), mod_str, restart_msg)));
 		for (int x = 0; modifiers[x].name; ++x) {
@@ -1013,8 +1029,8 @@ public:
 		Label* l = manage (new Label (_("GUI and Font scaling:")));
 		l->set_name ("OptionsLabel");
 
-		 const Glib::ustring dflt = _("Default");
-		 const Glib::ustring empty = X_(""); // despite gtk-doc saying so, NULL does not work as reference
+		const std::string dflt = _("Default");
+		const std::string empty = X_(""); // despite gtk-doc saying so, NULL does not work as reference
 
 		_dpi_slider.set_name("FontScaleSlider");
 		_dpi_slider.set_update_policy (UPDATE_DISCONTINUOUS);
@@ -1039,7 +1055,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 +1085,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 +1345,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 +1358,29 @@ public:
 
 		_box->pack_start (_view, false, false);
 
-		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")));
+		Gtk::HBox* edit_box = manage (new Gtk::HBox);
+		edit_box->set_spacing(3);
+		_box->pack_start (*edit_box, false, false);
+		edit_box->show ();
 
-		_box->pack_start (*label, false, false);
+		Label* label = manage (new Label);
+		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 +1423,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 +1467,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 +1489,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 +1534,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
@@ -1442,45 +1547,78 @@ public:
 		, _show_video_export_info_button (_("Show Video Export Info before export"))
 		, _show_video_server_dialog_button (_("Show Video Server Startup Dialog"))
 		, _video_advanced_setup_button (_("Advanced Setup (remote video server)"))
+		, _xjadeo_browse_button (_("Browse..."))
 	{
-		Table* t = manage (new Table (2, 6));
+		Table* t = manage (new Table (8, 4));
 		t->set_spacings (4);
 
-		t->attach (_video_advanced_setup_button, 0, 2, 0, 1);
+		std::stringstream s;
+		s << "<b>" << _("Video Server") << "</b>";
+		Label* l = manage (new Label (s.str()));
+		l->set_use_markup (true);
+		l->set_alignment (0, 0.5);
+		t->attach (*l, 0, 4, 0, 1, EXPAND | FILL, FILL | EXPAND, 0, 8);
+
+		t->attach (_video_advanced_setup_button, 1, 4, 1, 2);
 		_video_advanced_setup_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::video_advanced_setup_toggled));
 		Gtkmm2ext::UI::instance()->set_tip (_video_advanced_setup_button,
 					    _("<b>When enabled</b> you can speficify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
 
-		Label* l = manage (new Label (_("Video Server URL:")));
+		l = manage (new Label (_("Video Server URL:")));
 		l->set_alignment (0, 0.5);
-		t->attach (*l, 0, 1, 1, 2, FILL);
-		t->attach (_video_server_url_entry, 1, 2, 1, 2, FILL);
+		t->attach (*l, 1, 2, 2, 3, FILL);
+		t->attach (_video_server_url_entry, 2, 4, 2, 3, FILL);
 		Gtkmm2ext::UI::instance()->set_tip (_video_server_url_entry,
 					    _("Base URL of the video-server including http prefix. This is usually 'http://hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when the video-server is running locally"));
 
 		l = manage (new Label (_("Video Folder:")));
 		l->set_alignment (0, 0.5);
-		t->attach (*l, 0, 1, 2, 3, FILL);
-		t->attach (_video_server_docroot_entry, 1, 2, 2, 3);
+		t->attach (*l, 1, 2, 3, 4, FILL);
+		t->attach (_video_server_docroot_entry, 2, 4, 3, 4);
 		Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
 					    _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
 
-		/* small vspace  y=3..4 */
-
-		t->attach (_show_video_export_info_button, 0, 2, 4, 5);
+		t->attach (_show_video_export_info_button, 1, 4, 4, 5);
 		_show_video_export_info_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_export_info_toggled));
 		Gtkmm2ext::UI::instance()->set_tip (_show_video_export_info_button,
 					    _("<b>When enabled</b> an information window with details is displayed before the video-export dialog."));
 
-		t->attach (_show_video_server_dialog_button, 0, 2, 5, 6);
+		t->attach (_show_video_server_dialog_button, 1, 4, 5, 6);
 		_show_video_server_dialog_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_server_dialog_toggled));
 		Gtkmm2ext::UI::instance()->set_tip (_show_video_server_dialog_button,
 					    _("<b>When enabled</b> the video server is never launched automatically without confirmation"));
 
+		s.str (std::string ());
+		s << "<b>" << _("Video Monitor") << "</b>";
+		l = manage (new Label (s.str()));
+		l->set_use_markup (true);
+		l->set_alignment (0, 0.5);
+		t->attach (*l, 0, 4, 6, 7, EXPAND | FILL, FILL | EXPAND, 0, 8);
+
+		l = manage (new Label (string_compose (_("Custom Path to Video Monitor (%1) - leave empty for default:"),
+#ifdef __APPLE__
+						"Jadeo.app"
+#elif defined PLATFORM_WINDOWS
+						"xjadeo.exe"
+#else
+						"xjadeo"
+#endif
+						)));
+		l->set_alignment (0, 0.5);
+		t->attach (*l, 1, 4, 7, 8, FILL);
+		t->attach (_custom_xjadeo_path, 2, 3, 8, 9);
+		Gtkmm2ext::UI::instance()->set_tip (_custom_xjadeo_path, _("Set a custom path to the Video Monitor Executable, changing this requires a restart."));
+		t->attach (_xjadeo_browse_button, 3, 4, 8, 9, FILL);
+
 		_video_server_url_entry.signal_changed().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_url_changed));
 		_video_server_url_entry.signal_activate().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_url_changed));
 		_video_server_docroot_entry.signal_changed().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_docroot_changed));
 		_video_server_docroot_entry.signal_activate().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_docroot_changed));
+		_custom_xjadeo_path.signal_changed().connect (sigc::mem_fun (*this, &VideoTimelineOptions::custom_xjadeo_path_changed));
+		_xjadeo_browse_button.signal_clicked ().connect (sigc::mem_fun (*this, &VideoTimelineOptions::xjadeo_browse_clicked));
+
+		// xjadeo-path is a UIConfig parameter
+		UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &VideoTimelineOptions::parameter_changed));
 
 		_box->pack_start (*t,true,true);
 	}
@@ -1513,6 +1651,30 @@ public:
 		_rc_config->set_video_advanced_setup(x);
 	}
 
+	void custom_xjadeo_path_changed ()
+	{
+		UIConfiguration::instance().set_xjadeo_binary (_custom_xjadeo_path.get_text());
+	}
+
+	void xjadeo_browse_clicked ()
+	{
+		Gtk::FileChooserDialog dialog(_("Set Video Monitor Executable"), Gtk::FILE_CHOOSER_ACTION_OPEN);
+		dialog.set_filename (UIConfiguration::instance().get_xjadeo_binary());
+		dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+		dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
+		if (dialog.run () == Gtk::RESPONSE_OK) {
+			const std::string& filename = dialog.get_filename();
+			if (!filename.empty() && (
+#ifdef __APPLE__
+					Glib::file_test (filename + "/Contents/MacOS/xjadeo", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE) ||
+#endif
+					Glib::file_test (filename, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)
+					)) {
+				UIConfiguration::instance().set_xjadeo_binary (filename);
+			}
+		}
+	}
+
 	void parameter_changed (string const & p)
 	{
 		if (p == "video-server-url") {
@@ -1530,6 +1692,8 @@ public:
 			_video_advanced_setup_button.set_active(x);
 			_video_server_docroot_entry.set_sensitive(x);
 			_video_server_url_entry.set_sensitive(x);
+		} else if (p == "xjadeo-binary") {
+			_custom_xjadeo_path.set_text (UIConfiguration::instance().get_xjadeo_binary());
 		}
 	}
 
@@ -1541,248 +1705,84 @@ public:
 		parameter_changed ("show-video-export-info");
 		parameter_changed ("show-video-server-dialog");
 		parameter_changed ("video-advanced-setup");
+		parameter_changed ("xjadeo-binary");
 	}
 
 private:
 	RCConfiguration* _rc_config;
 	Entry _video_server_url_entry;
 	Entry _video_server_docroot_entry;
+	Entry _custom_xjadeo_path;
 	CheckButton _show_video_export_info_button;
 	CheckButton _show_video_server_dialog_button;
 	CheckButton _video_advanced_setup_button;
+	Button _xjadeo_browse_button;
 };
 
-class PluginOptions : public OptionEditorBox
+class ColumVisibilityOption : public Option
 {
-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)
+	public:
+	ColumVisibilityOption (string id, string name, uint32_t n_col, sigc::slot<uint32_t> get, sigc::slot<bool, uint32_t> set)
+		: Option (id, name)
+		, _heading (name)
+		, _n_col (n_col)
+		, _get (get)
+		, _set (set)
 	{
-		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);
+		cb = (CheckButton**) malloc (sizeof (CheckButton*) * n_col);
+		for (uint32_t i = 0; i < n_col; ++i) {
+			CheckButton* col = manage (new CheckButton (string_compose (_("Column %1"), i + 1)));
+			col->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ColumVisibilityOption::column_toggled), i));
+			_hbox.pack_start (*col);
+			cb[i] = col;
 		}
-		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);
+		parameter_changed (id);
 	}
 
-	void clear_vst_cache_clicked () {
-		PluginManager::instance().clear_vst_cache();
+	~ColumVisibilityOption () {
+		free (cb);
 	}
 
-	void clear_vst_blacklist_clicked () {
-		PluginManager::instance().clear_vst_blacklist();
-	}
+	Gtk::Widget& tip_widget() { return _hbox; }
 
-	void clear_au_cache_clicked () {
-		PluginManager::instance().clear_au_cache();
+	void set_state_from_config ()
+	{
+		uint32_t c = _get();
+		for (uint32_t i = 0; i < _n_col; ++i) {
+			bool en = (c & (1<<i)) ? true : false;
+			if (cb[i]->get_active () != en) {
+				cb[i]->set_active (en);
+			}
+		}
 	}
 
-	void clear_au_blacklist_clicked () {
-		PluginManager::instance().clear_au_blacklist();
+	void add_to_page (OptionEditorPage* p)
+	{
+		_heading.add_to_page (p);
+		add_widget_to_page (p, &_hbox);
 	}
+	private:
 
-
-	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());
+	void column_toggled (int b) {
+		uint32_t c = _get();
+		uint32_t cc = c;
+		if (cb[b]->get_active ()) {
+			c |= (1<<b);
+		} else {
+			c &= ~(1<<b);
 		}
-		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());
+		if (cc != c) {
+			_set (c);
 		}
-		delete pd;
 	}
 
-	void refresh_clicked () {
-		PluginManager::instance().refresh();
-	}
+	HBox _hbox;
+	OptionEditorHeading _heading;
+
+	CheckButton** cb;
+	uint32_t _n_col;
+	sigc::slot<uint32_t> _get;
+	sigc::slot<bool, uint32_t> _set;
 };
 
 
@@ -1849,10 +1849,21 @@ private:
 
 
 RCOptionEditor::RCOptionEditor ()
-	: OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
+	: OptionEditorContainer (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")
 {
+	XMLNode* node = ARDOUR_UI::instance()->preferences_settings();
+	if (node) {
+		/* gcc4 complains about ambiguity with Gtk::Widget::set_state
+		   (Gtk::StateType) here !!!
+		*/
+		Tabbable::set_state (*node, Stateful::loading_state_version);
+	}
+
+	UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &RCOptionEditor::parameter_changed));
+
 	/* MISC */
 
         uint32_t hwcpus = hardware_concurrency ();
@@ -1893,6 +1904,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 +1914,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",
@@ -1927,11 +1938,11 @@ RCOptionEditor::RCOptionEditor ()
 		     0, 1000, 1, 20
 		     ));
 
-	add_option (_("Misc"), new OptionEditorHeading (_("Click")));
+	add_option (_("Misc/Click"), new OptionEditorHeading (_("Click")));
 
-	add_option (_("Misc"), new ClickOptions (_rc_config, this));
+	add_option (_("Misc/Click"), new ClickOptions (_rc_config));
 
-	add_option (_("Misc"),
+	add_option (_("Misc/Click"),
 	     new FaderOption (
 		     "click-gain",
 		     _("Click gain level"),
@@ -2050,7 +2061,24 @@ RCOptionEditor::RCOptionEditor ()
 						   "that occurs when fast-forwarding or rewinding through some kinds of audio"));
 	add_option (_("Transport"), tsf);
 
-	add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave")));
+	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/Sync"), new OptionEditorHeading (S_("Synchronization and Slave Options")));
 
 	_sync_source = new ComboOption<SyncSource> (
 		"sync-source",
@@ -2059,7 +2087,7 @@ RCOptionEditor::RCOptionEditor ()
 		sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source)
 		);
 
-	add_option (_("Transport"), _sync_source);
+	add_option (_("Transport/Sync"), _sync_source);
 
 	_sync_framerate = new BoolOption (
 		     "timecode-sync-frame-rate",
@@ -2075,7 +2103,7 @@ RCOptionEditor::RCOptionEditor ()
 				   "Instead the frame rate indication in the main clock will flash red and %1 will convert between the external "
 				   "timecode standard and the session standard."), PROGRAM_NAME));
 
-	add_option (_("Transport"), _sync_framerate);
+	add_option (_("Transport/Sync"), _sync_framerate);
 
 	_sync_genlock = new BoolOption (
 		"timecode-source-is-synced",
@@ -2096,7 +2124,7 @@ RCOptionEditor::RCOptionEditor ()
 				  ), PROGRAM_NAME));
 
 
-	add_option (_("Transport"), _sync_genlock);
+	add_option (_("Transport/Sync"), _sync_genlock);
 
 	_sync_source_2997 = new BoolOption (
 		"timecode-source-2997",
@@ -2114,9 +2142,9 @@ RCOptionEditor::RCOptionEditor ()
 			 "because the variant of using exactly 29.97 fps has zero timecode drift.\n"
 			 ));
 
-	add_option (_("Transport"), _sync_source_2997);
+	add_option (_("Transport/Sync"), _sync_source_2997);
 
-	add_option (_("Transport"), new OptionEditorHeading (S_("LTC Reader")));
+	add_option (_("Transport/Sync"), new OptionEditorHeading (S_("LTC Reader")));
 
 	_ltc_port = new ComboStringOption (
 		"ltc-source-port",
@@ -2131,13 +2159,14 @@ 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);
+	add_option (_("Transport/Sync"), _ltc_port);
 
 	// TODO; rather disable this button than not compile it..
-	add_option (_("Transport"), new OptionEditorHeading (S_("LTC Generator")));
+	add_option (_("Transport/Sync"), new OptionEditorHeading (S_("LTC Generator")));
 
-	add_option (_("Transport"),
+	add_option (_("Transport/Sync"),
 		    new BoolOption (
 			    "send-ltc",
 			    _("Enable LTC generator"),
@@ -2165,13 +2194,28 @@ RCOptionEditor::RCOptionEditor ()
 		(_ltc_volume_slider->tip_widget(),
 		 _("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");
+	add_option (_("Transport/Sync"), _ltc_volume_slider);
 
 	/* 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,22 +2224,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",
-		     _("Show meters on tracks in the editor"),
-		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_track_meters),
-		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
-		     ));
-
 	add_option (_("Editor"),
 	     new BoolOption (
 		     "show-editor-meter",
@@ -2204,16 +2232,70 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::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)
-			);
+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)
+			    ));
 
-	fadeshape->add (FadeLinear,
+	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"),
+			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"));
@@ -2245,30 +2327,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/Waveforms"), new OptionEditorHeading (_("Waveforms")));
+
+if (!Profile->get_mixbus()) {
+	add_option (_("Editor/Waveforms"),
 	     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)
+	add_option (_("Editor/Waveforms"),
+	     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> (
@@ -2281,7 +2375,7 @@ RCOptionEditor::RCOptionEditor ()
 	wfs->add (Linear, _("linear"));
 	wfs->add (Logarithmic, _("logarithmic"));
 
-	add_option (_("Editor"), wfs);
+	add_option (_("Editor/Waveforms"), wfs);
 
 	ComboOption<WaveformShape>* wfsh = new ComboOption<WaveformShape> (
 		"waveform-shape",
@@ -2293,70 +2387,9 @@ RCOptionEditor::RCOptionEditor ()
 	wfsh->add (Traditional, _("traditional"));
 	wfsh->add (Rectified, _("rectified"));
 
-	add_option (_("Editor"), wfsh);
-
-	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/Waveforms"), wfsh);
 
-	add_option (_("Editor"), rsas);
+	add_option (_("Editor/Waveforms"), new ClipLevelOptions ());
 
 
 	/* AUDIO */
@@ -2394,6 +2427,7 @@ RCOptionEditor::RCOptionEditor ()
 		     ));
 
 	add_option (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses")));
+if (!Profile->get_mixbus()) {
 
 	add_option (_("Audio"),
 		    new BoolOption (
@@ -2428,6 +2462,19 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("Audio"), oac);
 
+	bo = new BoolOption (
+			"strict-io",
+			_("Use 'Strict-I/O' for new tracks or Busses"),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::get_strict_io),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::set_strict_io)
+			);
+
+	add_option (_("Audio"), bo);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+			_("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
+
+}  // !mixbus
+
 	add_option (_("Audio"), new OptionEditorHeading (_("Denormals")));
 
 	add_option (_("Audio"),
@@ -2477,24 +2524,6 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("Audio"), dm);
 
-	add_option (_("Audio"), new OptionEditorHeading (_("Plugins")));
-
-	add_option (_("Audio"),
-	     new BoolOption (
-		     "plugins-stop-with-transport",
-		     _("Silence plugins when the transport is stopped"),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
-		     ));
-
-	add_option (_("Audio"),
-	     new BoolOption (
-		     "new-plugins-active",
-		     _("Make new plugins active"),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_new_plugins_active),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_new_plugins_active)
-		     ));
-
 	add_option (_("Audio"), new OptionEditorHeading (_("Regions")));
 
 	add_option (_("Audio"),
@@ -2515,15 +2544,7 @@ RCOptionEditor::RCOptionEditor ()
 
 	/* SOLO AND MUTE */
 
-	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)
-		     ));
+	add_option (_("Solo & mute"), new OptionEditorHeading (_("Solo")));
 
 	_solo_control_is_listen_control = new BoolOption (
 		"solo-control-is-listen-control",
@@ -2532,7 +2553,39 @@ RCOptionEditor::RCOptionEditor ()
 		sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_control_is_listen_control)
 		);
 
-	add_option (_("Solo / mute"), _solo_control_is_listen_control);
+	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",
@@ -2544,7 +2597,7 @@ RCOptionEditor::RCOptionEditor ()
 	_listen_position->add (AfterFaderListen, _("after-fader (AFL)"));
 	_listen_position->add (PreFaderListen, _("pre-fader (PFL)"));
 
-	add_option (_("Solo / mute"), _listen_position);
+	add_option (_("Solo & mute"), _listen_position);
 
 	ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
 		"pfl-position",
@@ -2556,7 +2609,7 @@ RCOptionEditor::RCOptionEditor ()
 	pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
 	pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
 
-	add_option (_("Solo / mute"), pp);
+	add_option (_("Solo & mute"), pp);
 
 	ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
 		"afl-position",
@@ -2568,37 +2621,11 @@ RCOptionEditor::RCOptionEditor ()
 	pa->add (AFLFromBeforeProcessors, _("immediately post-fader"));
 	pa->add (AFLFromAfterProcessors, _("after post-fader processors (before pan)"));
 
-	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"), pa);
 
-	add_option (_("Solo / mute"), new OptionEditorHeading (_("Default track / bus muting options")));
+	add_option (_("Solo & mute"), new OptionEditorHeading (_("Default track / bus muting options")));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "mute-affects-pre-fader",
 		     _("Mute affects pre-fader sends"),
@@ -2606,7 +2633,7 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_pre_fader)
 		     ));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "mute-affects-post-fader",
 		     _("Mute affects post-fader sends"),
@@ -2614,7 +2641,7 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_post_fader)
 		     ));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "mute-affects-control-outs",
 		     _("Mute affects control outputs"),
@@ -2622,7 +2649,7 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_control_outs)
 		     ));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "mute-affects-main-outs",
 		     _("Mute affects main outputs"),
@@ -2630,15 +2657,19 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs)
 		     ));
 
-	add_option (_("Solo / mute"), new OptionEditorHeading (_("Send Routing")));
 
-	add_option (_("Solo / mute"),
+if (!ARDOUR::Profile->get_mixbus()) {
+	add_option (_("Solo & mute"), new OptionEditorHeading (_("Send Routing")));
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "link-send-and-route-panner",
 		     _("Link panners of Aux and External Sends with main panner by default"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
 		     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> (
@@ -2651,6 +2682,49 @@ RCOptionEditor::RCOptionEditor ()
 			    ));
 
 	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/Sync"), new OptionEditorHeading (_("MIDI Clock")));
+
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "send-midi-clock",
 			    _("Send MIDI Clock"),
@@ -2658,7 +2732,9 @@ RCOptionEditor::RCOptionEditor ()
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
 			    ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"), new OptionEditorHeading (_("MIDI Time Code (MTC)")));
+
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "send-mtc",
 			    _("Send MIDI Time Code"),
@@ -2666,7 +2742,7 @@ RCOptionEditor::RCOptionEditor ()
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mtc)
 			    ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 		    new SpinOption<int> (
 			    "mtc-qf-speed-tolerance",
 			    _("Percentage either side of normal transport speed to transmit MTC"),
@@ -2675,7 +2751,9 @@ RCOptionEditor::RCOptionEditor ()
 			    0, 20, 1, 5
 			    ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"), new OptionEditorHeading (_("Midi Machine Control (MMC)")));
+
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "mmc-control",
 			    _("Obey MIDI Machine Control commands"),
@@ -2683,7 +2761,7 @@ RCOptionEditor::RCOptionEditor ()
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_control)
 			    ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "send-mmc",
 			    _("Send MIDI Machine Control commands"),
@@ -2691,15 +2769,7 @@ 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"),
+	add_option (_("MIDI/Sync"),
 	     new SpinOption<uint8_t> (
 		     "mmc-receive-device-id",
 		     _("Inbound MMC device ID"),
@@ -2708,7 +2778,7 @@ RCOptionEditor::RCOptionEditor ()
 		     0, 128, 1, 10
 		     ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 	     new SpinOption<uint8_t> (
 		     "mmc-send-device-id",
 		     _("Outbound MMC device ID"),
@@ -2717,39 +2787,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,26 +2838,190 @@ 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",
-		_("Control surface remote ID"),
-		sigc::mem_fun (*_rc_config, &RCConfiguration::get_remote_model),
-		sigc::mem_fun (*_rc_config, &RCConfiguration::set_remote_model)
-		);
+	/* VIDEO Timeline */
+	add_option (_("Video"), new VideoTimelineOptions (_rc_config));
 
-	rm->add (UserOrdered, _("assigned by user"));
-	rm->add (MixerOrdered, _("follows order of mixer"));
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
+	add_option (_("Plugins"),
+			new RcActionButton (_("Scan for Plugins"),
+				sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
 
-	add_option (_("Control Surfaces"), rm);
+#endif
 
-	/* VIDEO Timeline */
-	add_option (_("Video"), new VideoTimelineOptions (_rc_config));
+	add_option (_("Plugins"), new OptionEditorHeading (_("General")));
 
 #if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
-	/* Plugin options (currrently VST only) */
-	add_option (_("Plugins"), new PluginOptions (_rc_config));
+	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
+
+	bo = new BoolOption (
+		"plugins-stop-with-transport",
+		_("Silence plugins when the transport is stopped"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
+		);
+	add_option (_("Plugins"), bo);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+					    _("<b>When enabled</b> plugins will be reset at transport stop. When disabled plugins will be left unchanged at transport stop.\n\nThis mostly affects plugins with a \"tail\" like Reverbs."));
+
+	bo = new BoolOption (
+		"new-plugins-active",
+			_("Make new plugins active"),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::get_new_plugins_active),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::set_new_plugins_active)
+			);
+	add_option (_("Plugins"), bo);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+					    _("<b>When enabled</b> plugins will be activated when they are added to tracks/busses. When disabled plugins will be left inactive when they are added to tracks/busses"));
+
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT)
+	add_option (_("Plugins/VST"), 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/VST"), 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/VST"), 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/VST"), new VstTimeOutSliderOption (_rc_config));
+
+	add_option (_("Plugins/VST"),
+			new RcActionButton (_("Clear"),
+				sigc::mem_fun (*this, &RCOptionEditor::clear_vst_cache),
+				_("VST Cache:")));
+
+	add_option (_("Plugins/VST"),
+			new RcActionButton (_("Clear"),
+				sigc::mem_fun (*this, &RCOptionEditor::clear_vst_blacklist),
+				_("VST Blacklist:")));
+#endif
+
+#ifdef LXVST_SUPPORT
+	add_option (_("Plugins/VST"),
+			new RcActionButton (_("Edit"),
+				sigc::mem_fun (*this, &RCOptionEditor::edit_lxvst_path),
+			_("Linux VST Path:")));
+
+	add_option (_("Plugins/VST"),
+			new RcConfigDisplay (
+				"plugin-path-lxvst",
+				_("Path:"),
+				sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugin_path_lxvst),
+				0));
+#endif
+
+#ifdef WINDOWS_VST_SUPPORT
+	add_option (_("Plugins/VST"),
+			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/Audio Unit"), 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/Audio Unit"),
+			new RcActionButton (_("Clear"),
+				sigc::mem_fun (*this, &RCOptionEditor::clear_au_cache),
+				_("AU Cache:")));
+
+	add_option (_("Plugins/Audio Unit"),
+			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 (UIConfiguration::instance(), &UIConfiguration::get_open_gui_after_adding_plugin),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_open_gui_after_adding_plugin)
+		     ));
+
+#if (defined LV2_SUPPORT && defined LV2_EXTENDED)
+	add_option (_("Plugins"),
+	     new BoolOption (
+		     "show-inline-display-by-default",
+		     _("Show Plugin Inline Display on Mixerstrip by default"),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_inline_display_by_default),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_inline_display_by_default)
+		     ));
+
+	_plugin_prefer_inline = new BoolOption (
+			"prefer-inline-over-gui",
+			_("Don't automatically open the plugin GUI when the plugin has an inline display mode"),
+			sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_prefer_inline_over_gui),
+			sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_prefer_inline_over_gui)
+			);
+	add_option (_("Plugins"), _plugin_prefer_inline);
+#endif
+
+	add_option (_("Plugins"), new OptionEditorHeading (_("Instrument")));
+
+	bo = new BoolOption (
+			"ask-replace-instrument",
+			_("Ask to replace existing instrument plugin"),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::get_ask_replace_instrument),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::set_ask_replace_instrument)
+			);
+	add_option (_("Plugins"), bo);
+
+	bo = new BoolOption (
+			"ask-setup_instrument",
+			_("Interactively configure instrument plugins on insert"),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::get_ask_setup_instrument),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::set_ask_setup_instrument)
+			);
+	add_option (_("Plugins"), bo);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+			_("<b>When enabled</b> show a dialog to select instrument channel configuration before adding a multichannel plugin."));
+
 #endif
 
 	/* INTERFACE */
@@ -2850,6 +3051,14 @@ RCOptionEditor::RCOptionEditor ()
 	add_option (S_("Preferences|GUI"), bgo);
 #endif
 
+	add_option (S_("Preferences|GUI"),
+	     new BoolOption (
+		     "use-wm-visibility",
+		     _("Use Window Manager/Desktop visibility information"),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_wm_visibility),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_wm_visibility)
+		     ));
+
 	add_option (S_("Preferences|GUI"),
 	     new BoolOption (
 		     "widget-prelight",
@@ -2858,7 +3067,6 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_widget_prelight)
 		     ));
 
-#ifdef TOOLTIPS_GOT_FIXED
 	add_option (S_("Preferences|GUI"),
 	     new BoolOption (
 		     "use-tooltips",
@@ -2866,7 +3074,6 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_tooltips),
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_tooltips)
 		     ));
-#endif
 
 	add_option (S_("Preferences|GUI"),
 	     new BoolOption (
@@ -2876,20 +3083,20 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
 		     ));
 
-#ifndef GTKOSX
-	/* 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 __APPLE__
+	/* 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 +3112,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 +3127,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.
@@ -2929,6 +3138,7 @@ RCOptionEditor::RCOptionEditor ()
 	_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_("VCA"), _("VCA Assigns"));
 
 	add_option (
 		S_("Preferences|GUI"),
@@ -2948,6 +3158,14 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
 		     ));
 
+	add_option (S_("Preferences|GUI"),
+			new ColumVisibilityOption (
+				"action-table-columns", _("Action Script Button Visibility"), 3,
+				sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_action_table_columns),
+				sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_action_table_columns)
+				)
+			);
+
 	add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering")));
 
 	ComboOption<float>* mht = new ComboOption<float> (
@@ -3097,10 +3315,46 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_style_led)
 		     ));
 
+	add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Editor Meters")));
+
+	add_option (S_("Preferences|Metering"),
+	     new BoolOption (
+		     "show-track-meters",
+		     _("Show meters on tracks in the editor"),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_track_meters),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
+		     ));
+
+	add_option (S_("Preferences|Metering"),
+	     new BoolOption (
+		     "editor-stereo-only-meters",
+		     _("Show at most stereo meters in the track-header"),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_editor_stereo_only_meters),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_editor_stereo_only_meters)
+		     ));
+
+	add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
+
+	add_option (S_("Preferences|Metering"),
+	     new BoolOption (
+		     "save-export-analysis-image",
+		     _("Save loudness analysis as image file"),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_save_export_analysis_image),
+		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_save_export_analysis_image)
+		     ));
+
 	/* and now the theme manager */
 
 	ThemeManager* tm = manage (new ThemeManager);
 	add_page (_("Theme"), *tm);
+
+	add_option (_("Theme/Colors"), new ColorThemeManager);
+
+	//trigger some parameter-changed messages which affect widget-visibility or -sensitivity
+	parameter_changed ("send-ltc");
+	parameter_changed ("sync-source");
+	parameter_changed ("use-monitor-bus");
+	parameter_changed ("open-gui-after-adding-plugin");
 }
 
 void
@@ -3138,6 +3392,10 @@ RCOptionEditor::parameter_changed (string const & p)
 		bool const s = Config->get_send_ltc ();
 		_ltc_send_continuously->set_sensitive (s);
 		_ltc_volume_slider->set_sensitive (s);
+	} else if (p == "open-gui-after-adding-plugin" || p == "show-inline-display-by-default") {
+#ifdef LV2_SUPPORT
+		_plugin_prefer_inline->set_sensitive (UIConfiguration::instance().get_open_gui_after_adding_plugin() && UIConfiguration::instance().get_show_inline_display_by_default());
+#endif
 	}
 }
 
@@ -3145,6 +3403,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 (
+		*current_toplevel(), _("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 (
+		*current_toplevel(), _("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 +3471,29 @@ 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;
+}
+
+XMLNode&
+RCOptionEditor::get_state ()
+{
+	XMLNode* node = new XMLNode (X_("Preferences"));
+	node->add_child_nocopy (Tabbable::get_state());
+	return *node;
 }