new_grid: Rewrite of Snap and Grid. (squashed commit)
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index c95a1676056cf5f8fcbdeb41db6a851fae56c7b7..0122e925f9f6cecf7e4f636dadef2f2cc475e4e6 100644 (file)
 #include <gtkmm/stock.h>
 #include <gtkmm/scale.h>
 
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/paths_dialog.h>
-#include <gtkmm2ext/window_title.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/window_title.h"
 
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
 #include "ardour/plugin_manager.h"
 #include "control_protocol/control_protocol.h"
 
-#include "canvas/wave_view.h"
+#include "waveview/wave_view.h"
+
+#include "widgets/paths_dialog.h"
+#include "widgets/tooltips.h"
 
 #include "ardour_dialog.h"
 #include "ardour_ui.h"
@@ -65,7 +66,6 @@
 #include "midi_tracer.h"
 #include "rc_option_editor.h"
 #include "sfdb_ui.h"
-#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
@@ -75,6 +75,7 @@ using namespace Gtkmm2ext;
 using namespace PBD;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 
 class ClickOptions : public OptionEditorMiniPage
 {
@@ -86,42 +87,48 @@ public:
        {
                // TODO get rid of GTK -> use OptionEditor Widgets
                Table* t = &table;
+               Label* l;
+               int row = 0;
 
-               Label* l = manage (left_aligned_label (_("Emphasis on first beat")));
+               l = manage (left_aligned_label (_("Emphasis on first beat")));
                _use_emphasis_on_click_check_button.add (*l);
-               t->attach (_use_emphasis_on_click_check_button, 1, 3, 0, 1, FILL);
+               t->attach (_use_emphasis_on_click_check_button, 1, 3, row, row + 1, FILL);
                _use_emphasis_on_click_check_button.signal_toggled().connect (
                    sigc::mem_fun (*this, &ClickOptions::use_emphasis_on_click_toggled));
+               ++row;
 
                l = manage (left_aligned_label (_("Use built-in default sounds")));
                _use_default_click_check_button.add (*l);
-               t->attach (_use_default_click_check_button, 1, 3, 1, 2, FILL);
+               t->attach (_use_default_click_check_button, 1, 3, row, row + 1, FILL);
                _use_default_click_check_button.signal_toggled().connect (
                    sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
+               ++row;
 
                l = manage (left_aligned_label (_("Audio file:")));
-               t->attach (*l, 1, 2, 2, 3, FILL);
-               t->attach (_click_path_entry, 2, 3, 2, 3, FILL);
+               t->attach (*l, 1, 2, row, row + 1, FILL);
+               t->attach (_click_path_entry, 2, 3, row, row + 1, FILL);
                _click_browse_button.signal_clicked ().connect (
                    sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
-               t->attach (_click_browse_button, 3, 4, 2, 3, FILL);
+               t->attach (_click_browse_button, 3, 4, row, row + 1, FILL);
+               ++row;
 
                l = manage (left_aligned_label (_("Emphasis audio file:")));
-               t->attach (*l, 1, 2, 3, 4, FILL);
-               t->attach (_click_emphasis_path_entry, 2, 3, 3, 4, FILL);
+               t->attach (*l, 1, 2, row, row + 1, FILL);
+               t->attach (_click_emphasis_path_entry, 2, 3, row, row + 1, FILL);
                _click_emphasis_browse_button.signal_clicked ().connect (
                    sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
-               t->attach (_click_emphasis_browse_button, 3, 4, 3, 4, FILL);
+               t->attach (_click_emphasis_browse_button, 3, 4, row, row + 1, FILL);
+               ++row;
 
-               FaderOption* fo = new FaderOption (
+               _click_fader = new FaderOption (
                                "click-gain",
                                _("Gain level"),
                                sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
                                sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
                                );
 
-               fo->add_to_page (this);
-               fo->set_state_from_config ();
+               _click_fader->add_to_page (this);
+               _click_fader->set_state_from_config ();
 
                _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));
@@ -146,6 +153,8 @@ public:
                } else if (p == "use-click-emphasis") {
                        bool x = _rc_config->get_use_click_emphasis ();
                        _use_emphasis_on_click_check_button.set_active (x);
+               } else if (p == "click-gain") {
+                       _click_fader->set_state_from_config ();
                }
        }
 
@@ -237,6 +246,7 @@ private:
        Entry _click_emphasis_path_entry;
        Button _click_browse_button;
        Button _click_emphasis_browse_button;
+       FaderOption* _click_fader;
 };
 
 class UndoOptions : public OptionEditorComponent
@@ -1188,7 +1198,7 @@ private:
        {
                UIConfiguration::instance().set_waveform_clip_level (_clip_level_adjustment.get_value());
                /* XXX: should be triggered from the parameter changed signal */
-               ArdourCanvas::WaveView::set_clip_level (_clip_level_adjustment.get_value());
+               ArdourWaveView::WaveView::set_clip_level (_clip_level_adjustment.get_value());
        }
 
        Adjustment _clip_level_adjustment;
@@ -1365,7 +1375,7 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
                                if (!(*i)->mandatory) {
                                        TreeModel::Row r = *_store->append ();
                                        r[_model.name] = (*i)->name;
-                                       r[_model.enabled] = ((*i)->protocol || (*i)->requested);
+                                       r[_model.enabled] = 0 != (*i)->protocol;
                                        r[_model.protocol_info] = *i;
                                }
                        }
@@ -1382,8 +1392,9 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
 
                                if ((*x)[_model.protocol_info] == cpi) {
                                        _ignore_view_change++;
-                                       (*x)[_model.enabled] = (cpi->protocol || cpi->requested);
+                                       (*x)[_model.enabled] = 0 != cpi->protocol;
                                        _ignore_view_change--;
+                                       selection_changed (); // update sensitivity
                                        break;
                                }
                        }
@@ -1459,7 +1470,7 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
                         * tear_down_gui() hides an deletes the Window if it exists.
                         */
                        ArdourWindow* win = new ArdourWindow (*((Gtk::Window*) _view.get_toplevel()), title.get_string());
-                       win->set_title ("Control Protocol Options");
+                       win->set_title (_("Control Protocol Settings"));
                        win->add (*box);
                        box->show ();
                        win->present ();
@@ -1526,7 +1537,7 @@ class VideoTimelineOptions : public OptionEditorMiniPage
                        t->attach (_video_advanced_setup_button, 1, 4, n, n + 1, FILL);
                        _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."));
+                                       _("<b>When enabled</b> you can specify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
                        ++n;
 
                        Label* l = manage (new Label (_("Video Server URL:")));
@@ -1542,7 +1553,7 @@ class VideoTimelineOptions : public OptionEditorMiniPage
                        t->attach (*l, 1, 2, n, n + 1, FILL);
                        t->attach (_video_server_docroot_entry, 2, 4, n, n + 1);
                        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."));
+                                       _("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 unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
                        ++n;
 
                        l = manage (new Label (""));
@@ -2111,7 +2122,11 @@ MidiPortOptions::pretty_name_edit (std::string const & path, string const & new_
 
 RCOptionEditor::RCOptionEditor ()
        : OptionEditorContainer (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
-       , Tabbable (*this, _("Preferences")) /* pack self-as-vbox into tabbable */
+       , Tabbable (*this, _("Preferences")
+#ifdef MIXBUS
+                       , false // detached by default (first start, no instant.xml)
+#endif
+                       ) /* pack self-as-vbox into tabbable */
        , _rc_config (Config)
        , _mixer_strip_visibility ("mixer-element-visibility")
 {
@@ -2160,50 +2175,14 @@ RCOptionEditor::RCOptionEditor ()
                 _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
        add_option (_("General"), sics);
 
-       add_option (_("General"), new OptionEditorHeading (S_("Options|Undo")));
-
-       add_option (_("General"), new UndoOptions (_rc_config));
-
-       add_option (_("General"),
-            new BoolOption (
-                    "verify-remove-last-capture",
-                    _("Verify removal of last capture"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_verify_remove_last_capture),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
-                    ));
-
-       add_option (_("General"), new OptionEditorHeading (_("Session Management")));
-
-       add_option (_("General"),
-            new BoolOption (
-                    "periodic-safety-backups",
-                    _("Make periodic backups of the session file"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_periodic_safety_backups),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
-                    ));
+       add_option (_("General"), new OptionEditorHeading (_("Engine")));
 
        add_option (_("General"),
             new BoolOption (
-                    "only-copy-imported-files",
-                    _("Always copy imported files"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_only_copy_imported_files),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files)
-                    ));
-
-       add_option (_("General"), new DirectoryOption (
-                           X_("default-session-parent-dir"),
-                           _("Default folder for new sessions:"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
-                           ));
-
-       add_option (_("General"),
-            new SpinOption<uint32_t> (
-                    "max-recent-sessions",
-                    _("Maximum number of recent sessions"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions),
-                    0, 1000, 1, 20
+                    "try-autostart-engine",
+                    _("Try to auto-launch audio/midi engine"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_try_autostart_engine),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_try_autostart_engine)
                     ));
 
        add_option (_("General"), new OptionEditorHeading (_("Automation")));
@@ -2228,18 +2207,17 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("General"), new OptionEditorHeading (_("Tempo")));
 
-       BoolOption* tsf;
-       tsf = new BoolOption (
+       bo = new BoolOption (
                "allow-non-quarter-pulse",
                _("Allow non quarter-note pulse"),
                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_allow_non_quarter_pulse),
                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_allow_non_quarter_pulse)
                );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                                            string_compose (_("<b>When enabled</b> %1 will allow tempo to be expressed in divisions per minute\n"
                                                              "<b>When disabled</b> %1 will only allow tempo to be expressed in quarter notes per minute"),
                                                            PROGRAM_NAME));
-       add_option (_("General"), tsf);
+       add_option (_("General"), bo);
 
        if (!ARDOUR::Profile->get_mixbus()) {
                add_option (_("General"), new OptionEditorHeading (_("GUI Lock")));
@@ -2258,6 +2236,53 @@ RCOptionEditor::RCOptionEditor ()
                add_option (_("General"), slts);
        } // !mixbus
 
+       add_option (_("General/Session"), new OptionEditorHeading (S_("Options|Undo")));
+
+       add_option (_("General/Session"), new UndoOptions (_rc_config));
+
+       add_option (_("General/Session"),
+            new BoolOption (
+                    "verify-remove-last-capture",
+                    _("Verify removal of last capture"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_verify_remove_last_capture),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
+                    ));
+
+       add_option (_("General/Session"), new OptionEditorHeading (_("Session Management")));
+
+       add_option (_("General/Session"),
+            new BoolOption (
+                    "periodic-safety-backups",
+                    _("Make periodic backups of the session file"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_periodic_safety_backups),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
+                    ));
+
+       add_option (_("General/Session"),
+            new BoolOption (
+                    "only-copy-imported-files",
+                    _("Always copy imported files"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_only_copy_imported_files),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files)
+                    ));
+
+       add_option (_("General/Session"), new DirectoryOption (
+                           X_("default-session-parent-dir"),
+                           _("Default folder for new sessions:"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
+                           ));
+
+       add_option (_("General/Session"),
+            new SpinOption<uint32_t> (
+                    "max-recent-sessions",
+                    _("Maximum number of recent sessions"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions),
+                    0, 1000, 1, 20
+                    ));
+
+
 #ifdef ENABLE_NLS
 
        add_option (_("General/Translation"), new OptionEditorHeading (_("Internationalization")));
@@ -2273,19 +2298,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("General/Translation"), bo);
 
-       _l10n = new ComboOption<ARDOUR::LocaleMode> (
-               "locale-mode",
-               _("Localization"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_locale_mode),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_locale_mode)
-               );
-
-       _l10n->add (ARDOUR::SET_LC_ALL, _("Set complete locale"));
-       _l10n->add (ARDOUR::SET_LC_MESSAGES, _("Enable only message translation"));
-       _l10n->add (ARDOUR::SET_LC_MESSAGES_AND_LC_NUMERIC, _("Translate messages and format numeric format"));
-       _l10n->set_note (_("This setting is provided for plugin compatibility. e.g. some plugins on some systems expect the decimal point to be a dot."));
-
-       add_option (_("General/Translation"), _l10n);
        parameter_changed ("enable-translation");
 #endif // ENABLE_NLS
 
@@ -2294,17 +2306,9 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Editor"), new OptionEditorHeading (_("General")));
 
-       add_option (_("Editor"),
-            new BoolOption (
-                    "rubberbanding-snaps-to-grid",
-                    _("Snap rubberband to 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",
-                    _("Prompt for a new marker name"),
+                    _("Prompt for new marker names"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_name_new_markers),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_name_new_markers)
                );
@@ -2320,6 +2324,33 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
                     ));
 
+       ComboOption<float>* dps = new ComboOption<float> (
+                    "draggable-playhead-speed",
+                    _("Playhead dragging speed (%)"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_draggable_playhead_speed),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead_speed)
+                    );
+       dps->add (0.05, _("5%"));
+       dps->add (0.1, _("10%"));
+       dps->add (0.25, _("25%"));
+       dps->add (0.5, _("50%"));
+       dps->add (1.0, _("100%"));
+       add_option (_("Editor"), dps);
+
+       ComboOption<float>* eet = new ComboOption<float> (
+                    "extra-ui-extents-time",
+                    _("Limit zooming & summary view to X minutes beyond session extents"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_extra_ui_extents_time),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_extra_ui_extents_time)
+                    );
+       eet->add (1, _("1 minute"));
+       eet->add (2, _("2 minutes"));
+       eet->add (20, _("20 minutes"));
+       eet->add (60, _("1 hour"));
+       eet->add (60*2, _("2 hours"));
+       eet->add (60*24, _("24 hours"));
+       add_option (_("Editor"), eet);
+
        if (!Profile->get_mixbus()) {
 
                add_option (_("Editor"),
@@ -2383,6 +2414,16 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
                     ));
 
+       bo = new BoolOption (
+                    "new-automation-points-on-lane",
+                    _("Ignore Y-axis click position when adding new automation-points"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_new_automation_points_on_lane),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_new_automation_points_on_lane)
+                    );
+       add_option (_("Editor"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> The new points drawn in any automation lane will be placed on the existing line, regardless of mouse y-axis position."));
+
        ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
                        "default-fade-shape",
                        _("Default fade shape"),
@@ -2441,6 +2482,69 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Editor"), rsas);
 
+       add_option (_("Editor/Snap"), new OptionEditorHeading (_("General Snap options:")));
+       
+       add_option (_("Editor/Snap"),
+                   new SpinOption<uint32_t> (
+                           "snap-threshold",
+                           _("Snap Threshold (pixels)"),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_threshold),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_threshold),
+                           10, 200,
+                           1, 10
+                           ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "show-snapped-cursor",
+                    _("Show Snapped Cursor"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_snapped_cursor),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_snapped_cursor)
+                    ));
+       
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "rubberbanding-snaps-to-grid",
+                    _("Snap rubberband to grid"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
+                    ));
+
+       add_option (_("Editor/Snap"), new OptionEditorHeading (_("When \"Snap\" is enabled, snap to:")));
+
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-region-sync",
+                    _("Region Sync Points"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_sync),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_sync)
+                    ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-region-start",
+                    _("Region Starts"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_start),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_start)
+                    ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-region-end",
+                    _("Region Ends"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_end),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_end)
+                    ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-grid",
+                    _("Grid"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_grid),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_grid)
+                    ));
+
        add_option (_("Editor/Modifiers"), new OptionEditorHeading (_("Keyboard Modifiers")));
        add_option (_("Editor/Modifiers"), new KeyboardOptions);
        add_option (_("Editor/Modifiers"), new OptionEditorBlank ());
@@ -2526,7 +2630,7 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Mixer"), pa);
 
-       add_option (_("Mixer"), new OptionEditorHeading (_("Default track / bus muting options")));
+       add_option (_("Mixer"), new OptionEditorHeading (_("Default Track / Bus Muting Options")));
 
        add_option (_("Mixer"),
             new BoolOption (
@@ -2594,13 +2698,16 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Signal Flow"), mm);
 
-       add_option (_("Signal Flow"),
-            new BoolOption (
+       bo = new BoolOption (
                     "tape-machine-mode",
                     _("Tape machine mode"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_tape_machine_mode),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
-                    ));
+                    );
+       add_option (_("Signal Flow"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       string_compose (_("<b>When enabled</b> %1 will not monitor a track's input if the transport is stopped."),
+                                       PROGRAM_NAME));
 
        if (!Profile->get_mixbus()) {
 
@@ -2641,7 +2748,7 @@ RCOptionEditor::RCOptionEditor ()
 
                bo = new BoolOption (
                                "strict-io",
-                               _("Use 'Strict-I/O' for new tracks or Busses"),
+                               _("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)
                                );
@@ -2751,24 +2858,6 @@ RCOptionEditor::RCOptionEditor ()
                     -1, 65536, 1, 10
                     ));
 
-       add_option (_("MIDI"), new OptionEditorHeading (_("Display")));
-
-       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",
-                    _("Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"),
-                    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 OptionEditorHeading (_("Audition")));
 
        add_option (_("MIDI"),
@@ -2810,6 +2899,20 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Metronome"), new OptionEditorHeading (_("Metronome")));
        add_option (_("Metronome"), new ClickOptions (_rc_config));
+       add_option (_("Metronome"), new OptionEditorHeading (_("Options")));
+
+       bo = new BoolOption (
+                       "click-record-only",
+                       _("Enable metronome only while recording"),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_record_only),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_record_only)
+                       );
+
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       string_compose (_("<b>When enabled</b> the metronome will remain silent if %1 is <b>not recording</b>."), PROGRAM_NAME));
+       add_option (_("Metronome"), bo);
+       add_option (_("Metronome"), new OptionEditorBlank ());
+
 
        /* Meters */
 
@@ -2892,6 +2995,24 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (S_("Preferences|Metering"), mvu);
 
+       HSliderOption *mpks = new HSliderOption("meter-peak",
+                       _("Peak indicator threshold [dBFS]"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
+                       -10, 0, .1, .1
+                       );
+
+       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."));
+
+       add_option (S_("Preferences|Metering"), mpks);
+
+       OptionEditorHeading* default_meter_head = new OptionEditorHeading (_("Default Meter Types"));
+       default_meter_head->set_note (_("These settings apply to newly created tracks and busses. For the Master bus, this will be when a new session is created."));
+
+       add_option (S_("Preferences|Metering"), default_meter_head);
+
        ComboOption<MeterType>* mtm = new ComboOption<MeterType> (
                "meter-type-master",
                _("Default Meter Type for Master Bus"),
@@ -2912,7 +3033,7 @@ RCOptionEditor::RCOptionEditor ()
 
        ComboOption<MeterType>* mtb = new ComboOption<MeterType> (
                "meter-type-bus",
-               _("Default Meter Type for Busses"),
+               _("Default meter type for busses"),
                sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_bus),
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_bus)
                );
@@ -2929,7 +3050,7 @@ RCOptionEditor::RCOptionEditor ()
 
        ComboOption<MeterType>* mtt = new ComboOption<MeterType> (
                "meter-type-track",
-               _("Default Meter Type for Tracks"),
+               _("Default meter type for tracks"),
                sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_track),
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_track)
                );
@@ -2938,19 +3059,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (S_("Preferences|Metering"), mtt);
 
-       HSliderOption *mpks = new HSliderOption("meter-peak",
-                       _("Peak threshold [dBFS]"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
-                       -10, 0, .1, .1
-                       );
-
-       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."));
-
-       add_option (S_("Preferences|Metering"), mpks);
-
        add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
 
        add_option (S_("Preferences|Metering"),
@@ -2965,46 +3073,48 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Transport"), new OptionEditorHeading (_("General")));
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "stop-at-session-end",
                     _("Stop at the end of the session"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
                     );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                                            string_compose (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
                                                              "when it reaches the current session end marker\n\n"
                                                              "<b>When disabled</b> %1 will continue to roll past the session end marker at all times"),
                                                            PROGRAM_NAME));
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "latched-record-enable",
                     _("Keep record-enable engaged on stop"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
                     );
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> master record will remain engaged when the transport transitions to stop.\n<b>When disabled</b> master record will be disabled when the transport transitions to stop."));
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "disable-disarm-during-roll",
                     _("Disable per-track record disarm while rolling"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_disable_disarm_during_roll),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
                     );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<b>When enabled</b> this will prevent you from accidentally stopping specific tracks recording during a take"));
-       add_option (_("Transport"), tsf);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("<b>When enabled</b> this will prevent you from accidentally stopping specific tracks recording during a take."));
+       add_option (_("Transport"), bo);
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "quieten_at_speed",
                     _("12dB gain reduction during fast-forward and fast-rewind"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
                     );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
-                       _("<b>When enabled</b> rhis will reduce the unpleasant increase in perceived volume "
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> this will reduce the unpleasant increase in perceived volume "
                                "that occurs when fast-forwarding or rewinding through some kinds of audio"));
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
 
        ComboOption<float>* psc = new ComboOption<float> (
                     "preroll-seconds",
@@ -3013,8 +3123,11 @@ RCOptionEditor::RCOptionEditor ()
                     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"
+                                           (_("The amount of preroll to apply when <b>Play with Preroll</b> or <b>Record 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 (-4.0, _("4 Bars"));
+       psc->add (-2.0, _("2 Bars"));
+       psc->add (-1.0, _("1 Bar"));
        psc->add (0.0, _("0 (no pre-roll)"));
        psc->add (0.1, _("0.1 second"));
        psc->add (0.25, _("0.25 second"));
@@ -3026,54 +3139,54 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Transport"), new OptionEditorHeading (_("Looping")));
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "loop-is-mode",
                     _("Play loop is a transport mode"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_loop_is_mode),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_loop_is_mode)
                     );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                                            (_("<b>When enabled</b> the loop button does not start playback but forces playback to always play the loop\n\n"
                                               "<b>When disabled</b> the loop button starts playing the loop, but stop then cancels loop playback")));
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "seamless-loop",
                     _("Do seamless looping (not possible when slaved to MTC, LTC etc)"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
                     );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                                            string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, "
                                                              "preventing any need to do a transport locate at the end of the loop\n\n"
                                                              "<b>When disabled</b> looping is done by locating back to the start of the loop when %1 reaches the end "
                                                              "which will often cause a small click or delay"), PROGRAM_NAME));
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
 
        add_option (_("Transport"), new OptionEditorHeading (_("Dropout (xrun) Handling")));
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "stop-recording-on-xrun",
                     _("Stop recording when an xrun occurs"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
                     );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                                            string_compose (_("<b>When enabled</b> %1 will stop recording if an over- or underrun is detected by the audio engine"),
                                                            PROGRAM_NAME));
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
 
-       tsf = new BoolOption (
+       bo = new BoolOption (
                     "create-xrun-marker",
                     _("Create markers where xruns occur"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
                     );
-       add_option (_("Transport"), tsf);
+       add_option (_("Transport"), bo);
 
 
        /* SYNC */
 
-       add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
+       add_option (_("Sync"), new OptionEditorHeading (_("External Synchronization")));
 
        _sync_source = new ComboOption<SyncSource> (
                "sync-source",
@@ -3131,8 +3244,8 @@ RCOptionEditor::RCOptionEditor ()
                (_sync_source_2997->tip_widget(),
                 _("<b>When enabled</b> the external timecode source is assumed to use 29.97 fps instead of 30000/1001.\n"
                         "SMPTE 12M-1999 specifies 29.97df as 30000/1001. The spec further mentions that "
-                        "drop-frame timecode has an accumulated error of -86ms over a 24-hour period.\n"
-                        "Drop-frame timecode would compensate exactly for a NTSC color frame rate of 30 * 0.9990 (ie 29.970000). "
+                        "drop-sample timecode has an accumulated error of -86ms over a 24-hour period.\n"
+                        "Drop-sample timecode would compensate exactly for a NTSC color frame rate of 30 * 0.9990 (ie 29.970000). "
                         "That is not the actual rate. However, some vendors use that rate - despite it being against the specs - "
                         "because the variant of using exactly 29.97 fps has zero timecode drift.\n"
                         ));
@@ -3550,6 +3663,14 @@ RCOptionEditor::RCOptionEditor ()
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm)
                                ));
 
+       add_option (_("Appearance"),
+                       new BoolOption (
+                               "blink-alert-indicators",
+                               _("Blink Alert Indicators"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_alert_indicators),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_alert_indicators)
+                               ));
+
 
 #ifndef __APPLE__
        /* font scaling does nothing with GDK/Quartz */
@@ -3644,6 +3765,24 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_editor_stereo_only_meters)
                     ));
 
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("MIDI Regions")));
+
+       add_option (_("Appearance/Editor"),
+                   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 (_("Appearance/Editor"),
+            new BoolOption (
+                    "never-display-periodic-midi",
+                    _("Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
+                    ));
+
        add_option (_("Appearance/Editor"), new OptionEditorBlank ());
 
        /* The names of these controls must be the same as those given in MixerStrip
@@ -3669,7 +3808,7 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Appearance/Mixer"),
             new BoolOption (
                     "default-narrow_ms",
-                    _("Use narrow strips in the mixer by default"),
+                    _("Use narrow strips in the mixer for new strips by default"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_default_narrow_ms),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
                     ));
@@ -3678,6 +3817,22 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Appearance/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
 
+       add_option (_("Appearance/Toolbar"),
+            new BoolOption (
+                    "show-toolbar-recpunch",
+                    _("Display Record/Punch Options"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_recpunch),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_recpunch)
+                    ));
+
+       add_option (_("Appearance/Toolbar"),
+            new BoolOption (
+                    "show-toolbar-monitoring",
+                    _("Display Monitor Options"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_monitoring),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_monitoring)
+                    ));
+
        add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-toolbar-selclock",
@@ -3696,6 +3851,22 @@ RCOptionEditor::RCOptionEditor ()
                                        ));
        }
 
+       add_option (_("Appearance/Toolbar"),
+            new BoolOption (
+                    "show-dsp-load-info",
+                    _("Display DSP Load Information"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_dsp_load_info),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_dsp_load_info)
+                    ));
+
+       add_option (_("Appearance/Toolbar"),
+            new BoolOption (
+                    "show-disk-space-info",
+                    _("Display Disk Space Information"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_disk_space_info),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_disk_space_info)
+                    ));
+
        add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-mini-timeline",
@@ -3714,7 +3885,7 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Appearance/Toolbar"),
                        new ColumVisibilityOption (
-                               "action-table-columns", _("Lua Action Script Button Visibility"), 4,
+                               "action-table-columns", _("Display Action-Buttons"), 4,
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_action_table_columns),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_action_table_columns)
                                )
@@ -3722,10 +3893,6 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Appearance/Toolbar"), new OptionEditorBlank ());
 
 
-       OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
-
-       quirks_head->set_note (string_compose (_("These settings will only take effect after %1 is restarted."), PROGRAM_NAME));
-
        /* and now the theme manager */
 
        add_option (_("Appearance/Theme"), new OptionEditorHeading (_("Theme")));
@@ -3784,15 +3951,25 @@ RCOptionEditor::RCOptionEditor ()
 
        /* Quirks */
 
+       OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
+
+       quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary \
+with each version of your OS, and the preferences that you've set in your OS.\n\n\
+You can adjust the options, below, to change how %1's windows and dialogs behave.\n\n\
+These settings will only take effect after %1 is restarted.\n\
+       "), PROGRAM_NAME));
+
        add_option (_("Appearance/Quirks"), quirks_head);
 
-       add_option (_("Appearance/Quirks"),
-            new BoolOption (
+       bo = new BoolOption (
                     "use-wm-visibility",
-                    _("Use Window Manager/Desktop visibility information"),
+                    _("Use visibility information provided by your Window Manager/Desktop"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_wm_visibility),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_wm_visibility)
-                    ));
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
+                               _("If you have trouble toggling between hidden Editor and Mixer windows, try changing this setting."));
+       add_option (_("Appearance/Quirks"), bo);
 
 #ifndef __APPLE__
        bo = new BoolOption (
@@ -3803,7 +3980,7 @@ RCOptionEditor::RCOptionEditor ()
                        );
        Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
                        _("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\nThis may help with some window managers."));
-                       add_option (_("Appearance/Quirks"), bo);
+       add_option (_("Appearance/Quirks"), bo);
 
        bo = new BoolOption (
                        "transients-follow-front",
@@ -3891,10 +4068,6 @@ RCOptionEditor::parameter_changed (string const & p)
        } 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
-#ifdef ENABLE_NLS
-       } else if (p == "enable-translation") {
-               _l10n->set_sensitive (ARDOUR::translations_are_enabled ());
 #endif
        }
 }
@@ -3921,7 +4094,7 @@ void RCOptionEditor::clear_au_blacklist () {
 
 void RCOptionEditor::edit_lxvst_path () {
        Glib::RefPtr<Gdk::Window> win = get_parent_window ();
-       Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+       PathsDialog *pd = new PathsDialog (
                *current_toplevel(), _("Set Linux VST Search Path"),
                _rc_config->get_plugin_path_lxvst(),
                PluginManager::instance().get_default_lxvst_path()
@@ -3930,12 +4103,20 @@ void RCOptionEditor::edit_lxvst_path () {
        pd->hide();
        if (r == RESPONSE_ACCEPT) {
                _rc_config->set_plugin_path_lxvst(pd->get_serialized_paths());
+
+               MessageDialog msg (_("Re-scan Plugins now?"),
+                               false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
+               msg.set_default_response (Gtk::RESPONSE_YES);
+               if (msg.run() == Gtk::RESPONSE_YES) {
+                       msg.hide ();
+                       plugin_scan_refresh ();
+               }
        }
        delete pd;
 }
 
 void RCOptionEditor::edit_vst_path () {
-       Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+       PathsDialog *pd = new PathsDialog (
                *current_toplevel(), _("Set Windows VST Search Path"),
                _rc_config->get_plugin_path_vst(),
                PluginManager::instance().get_default_windows_vst_path()
@@ -3944,6 +4125,13 @@ void RCOptionEditor::edit_vst_path () {
        pd->hide();
        if (r == RESPONSE_ACCEPT) {
                _rc_config->set_plugin_path_vst(pd->get_serialized_paths());
+               MessageDialog msg (_("Re-scan Plugins now?"),
+                               false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
+               msg.set_default_response (Gtk::RESPONSE_YES);
+               if (msg.run() == Gtk::RESPONSE_YES) {
+                       msg.hide ();
+                       plugin_scan_refresh ();
+               }
        }
        delete pd;
 }
@@ -3981,6 +4169,8 @@ RCOptionEditor::use_own_window (bool and_fill_it)
        if (win && new_window) {
                win->set_name ("PreferencesWindow");
                ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Preferences"), this);
+               win->resize (1, 1);
+               win->set_resizable (false);
        }
 
        return win;