Fix yet another oversight for the windows icon file update

[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 d724e208f5a9265623baa9afb41970231b8b6fcb..b2f65fdc2e9a17a1d590106c4b7ba286419e50fe 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")
 {
@@ -2657,7 +2661,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)
                                );
@@ -2890,6 +2894,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"),
@@ -2910,7 +2932,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)
                );
@@ -2927,7 +2949,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)
                );
@@ -2936,19 +2958,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"),
@@ -3690,7 +3699,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 +3768,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 +3826,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 (
@@ -3973,6 +3982,13 @@ 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) {
+                       plugin_scan_refresh ();
+               }
        }
        delete pd;
 }
@@ -3987,6 +4003,12 @@ 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) {
+                       plugin_scan_refresh ();
+               }
        }
        delete pd;
 }