Add some explanatory text to the Quirks settings
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 75cb6fbbcfc6b48227c5e8521b03c9a21fefd401..7d5683da587ad4985916064bd00b721b0895814a 100644 (file)
@@ -2145,6 +2145,21 @@ RCOptionEditor::RCOptionEditor ()
                add_option (_("General"), procs);
        }
 
+       /* Image cache size */
+       add_option (_("General"), new OptionEditorHeading (_("Memory Usage")));
+
+       HSliderOption *sics = new HSliderOption ("waveform-cache-size",
+                       _("Waveform image cache size (megabytes)"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size),
+                       1, 1024, 10 /* 1 MB to 1GB in steps of 10MB */
+                       );
+       sics->scale().set_digits (0);
+       Gtkmm2ext::UI::instance()->set_tip (
+                       sics->tip_widget(),
+                _("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));
@@ -2213,19 +2228,34 @@ 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")));
+               /* Lock GUI timeout */
+
+               HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
+                               _("Lock timeout (seconds)"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds),
+                               0, 1000, 1, 10
+                               );
+               slts->scale().set_digits (0);
+               Gtkmm2ext::UI::instance()->set_tip (
+                               slts->tip_widget(),
+                               _("Lock GUI after this many idle seconds (zero to never lock)"));
+               add_option (_("General"), slts);
+       } // !mixbus
 
 #ifdef ENABLE_NLS
 
@@ -2273,7 +2303,7 @@ RCOptionEditor::RCOptionEditor ()
 
        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)
                );
@@ -2563,13 +2593,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()) {
 
@@ -2720,24 +2753,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"),
@@ -2934,46 +2949,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(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                        _("<b>When enabled</b> rhis 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",
@@ -2995,49 +3012,49 @@ 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 */
@@ -3454,7 +3471,7 @@ RCOptionEditor::RCOptionEditor ()
 
        /* INTERFACE */
 #if (defined OPTIONAL_CAIRO_IMAGE_SURFACE || defined CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE)
-       add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphics Acceleration")));
+       add_option (_("Appearance"), new OptionEditorHeading (_("Graphics Acceleration")));
 #endif
 
 #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
@@ -3467,7 +3484,7 @@ RCOptionEditor::RCOptionEditor ()
 
        Gtkmm2ext::UI::instance()->set_tip (bgc->tip_widget(), string_compose (
                                _("Render large parts of the application user-interface in software, instead of using 2D-graphics acceleration.\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
-       add_option (S_("Preferences|GUI"), bgc);
+       add_option (_("Appearance"), bgc);
 #endif
 
 #ifdef CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE
@@ -3479,11 +3496,11 @@ RCOptionEditor::RCOptionEditor ()
                );
 
        Gtkmm2ext::UI::instance()->set_tip (bgo->tip_widget(), string_compose (_("Disables hardware gradient rendering on buggy video drivers (\"buggy gradients patch\").\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
-       add_option (S_("Preferences|GUI"), bgo);
+       add_option (_("Appearance"), bgo);
 #endif
-       add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphical User Interface")));
+       add_option (_("Appearance"), new OptionEditorHeading (_("Graphical User Interface")));
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("Appearance"),
             new BoolOption (
                     "widget-prelight",
                     _("Highlight widgets on mouseover"),
@@ -3491,7 +3508,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_widget_prelight)
                     ));
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("Appearance"),
             new BoolOption (
                     "use-tooltips",
                     _("Show tooltips if mouse hovers over a control"),
@@ -3509,9 +3526,9 @@ RCOptionEditor::RCOptionEditor ()
                        _("<b>When enabled</b> clock displays are updated every Timecode Frame (fps).\n\n"
                                "<b>When disabled</b> clock displays are updated only every 100ms."
                         ));
-       add_option (S_("Preferences|GUI"), bo);
+       add_option (_("Appearance"), bo);
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("Appearance"),
                        new BoolOption (
                                "blink-rec-arm",
                                _("Blink Rec-Arm buttons"),
@@ -3522,41 +3539,10 @@ RCOptionEditor::RCOptionEditor ()
 
 #ifndef __APPLE__
        /* font scaling does nothing with GDK/Quartz */
-       add_option (S_("Preferences|GUI"), new FontScalingOptions ());
+       add_option (_("Appearance"), new FontScalingOptions ());
 #endif
-
-       /* Image cache size */
-
-       HSliderOption *sics = new HSliderOption ("waveform-cache-size",
-                       _("Waveform image cache size (megabytes)"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size),
-                       1, 1024, 10 /* 1 MB to 1GB in steps of 10MB */
-                       );
-       sics->scale().set_digits (0);
-       Gtkmm2ext::UI::instance()->set_tip (
-                       sics->tip_widget(),
-                _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
-       add_option (S_("Preferences|GUI"), sics);
-
-       if (!ARDOUR::Profile->get_mixbus()) {
-               /* Lock GUI timeout */
-
-               HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
-                               _("Lock timeout (seconds)"),
-                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
-                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds),
-                               0, 1000, 1, 10
-                               );
-               slts->scale().set_digits (0);
-               Gtkmm2ext::UI::instance()->set_tip (
-                               slts->tip_widget(),
-                               _("Lock GUI after this many idle seconds (zero to never lock)"));
-               add_option (S_("Preferences|GUI"), slts);
-       } // !mixbus
-
-       add_option (_("GUI/Editor"), new OptionEditorHeading (_("General")));
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("General")));
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "show-name-highlight",
                     _("Use name highlight bars in region displays (requires a restart)"),
@@ -3564,7 +3550,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
                     ));
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
                        new BoolOption (
                        "color-regions-using-track-color",
                        _("Region color follows track color"),
@@ -3572,10 +3558,10 @@ RCOptionEditor::RCOptionEditor ()
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color)
                        ));
 
-       add_option (_("GUI/Editor"), new OptionEditorHeading (_("Waveforms")));
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("Waveforms")));
 
        if (!Profile->get_mixbus()) {
-               add_option (_("GUI/Editor"),
+               add_option (_("Appearance/Editor"),
                                new BoolOption (
                                        "show-waveforms",
                                        _("Show waveforms in regions"),
@@ -3584,7 +3570,7 @@ RCOptionEditor::RCOptionEditor ()
                                        ));
        }  // !mixbus
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "show-waveforms-while-recording",
                     _("Show waveforms while recording"),
@@ -3592,7 +3578,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms_while_recording)
                     ));
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
                        new BoolOption (
                        "show-waveform-clipping",
                        _("Show waveform clipping"),
@@ -3600,7 +3586,7 @@ RCOptionEditor::RCOptionEditor ()
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
                        ));
 
-       add_option (_("GUI/Editor"), new ClipLevelOptions ());
+       add_option (_("Appearance/Editor"), new ClipLevelOptions ());
 
        ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
                "waveform-scale",
@@ -3612,7 +3598,7 @@ RCOptionEditor::RCOptionEditor ()
        wfs->add (Linear, _("linear"));
        wfs->add (Logarithmic, _("logarithmic"));
 
-       add_option (_("GUI/Editor"), wfs);
+       add_option (_("Appearance/Editor"), wfs);
 
        ComboOption<WaveformShape>* wfsh = new ComboOption<WaveformShape> (
                "waveform-shape",
@@ -3624,11 +3610,11 @@ RCOptionEditor::RCOptionEditor ()
        wfsh->add (Traditional, _("traditional"));
        wfsh->add (Rectified, _("rectified"));
 
-       add_option (_("GUI/Editor"), wfsh);
+       add_option (_("Appearance/Editor"), wfsh);
 
-       add_option (_("GUI/Editor"), new OptionEditorHeading (_("Editor Meters")));
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("Editor Meters")));
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "show-track-meters",
                     _("Show meters in track headers"),
@@ -3636,7 +3622,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
                     ));
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "editor-stereo-only-meters",
                     _("Limit track header meters to stereo"),
@@ -3644,7 +3630,25 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_editor_stereo_only_meters)
                     ));
 
-       add_option (_("GUI/Editor"), new OptionEditorBlank ());
+       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
           for the actual widgets being controlled.
@@ -3657,7 +3661,7 @@ RCOptionEditor::RCOptionEditor ()
        _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
        _mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns"));
 
-       add_option (_("GUI/Mixer"),
+       add_option (_("Appearance/Mixer"),
                new VisibilityOption (
                        _("Mixer Strip"),
                        &_mixer_strip_visibility,
@@ -3666,7 +3670,7 @@ RCOptionEditor::RCOptionEditor ()
                        )
                );
 
-       add_option (_("GUI/Mixer"),
+       add_option (_("Appearance/Mixer"),
             new BoolOption (
                     "default-narrow_ms",
                     _("Use narrow strips in the mixer by default"),
@@ -3674,11 +3678,11 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
                     ));
 
-       add_option (_("GUI/Mixer"), new OptionEditorBlank ());
+       add_option (_("Appearance/Mixer"), new OptionEditorBlank ());
 
-       add_option (_("GUI/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
+       add_option (_("Appearance/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-toolbar-selclock",
                     _("Display Selection Clock"),
@@ -3687,7 +3691,7 @@ RCOptionEditor::RCOptionEditor ()
                     ));
 
        if (!ARDOUR::Profile->get_small_screen()) {
-               add_option (_("GUI/Toolbar"),
+               add_option (_("Appearance/Toolbar"),
                                new BoolOption (
                                        "show-secondary-clock",
                                        _("Display Secondary Clock"),
@@ -3696,7 +3700,7 @@ RCOptionEditor::RCOptionEditor ()
                                        ));
        }
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-mini-timeline",
                     _("Display Navigation Timeline"),
@@ -3704,7 +3708,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_mini_timeline)
                     ));
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-editor-meter",
                     _("Display Master Level Meter"),
@@ -3712,32 +3716,36 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_editor_meter)
                     ));
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
                        new ColumVisibilityOption (
                                "action-table-columns", _("Lua Action Script Button Visibility"), 4,
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_action_table_columns),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_action_table_columns)
                                )
                        );
-       add_option (_("GUI/Toolbar"), new OptionEditorBlank ());
+       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));
+       quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary\n\
+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));
 
        /* and now the theme manager */
 
-       add_option (_("GUI/Theme"), new OptionEditorHeading (_("Theme")));
+       add_option (_("Appearance/Theme"), new OptionEditorHeading (_("Theme")));
 
-       add_option (_("GUI/Theme"), new BoolOption (
+       add_option (_("Appearance/Theme"), new BoolOption (
                                "flat-buttons",
                                _("Draw \"flat\" buttons"),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_flat_buttons),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_flat_buttons)
                                ));
 
-       add_option (_("GUI/Theme"), new BoolOption (
+       add_option (_("Appearance/Theme"), new BoolOption (
                                "meter-style-led",
                                _("LED meter style"),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_style_led),
@@ -3753,7 +3761,7 @@ RCOptionEditor::RCOptionEditor ()
                        0, 1.0, 0.05
                        );
        gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED);
-       add_option (_("GUI/Theme"), gui_hs);
+       add_option (_("Appearance/Theme"), gui_hs);
 
        gui_hs = new HSliderOption(
                        "timeline-item-gradient-depth",
@@ -3763,7 +3771,7 @@ RCOptionEditor::RCOptionEditor ()
                        0, 1.0, 0.05
                        );
        gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED);
-       add_option (_("GUI/Theme"), gui_hs);
+       add_option (_("Appearance/Theme"), gui_hs);
 
        vector<string> icon_sets = ::get_icon_sets ();
        if (icon_sets.size() > 1) {
@@ -3775,24 +3783,26 @@ RCOptionEditor::RCOptionEditor ()
                for (vector<string>::const_iterator i = icon_sets.begin (); i != icon_sets.end (); ++i) {
                        io->add (*i, *i);
                }
-               add_option (_("GUI/Theme"), io);
+               add_option (_("Appearance/Theme"), io);
        }
 
-       add_option (_("GUI/Colors"), new OptionEditorHeading (_("Colors")));
-       add_option (_("GUI/Colors"), new ColorThemeManager);
-       add_option (_("GUI/Colors"), new OptionEditorBlank ());
+       add_option (_("Appearance/Colors"), new OptionEditorHeading (_("Colors")));
+       add_option (_("Appearance/Colors"), new ColorThemeManager);
+       add_option (_("Appearance/Colors"), new OptionEditorBlank ());
 
        /* Quirks */
 
-       add_option (_("GUI/Quirks"), quirks_head);
+       add_option (_("Appearance/Quirks"), quirks_head);
 
-       add_option (_("GUI/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 +3813,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 (_("GUI/Quirks"), bo);
+       add_option (_("Appearance/Quirks"), bo);
 
        bo = new BoolOption (
                        "transients-follow-front",
@@ -3813,7 +3823,7 @@ RCOptionEditor::RCOptionEditor ()
                        );
        Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
                                _("Make transient windows follow the front window when toggling between the editor and mixer."));
-       add_option (_("GUI/Quirks"), bo);
+       add_option (_("Appearance/Quirks"), bo);
 #endif
 
        if (!Profile->get_mixbus()) {
@@ -3825,10 +3835,10 @@ RCOptionEditor::RCOptionEditor ()
                                );
                Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
                                        _("When detaching the monitoring section, mark it as \"Utility\" window to stay in front."));
-               add_option (_("GUI/Quirks"), bo);
+               add_option (_("Appearance/Quirks"), bo);
        }
 
-       add_option (_("GUI/Quirks"), new OptionEditorBlank ());
+       add_option (_("Appearance/Quirks"), new OptionEditorBlank ());
 
        /* VIDEO Timeline */
        add_option (_("Video"), new OptionEditorHeading (_("Video Server")));
@@ -3981,6 +3991,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;