NO-OP, re-arrange code

[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 95828f1b5988d9a988be9b6a8abaa5104a118be1..e365c5dab25d30002de57d5f4b3522d1ee777683 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1462,7 +1462,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 ();
@@ -2114,7 +2114,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")
 {
@@ -3690,7 +3694,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)
                     ));
@@ -3759,14 +3763,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 (_("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 (_("Appearance/Theme"), new OptionEditorHeading (_("Theme")));
@@ -3825,6 +3821,14 @@ These settings will only take effect after %1 is restarted.\n\
 
        /* 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);
 
        bo = new BoolOption (