refactor level-meter widget: 5x2 stops meter colors

[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 2a79772bb91a609656befc198bfdc64f3040bd99..da0e55c7a2e8f849bb6f8ad54b653375c74ce266 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -653,7 +653,7 @@ public:
        {
                _store = ListStore::create (_model);
                _view.set_model (_store);
-               _view.append_column (_("Name"), _model.name);
+               _view.append_column (_("Control Surface Protocol"), _model.name);
                _view.get_column(0)->set_resizable (true);
                _view.get_column(0)->set_expand (true);
                _view.append_column_editable (_("Enabled"), _model.enabled);
@@ -809,7 +809,6 @@ private:
         PBD::ScopedConnection protocol_status_connection;
 };
 
-#ifdef WITH_VIDEOTIMELINE
 class VideoTimelineOptions : public OptionEditorBox
 {
 public:
@@ -927,7 +926,6 @@ private:
        CheckButton _show_video_server_dialog_button;
        CheckButton _video_advanced_setup_button;
 };
-#endif
 
 /** A class which allows control of visibility of some editor components usign
  *  a VisibilityGroup.  The caller should pass in a `dummy' VisibilityGroup
@@ -1815,9 +1813,9 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("User interaction"), new KeyboardOptions);
 
-       add_option (_("User interaction"), new OptionEditorHeading (_("Control surfaces")));
+       /* Control Surfaces */
 
-       add_option (_("User interaction"), new ControlSurfacesOptions (*this));
+       add_option (_("Control Surfaces"), new ControlSurfacesOptions (*this));
 
        ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
                "remote-model",
@@ -1830,16 +1828,14 @@ RCOptionEditor::RCOptionEditor ()
        rm->add (MixerOrdered, _("follows order of mixer"));
        rm->add (EditorOrdered, _("follows order of editor"));
 
-       add_option (_("User interaction"), rm);
+       add_option (_("Control Surfaces"), rm);
 
-#ifdef WITH_VIDEOTIMELINE
        /* VIDEO Timeline */
        add_option (_("Video"), new VideoTimelineOptions (_rc_config));
-#endif
 
        /* INTERFACE */
 
-       add_option (S_("GUI"),
+       add_option (S_("Preferences|GUI"),
             new BoolOption (
                     "widget-prelight",
                     _("Graphically indicate mouse pointer hovering over various widgets"),
@@ -1847,7 +1843,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
                     ));
 
-       add_option (S_("GUI"),
+       add_option (S_("Preferences|GUI"),
             new BoolOption (
                     "use-tooltips",
                     _("Show tooltips if mouse hovers over a control"),
@@ -1857,15 +1853,8 @@ RCOptionEditor::RCOptionEditor ()
 
 #ifndef GTKOSX
        /* font scaling does nothing with GDK/Quartz */
-       add_option (S_("GUI"), new FontScalingOptions (_rc_config));
+       add_option (S_("Preferences|GUI"), new FontScalingOptions (_rc_config));
 #endif
-       add_option (S_("GUI"),
-                   new BoolOption (
-                           "use-own-plugin-gui",
-                           string_compose (_("Use plugins' own interfaces instead of %1's"), PROGRAM_NAME),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
-                           ));
 
        add_option (S_("GUI"),
                    new BoolOption (
@@ -1885,7 +1874,7 @@ RCOptionEditor::RCOptionEditor ()
        _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
        
        add_option (
-               S_("GUI"),
+               S_("Preferences|GUI"),
                new VisibilityOption (
                        _("Mixer Strip"),
                        &_mixer_strip_visibility,
@@ -1894,7 +1883,7 @@ RCOptionEditor::RCOptionEditor ()
                        )
                );
 
-       add_option (S_("GUI"),
+       add_option (S_("Preferences|GUI"),
             new BoolOption (
                     "default-narrow_ms",
                     _("Use narrow strips in the mixer by default"),
@@ -1902,7 +1891,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
                     ));
 
-       add_option (S_("GUI"), new OptionEditorHeading (_("Metering")));
+       add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Metering")));
 
        ComboOption<float>* mht = new ComboOption<float> (
                "meter-hold",
@@ -1916,7 +1905,7 @@ RCOptionEditor::RCOptionEditor ()
        mht->add (MeterHoldMedium, _("medium"));
        mht->add (MeterHoldLong, _("long"));
 
-       add_option (S_("GUI"), mht);
+       add_option (S_("Preferences|GUI"), mht);
 
        ComboOption<float>* mfo = new ComboOption<float> (
                "meter-falloff",
@@ -1933,7 +1922,7 @@ RCOptionEditor::RCOptionEditor ()
        mfo->add (METER_FALLOFF_FASTER, _("faster"));
        mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
 
-       add_option (S_("GUI"), mfo);
+       add_option (S_("Preferences|GUI"), mfo);
 }
 
 void