X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=7596c6fb530f5f95ba8acafa878bc87e30a62619;hb=0444ce1d5efb523fa5f9bf1e793c5123b3b5f4d3;hp=016d30dc0227060ea63fa74c40cfd5bdbc9a9121;hpb=964b8a985464efeeba8d4861a14e93db43f80392;p=ardour.git

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 016d30dc02..7596c6fb53 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -54,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"
@@ -64,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;
@@ -76,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..."))
@@ -110,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));
@@ -326,7 +328,7 @@ static const struct {
 
 	{ "Unmodified", 0 },
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 
 	/* Command = Meta
 	   Option/Alt = Mod1
@@ -337,6 +339,7 @@ static const struct {
 	{ "Option", GDK_MOD1_MASK },
 	{ "Command-Shift", GDK_MOD2_MASK|GDK_SHIFT_MASK },
 	{ "Command-Option", GDK_MOD2_MASK|GDK_MOD1_MASK },
+	{ "Command-Control", GDK_MOD2_MASK|GDK_CONTROL_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 },
@@ -349,6 +352,7 @@ static const struct {
 	{ "Alt", GDK_MOD1_MASK },
 	{ "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
 	{ "Control-Alt", GDK_CONTROL_MASK|GDK_MOD1_MASK },
+	{ "Control-Windows", GDK_CONTROL_MASK|GDK_MOD4_MASK },
 	{ "Control-Shift-Alt", GDK_CONTROL_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK },
 	{ "Alt-Windows", GDK_MOD1_MASK|GDK_MOD4_MASK },
 	{ "Alt-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
@@ -373,7 +377,7 @@ public:
 		  _insert_note_button_adjustment (3, 1, 5),
 		  _insert_note_button_spin (_insert_note_button_adjustment)
 	{
-		const Glib::ustring restart_msg = _("\nChanges to this setting will only persist after your project has been saved.");
+		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;
@@ -514,7 +518,7 @@ public:
 		_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"),
-#ifdef GTKOSX
+#ifdef __APPLE__
 								     Keyboard::secondary_modifier_name (),
 #else
 								     Keyboard::primary_modifier_name (),
@@ -539,12 +543,13 @@ public:
 		/* constraint modifier */
 		set_popdown_strings (_constraint_modifier_combo, dumb);
 		_constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
+		std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
 		Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
 						    (string_compose (_("<b>Recommended Setting: %1</b>%2"),
-#ifdef GTKOSX
+#ifdef __APPLE__
 								     Keyboard::primary_modifier_name (),
 #else
-								     Keyboard::secondary_modifier_name (),
+								     Keyboard::tertiary_modifier_name (),
 #endif
 								     restart_msg)));
 		for (int x = 0; modifiers[x].name; ++x) {
@@ -560,6 +565,29 @@ public:
 		t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
 		t->attach (_constraint_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
+		++row;
+		col = 1;
+
+		/* push points */
+		set_popdown_strings (_push_points_combo, dumb);
+		_push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
+
+		mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
+		Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
+						    (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::push_points_modifier ()) {
+				_push_points_combo.set_active_text (S_(modifiers[x].name));
+				break;
+			}
+		}
+
+		l = manage (left_aligned_label (_("Push points using:")));
+		l->set_name ("OptionsLabel");
+
+		t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+		t->attach (_push_points_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
 		++row;
 
 		l = manage (left_aligned_label (_("When Beginning a Trim:")));
@@ -593,8 +621,10 @@ public:
 		/* anchored trim */
 		set_popdown_strings (_trim_anchored_combo, dumb);
 		_trim_anchored_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_anchored_modifier_chosen));
+
+		mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::tertiary_modifier_name ());
 		Gtkmm2ext::UI::instance()->set_tip (_trim_anchored_combo,
-						    (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), 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::trim_anchored_modifier ()) {
 				_trim_anchored_combo.set_active_text (S_(modifiers[x].name));
@@ -638,7 +668,7 @@ public:
 		set_popdown_strings (_note_size_relative_combo, dumb);
 		_note_size_relative_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::note_size_relative_modifier_chosen));
 		Gtkmm2ext::UI::instance()->set_tip (_note_size_relative_combo,
-						    (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
+						    (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
 		for (int x = 0; modifiers[x].name; ++x) {
 			if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
 				_note_size_relative_combo.set_active_text (S_(modifiers[x].name));
@@ -665,10 +695,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 (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
+#ifdef __APPLE__
+		mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
 #else
-		Glib::ustring mod_str = Keyboard::secondary_modifier_name();
+		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)));
@@ -691,7 +721,7 @@ 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 (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
@@ -752,7 +782,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 (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::tertiary_modifier_name ());
+		mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::secondary_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) {
@@ -768,28 +798,6 @@ public:
 		t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
 		t->attach (_fine_adjust_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
-		++row;
-		col = 1;
-
-		/* push points */
-		set_popdown_strings (_push_points_combo, dumb);
-		_push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
-
-		Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
-						    (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
-		for (int x = 0; modifiers[x].name; ++x) {
-			if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
-				_push_points_combo.set_active_text (S_(modifiers[x].name));
-				break;
-			}
-		}
-
-		l = manage (left_aligned_label (_("Push points using:")));
-		l->set_name ("OptionsLabel");
-
-		t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
-		t->attach (_push_points_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
-
 		_box->pack_start (*t, false, false);
 	}
 
@@ -825,7 +833,7 @@ private:
 		string const txt = _edit_modifier_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				Keyboard::set_edit_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -837,7 +845,7 @@ private:
 		string const txt = _delete_modifier_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				Keyboard::set_delete_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -849,7 +857,7 @@ private:
 		string const txt = _copy_modifier_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				Keyboard::set_copy_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -861,7 +869,7 @@ private:
 		string const txt = _insert_note_modifier_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				Keyboard::set_insert_note_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -873,7 +881,7 @@ private:
 		string const txt = _snap_modifier_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				Keyboard::set_snap_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -885,7 +893,7 @@ private:
 		string const txt = _snap_delta_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				Keyboard::set_snap_delta_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -897,7 +905,7 @@ private:
 		string const txt = _constraint_modifier_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_constraint_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -909,7 +917,7 @@ private:
 		string const txt = _trim_contents_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_trim_contents_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -921,7 +929,7 @@ private:
 		string const txt = _trim_overlap_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_trim_overlap_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -933,7 +941,7 @@ private:
 		string const txt = _trim_anchored_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_trim_anchored_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -945,7 +953,7 @@ private:
 		string const txt = _fine_adjust_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_fine_adjust_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -957,7 +965,7 @@ private:
 		string const txt = _push_points_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_push_points_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -969,7 +977,7 @@ private:
 		string const txt = _note_size_relative_combo.get_active_text();
 
 		for (int i = 0; modifiers[i].name; ++i) {
-			if (txt == _(modifiers[i].name)) {
+			if (txt == S_(modifiers[i].name)) {
 				ArdourKeyboard::set_note_size_relative_modifier (modifiers[i].modifier);
 				break;
 			}
@@ -1027,8 +1035,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);
@@ -1053,7 +1061,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));
 	}
@@ -1343,9 +1351,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);
@@ -1361,7 +1368,7 @@ public:
 		edit_box->set_spacing(3);
 		_box->pack_start (*edit_box, false, false);
 		edit_box->show ();
-		
+
 		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);
@@ -1431,7 +1438,7 @@ private:
 		else
 			edit_button->set_sensitive (false);
 	}
-	
+
 	void view_changed (TreeModel::Path const &, TreeModel::iterator const & i)
 	{
 		TreeModel::Row r = *i;
@@ -1496,7 +1503,8 @@ private:
 		 * or re-initializing a surface.
 		 * tear_down_gui() hides an deletes the Window if it exists.
 		 */
-		ArdourWindow* win = new ArdourWindow (_parent, title.get_string());
+		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 ();
@@ -1532,7 +1540,6 @@ 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;
@@ -1546,45 +1553,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);
 	}
@@ -1617,6 +1657,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") {
@@ -1634,6 +1698,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());
 		}
 	}
 
@@ -1645,15 +1711,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 ColumVisibilityOption : public Option
+{
+	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)
+	{
+		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;
+		}
+		parameter_changed (id);
+	}
+
+	~ColumVisibilityOption () {
+		free (cb);
+	}
+
+	Gtk::Widget& tip_widget() { return _hbox; }
+
+	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 add_to_page (OptionEditorPage* p)
+	{
+		_heading.add_to_page (p);
+		add_widget_to_page (p, &_hbox);
+	}
+	private:
+
+	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);
+		}
+		if (cc != c) {
+			_set (c);
+		}
+	}
+
+	HBox _hbox;
+	OptionEditorHeading _heading;
+
+	CheckButton** cb;
+	uint32_t _n_col;
+	sigc::slot<uint32_t> _get;
+	sigc::slot<bool, uint32_t> _set;
 };
 
 
@@ -1720,10 +1855,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 ();
@@ -1798,11 +1944,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"),
@@ -1937,8 +2083,8 @@ RCOptionEditor::RCOptionEditor ()
 	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")));
+
+	add_option (_("Transport/Sync"), new OptionEditorHeading (S_("Synchronization and Slave Options")));
 
 	_sync_source = new ComboOption<SyncSource> (
 		"sync-source",
@@ -1947,7 +2093,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",
@@ -1963,7 +2109,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",
@@ -1984,7 +2130,7 @@ RCOptionEditor::RCOptionEditor ()
 				  ), PROGRAM_NAME));
 
 
-	add_option (_("Transport"), _sync_genlock);
+	add_option (_("Transport/Sync"), _sync_genlock);
 
 	_sync_source_2997 = new BoolOption (
 		"timecode-source-2997",
@@ -2002,9 +2148,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",
@@ -2019,13 +2165,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"),
@@ -2051,9 +2198,9 @@ RCOptionEditor::RCOptionEditor ()
 
 	Gtkmm2ext::UI::instance()->set_tip
 		(_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"));
+		 _("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);
+	add_option (_("Transport/Sync"), _ltc_volume_slider);
 
 	/* EDITOR */
 
@@ -2083,14 +2230,6 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
 		     ));
 
-	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",
@@ -2107,6 +2246,14 @@ if (!Profile->get_mixbus()) {
 			    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"),
@@ -2203,11 +2350,11 @@ if (!Profile->get_mixbus()) {
 	rsas->add(ExistingNewlyCreatedBoth, _("existing selection and newly-created regions"));
 
 	add_option (_("Editor"), rsas);
-	
-	add_option (_("Editor"), new OptionEditorHeading (_("Waveforms")));
+
+	add_option (_("Editor/Waveforms"), new OptionEditorHeading (_("Waveforms")));
 
 if (!Profile->get_mixbus()) {
-	add_option (_("Editor"),
+	add_option (_("Editor/Waveforms"),
 	     new BoolOption (
 		     "show-waveforms",
 		     _("Show waveforms in regions"),
@@ -2216,7 +2363,7 @@ if (!Profile->get_mixbus()) {
 		     ));
 }  // !mixbus
 
-	add_option (_("Editor"),
+	add_option (_("Editor/Waveforms"),
 	     new BoolOption (
 		     "show-waveforms-while-recording",
 		     _("Show waveforms for audio while it is being recorded"),
@@ -2234,7 +2381,7 @@ if (!Profile->get_mixbus()) {
 	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",
@@ -2246,9 +2393,9 @@ if (!Profile->get_mixbus()) {
 	wfsh->add (Traditional, _("traditional"));
 	wfsh->add (Rectified, _("rectified"));
 
-	add_option (_("Editor"), wfsh);
+	add_option (_("Editor/Waveforms"), wfsh);
 
-	add_option (_("Editor"), new ClipLevelOptions ());
+	add_option (_("Editor/Waveforms"), new ClipLevelOptions ());
 
 
 	/* AUDIO */
@@ -2285,8 +2432,8 @@ if (!Profile->get_mixbus()) {
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
 		     ));
 
-if (!Profile->get_mixbus()) {
 	add_option (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses")));
+if (!Profile->get_mixbus()) {
 
 	add_option (_("Audio"),
 		    new BoolOption (
@@ -2320,6 +2467,18 @@ if (!Profile->get_mixbus()) {
 	oac->add (ManualConnect, _("manually"));
 
 	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")));
@@ -2371,24 +2530,6 @@ if (!Profile->get_mixbus()) {
 
 	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"),
@@ -2409,7 +2550,7 @@ if (!Profile->get_mixbus()) {
 
 	/* SOLO AND MUTE */
 
-	add_option (_("Solo / mute"), new OptionEditorHeading (_("Solo")));
+	add_option (_("Solo & mute"), new OptionEditorHeading (_("Solo")));
 
 	_solo_control_is_listen_control = new BoolOption (
 		"solo-control-is-listen-control",
@@ -2418,9 +2559,9 @@ if (!Profile->get_mixbus()) {
 		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"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "exclusive-solo",
 		     _("Exclusive solo"),
@@ -2428,7 +2569,7 @@ if (!Profile->get_mixbus()) {
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_exclusive_solo)
 		     ));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "show-solo-mutes",
 		     _("Show solo muting"),
@@ -2436,7 +2577,7 @@ if (!Profile->get_mixbus()) {
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
 		     ));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new BoolOption (
 		     "solo-mute-override",
 		     _("Soloing overrides muting"),
@@ -2444,7 +2585,7 @@ if (!Profile->get_mixbus()) {
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
 		     ));
 
-	add_option (_("Solo / mute"),
+	add_option (_("Solo & mute"),
 	     new FaderOption (
 		     "solo-mute-gain",
 		     _("Solo-in-place mute cut (dB)"),
@@ -2462,7 +2603,7 @@ if (!Profile->get_mixbus()) {
 	_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",
@@ -2474,7 +2615,7 @@ if (!Profile->get_mixbus()) {
 	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",
@@ -2486,11 +2627,11 @@ if (!Profile->get_mixbus()) {
 	pa->add (AFLFromBeforeProcessors, _("immediately post-fader"));
 	pa->add (AFLFromAfterProcessors, _("after post-fader processors (before pan)"));
 
-	add_option (_("Solo / mute"), pa);
+	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"),
@@ -2498,7 +2639,7 @@ if (!Profile->get_mixbus()) {
 		     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"),
@@ -2506,7 +2647,7 @@ if (!Profile->get_mixbus()) {
 		     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"),
@@ -2514,7 +2655,7 @@ if (!Profile->get_mixbus()) {
 		     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"),
@@ -2522,15 +2663,17 @@ if (!Profile->get_mixbus()) {
 		     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")));
 
@@ -2585,9 +2728,9 @@ if (!Profile->get_mixbus()) {
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback)
 			    ));
 
-	add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Clock")));
+	add_option (_("MIDI/Sync"), new OptionEditorHeading (_("MIDI Clock")));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "send-midi-clock",
 			    _("Send MIDI Clock"),
@@ -2595,9 +2738,9 @@ if (!Profile->get_mixbus()) {
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
 			    ));
 
-	add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Time Code (MTC)")));
+	add_option (_("MIDI/Sync"), new OptionEditorHeading (_("MIDI Time Code (MTC)")));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "send-mtc",
 			    _("Send MIDI Time Code"),
@@ -2605,7 +2748,7 @@ if (!Profile->get_mixbus()) {
 			    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"),
@@ -2614,9 +2757,9 @@ if (!Profile->get_mixbus()) {
 			    0, 20, 1, 5
 			    ));
 
-	add_option (_("MIDI"), new OptionEditorHeading (_("Midi Machine Control (MMC)")));
+	add_option (_("MIDI/Sync"), new OptionEditorHeading (_("Midi Machine Control (MMC)")));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 		    new BoolOption (
 			    "mmc-control",
 			    _("Obey MIDI Machine Control commands"),
@@ -2624,7 +2767,7 @@ if (!Profile->get_mixbus()) {
 			    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"),
@@ -2632,7 +2775,7 @@ if (!Profile->get_mixbus()) {
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mmc)
 			    ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 	     new SpinOption<uint8_t> (
 		     "mmc-receive-device-id",
 		     _("Inbound MMC device ID"),
@@ -2641,7 +2784,7 @@ if (!Profile->get_mixbus()) {
 		     0, 128, 1, 10
 		     ));
 
-	add_option (_("MIDI"),
+	add_option (_("MIDI/Sync"),
 	     new SpinOption<uint8_t> (
 		     "mmc-send-device-id",
 		     _("Outbound MMC device ID"),
@@ -2701,30 +2844,21 @@ if (!Profile->get_mixbus()) {
 
 	/* Control Surfaces */
 
-	add_option (_("Control Surfaces"), new ControlSurfacesOptions (*this));
-
-	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)
-		);
-
-	rm->add (UserOrdered, _("assigned by user"));
-	rm->add (MixerOrdered, _("follows order of mixer"));
-
-	add_option (_("Control Surfaces"), rm);
+	add_option (_("Control Surfaces"), new ControlSurfacesOptions);
 
 	/* VIDEO Timeline */
 	add_option (_("Video"), new VideoTimelineOptions (_rc_config));
 
 #if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
-	add_option (_("Plugins"), new OptionEditorHeading (_("General")));
-
 	add_option (_("Plugins"),
 			new RcActionButton (_("Scan for Plugins"),
 				sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
 
+#endif
+
+	add_option (_("Plugins"), new OptionEditorHeading (_("General")));
+
+#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
 	bo = new BoolOption (
 			"show-plugin-scan-window",
 			_("Always Display Plugin Scan Progress"),
@@ -2734,11 +2868,33 @@ if (!Profile->get_mixbus()) {
 	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"), new OptionEditorHeading (_("VST")));
+	add_option (_("Plugins/VST"), new OptionEditorHeading (_("VST")));
+	add_option (_("Plugins/VST"),
+			new RcActionButton (_("Scan for Plugins"),
+				sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
 
 	bo = new BoolOption (
 			"discover-vst-on-start",
@@ -2746,7 +2902,7 @@ if (!Profile->get_mixbus()) {
 			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);
+	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"));
 
@@ -2758,40 +2914,57 @@ if (!Profile->get_mixbus()) {
 			sigc::mem_fun (*_rc_config, &RCConfiguration::get_verbose_plugin_scan),
 			sigc::mem_fun (*_rc_config, &RCConfiguration::set_verbose_plugin_scan)
 			);
-	add_option (_("Plugins"), bo);
+	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"), new VstTimeOutSliderOption (_rc_config));
+	add_option (_("Plugins/VST"), new VstTimeOutSliderOption (_rc_config));
 
-	add_option (_("Plugins"),
+	add_option (_("Plugins/VST"),
 			new RcActionButton (_("Clear"),
 				sigc::mem_fun (*this, &RCOptionEditor::clear_vst_cache),
 				_("VST Cache:")));
 
-	add_option (_("Plugins"),
+	add_option (_("Plugins/VST"),
 			new RcActionButton (_("Clear"),
 				sigc::mem_fun (*this, &RCOptionEditor::clear_vst_blacklist),
 				_("VST Blacklist:")));
 #endif
 
 #ifdef LXVST_SUPPORT
-	add_option (_("Plugins"),
+	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"),
+	add_option (_("Plugins/VST"),
 			new RcActionButton (_("Edit"),
-				sigc::mem_fun (*this, &RCOptionEditor::edit_lxvst_path),
+				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")));
+
+	add_option (_("Plugins/Audio Unit"), new OptionEditorHeading (_("Audio Unit")));
+	add_option (_("Plugins/Audio Unit"),
+			new RcActionButton (_("Scan for Plugins"),
+				sigc::mem_fun (*this, &RCOptionEditor::plugin_scan_refresh)));
 
 	bo = new BoolOption (
 			"discover-audio-units",
@@ -2802,6 +2975,16 @@ if (!Profile->get_mixbus()) {
 	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)
@@ -2810,9 +2993,48 @@ if (!Profile->get_mixbus()) {
 	     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)
+		     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 */
@@ -2842,6 +3064,14 @@ if (!Profile->get_mixbus()) {
 	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",
@@ -2850,7 +3080,6 @@ if (!Profile->get_mixbus()) {
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_widget_prelight)
 		     ));
 
-#ifdef TOOLTIPS_GOT_FIXED
 	add_option (S_("Preferences|GUI"),
 	     new BoolOption (
 		     "use-tooltips",
@@ -2858,7 +3087,6 @@ if (!Profile->get_mixbus()) {
 		     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 (
@@ -2868,7 +3096,7 @@ if (!Profile->get_mixbus()) {
 		     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
 		     ));
 
-	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"),
@@ -2877,7 +3105,7 @@ if (!Profile->get_mixbus()) {
 			    ));
 
 
-#ifndef GTKOSX
+#ifndef __APPLE__
 	/* font scaling does nothing with GDK/Quartz */
 	add_option (S_("Preferences|GUI"), new FontScalingOptions ());
 #endif
@@ -2923,6 +3151,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
 	_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"),
@@ -2942,6 +3171,14 @@ if (!ARDOUR::Profile->get_mixbus()) {
 		     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> (
@@ -3079,7 +3316,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
 
 	Gtkmm2ext::UI::instance()->set_tip
 		(mpks->tip_widget(),
-		 _("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));
+		 _("Specify the audio signal level in dBFS at and above which the meter-peak indicator will flash red."));
 
 	add_option (S_("Preferences|Metering"), mpks);
 
@@ -3091,15 +3328,46 @@ if (!ARDOUR::Profile->get_mixbus()) {
 		     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
@@ -3137,6 +3405,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") {
+#if (defined LV2_SUPPORT && defined LV2_EXTENDED)
+		_plugin_prefer_inline->set_sensitive (UIConfiguration::instance().get_open_gui_after_adding_plugin() && UIConfiguration::instance().get_show_inline_display_by_default());
+#endif
 	}
 }
 
@@ -3165,11 +3437,12 @@ void RCOptionEditor::clear_au_blacklist () {
 }
 
 void RCOptionEditor::edit_lxvst_path () {
+	Glib::RefPtr<Gdk::Window> win = get_parent_window ();
 	Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
-			_("Set Linux VST Search Path"),
-			_rc_config->get_plugin_path_lxvst(),
-			PluginManager::instance().get_default_lxvst_path()
-			);
+		*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) {
@@ -3180,10 +3453,10 @@ void RCOptionEditor::edit_lxvst_path () {
 
 void RCOptionEditor::edit_vst_path () {
 	Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
-			_("Set Windows VST Search Path"),
-			_rc_config->get_plugin_path_vst(),
-			PluginManager::instance().get_default_windows_vst_path()
-			);
+		*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) {
@@ -3211,4 +3484,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;
 }