re-group preferences part one of 27 (probably)

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index f0b7be48293db706eabb0dc0b33e53fcdf7a1c8f..757663b327d7446974f0c7f1a61ec5c256cc171e 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -3338,14 +3338,6 @@ if (!ARDOUR::Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_tooltips)
                     ));
 
-       add_option (S_("Preferences|GUI"),
-            new BoolOption (
-                    "show-name-highlight",
-                    _("Use name highlight bars in region displays (requires a restart)"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_name_highlight),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
-                    ));
-
        add_option (S_("Preferences|GUI"),
                    new BoolOption (
                            "super-rapid-clock-update",
@@ -3354,6 +3346,15 @@ if (!ARDOUR::Profile->get_mixbus()) {
                            sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_super_rapid_clock_update)
                            ));
 
+       add_option (S_("Preferences|GUI"),
+                       new BoolOption (
+                               "blink-rec-arm",
+                               _("Blink Rec-Arm buttons"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_rec_arm),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm)
+                               ));
+
+
 #ifndef __APPLE__
        /* font scaling does nothing with GDK/Quartz */
        add_option (S_("Preferences|GUI"), new FontScalingOptions ());
@@ -3389,6 +3390,33 @@ if (!ARDOUR::Profile->get_mixbus()) {
        add_option (S_("Preferences|GUI"), slts);
 } // !mixbus
 
+       add_option (_("GUI/Editor"), new OptionEditorHeading (_("Editor UI Options")));
+       add_option (_("GUI/Editor"),
+            new BoolOption (
+                    "show-name-highlight",
+                    _("Use name highlight bars in region displays (requires a restart)"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_name_highlight),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
+                    ));
+
+       add_option (_("GUI/Editor"),
+                       new BoolOption (
+                       "color-regions-using-track-color",
+                       _("Color regions using their track's color"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_color_regions_using_track_color),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color)
+                       ));
+
+       add_option (_("GUI/Editor"),
+                       new BoolOption (
+                       "show-waveform-clipping",
+                       _("Show waveform clipping"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveform_clipping),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
+                       ));
+
+       add_option (_("GUI/Editor"), new OptionEditorBlank ());
+
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
        */
@@ -3400,8 +3428,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
        _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
        _mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns"));
 
-       add_option (
-               S_("Preferences|GUI"),
+       add_option (_("GUI/Mixer"),
                new VisibilityOption (
                        _("Mixer Strip"),
                        &_mixer_strip_visibility,
@@ -3410,7 +3437,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
                        )
                );
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("GUI/Mixer"),
             new BoolOption (
                     "default-narrow_ms",
                     _("Use narrow strips in the mixer by default"),
@@ -3418,6 +3445,8 @@ if (!ARDOUR::Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
                     ));
 
+       add_option (_("GUI/Mixer"), new OptionEditorBlank ());
+
 #ifdef ENABLE_NLS
        OptionEditorHeading* i18n_head = new OptionEditorHeading (_("Internationalization"));
 

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index cc1ba628985b1fa16592327bee682eee7fbc83de..8c33627dc487e7e7b9c5d0734e58bbf9b43281ca 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -51,7 +51,6 @@ using namespace ARDOUR_UI_UTILS;
 
 ThemeManager::ThemeManager()
 {
-       Gtk::HBox* hbox;
        BoolOption* bo;
 
 #ifndef __APPLE__
@@ -95,33 +94,6 @@ ThemeManager::ThemeManager()
                                                "This requires a restart of %1 to take effect"), PROGRAM_NAME));
        }
 
-       bo = new BoolOption (
-                       "blink-rec-arm",
-                       _("Blink Rec-Arm buttons"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_rec_arm),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm)
-                       );
-       bo->add_to_page (this);
-       bo->set_state_from_config ();
-
-       bo = new BoolOption (
-                       "color-regions-using-track-color",
-                       _("Color regions using their track's color"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_color_regions_using_track_color),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color)
-                       );
-       bo->add_to_page (this);
-       bo->set_state_from_config ();
-
-       bo = new BoolOption (
-                       "show-waveform-clipping",
-                       _("Show waveform clipping"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveform_clipping),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
-                       );
-       bo->add_to_page (this);
-       bo->set_state_from_config ();
-
        bo = new BoolOption (
                        "flat-buttons",
                        _("Draw \"flat\" buttons"),