Add some explanatory text to the Quirks settings

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 78cbb5767c3d836b3642abd2f1c758d395c854cb..7d5683da587ad4985916064bd00b721b0895814a 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2601,7 +2601,7 @@ RCOptionEditor::RCOptionEditor ()
                     );
        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 in case the transport is stopped."),
+                       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()) {
@@ -3728,7 +3728,11 @@ RCOptionEditor::RCOptionEditor ()
 
        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 */
 
@@ -3790,13 +3794,15 @@ RCOptionEditor::RCOptionEditor ()
 
        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 (
@@ -3807,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 (_("Appearance/Quirks"), bo);
+       add_option (_("Appearance/Quirks"), bo);
 
        bo = new BoolOption (
                        "transients-follow-front",
@@ -3985,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;