Fix warnings.
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index bf6fbaa05c94055ca0f1567ae8a8bf0f721b423d..5e7df484ea8d0ed49ed923def2be6860c3d29c83 100644 (file)
@@ -790,10 +790,69 @@ private:
         Gtk::Window& _parent;
 };
 
+/** A class which allows control of visibility of some editor components usign
+ *  a VisibilityGroup.  The caller should pass in a `dummy' VisibilityGroup
+ *  which has the correct members, but with null widget pointers.  This
+ *  class allows the user to set visibility of the members, the details
+ *  of which are stored in a configuration variable which can be watched
+ *  by parts of the editor that actually contain the widgets whose visibility
+ *  is being controlled.
+ */
+
+class VisibilityOption : public Option
+{
+public:
+       /** @param name User-visible name for this group.
+        *  @param g `Dummy' VisibilityGroup (as described above).
+        *  @param get Method to get the value of the appropriate configuration variable.
+        *  @param set Method to set the value of the appropriate configuration variable.
+        */
+       VisibilityOption (string name, VisibilityGroup* g, sigc::slot<string> get, sigc::slot<bool, string> set)
+               : Option (g->get_state_name(), name)
+               , _heading (name)
+               , _visibility_group (g)
+               , _get (get)
+               , _set (set)
+       {
+               /* Watch for changes made by the user to our members */
+               _visibility_group->VisibilityChanged.connect_same_thread (
+                       _visibility_group_connection, sigc::bind (&VisibilityOption::changed, this)
+                       );
+       }
+
+       void set_state_from_config ()
+       {
+               /* Set our state from the current configuration */
+               _visibility_group->set_state (_get ());
+       }
+
+       void add_to_page (OptionEditorPage* p)
+       {
+               _heading.add_to_page (p);
+               add_widget_to_page (p, _visibility_group->list_view ());
+       }
+
+private:
+       void changed ()
+       {
+               /* The user has changed something, so reflect this change
+                  in the RCConfiguration.
+               */
+               _set (_visibility_group->get_state_value ());
+       }
+       
+       OptionEditorHeading _heading;
+       VisibilityGroup* _visibility_group;
+       sigc::slot<std::string> _get;
+       sigc::slot<bool, std::string> _set;
+       PBD::ScopedConnection _visibility_group_connection;
+};
+
 
 RCOptionEditor::RCOptionEditor ()
        : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
         , _rc_config (Config)
+       , _mixer_strip_visibility ("mixer-strip-visibility")
 {
        /* MISC */
 
@@ -819,50 +878,10 @@ RCOptionEditor::RCOptionEditor ()
                 add_option (_("Misc"), procs);
         }
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Metering")));
-
-       ComboOption<float>* mht = new ComboOption<float> (
-               "meter-hold",
-               _("Meter hold time"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_hold),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_hold)
-               );
-
-       mht->add (MeterHoldOff, _("off"));
-       mht->add (MeterHoldShort, _("short"));
-       mht->add (MeterHoldMedium, _("medium"));
-       mht->add (MeterHoldLong, _("long"));
-
-       add_option (_("Misc"), mht);
-
-       ComboOption<float>* mfo = new ComboOption<float> (
-               "meter-falloff",
-               _("Meter fall-off"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
-               );
-
-       mfo->add (METER_FALLOFF_OFF, _("off"));
-       mfo->add (METER_FALLOFF_SLOWEST, _("slowest"));
-       mfo->add (METER_FALLOFF_SLOW, _("slow"));
-       mfo->add (METER_FALLOFF_MEDIUM, _("medium"));
-       mfo->add (METER_FALLOFF_FAST, _("fast"));
-       mfo->add (METER_FALLOFF_FASTER, _("faster"));
-       mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
-
-       add_option (_("Misc"), mfo);
-
        add_option (_("Misc"), new OptionEditorHeading (_("Undo")));
 
        add_option (_("Misc"), new UndoOptions (_rc_config));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Misc")));
-
-#ifndef GTKOSX
-       /* font scaling does nothing with GDK/Quartz */
-       add_option (_("Misc"), new FontScalingOptions (_rc_config));
-#endif
-
        add_option (_("Misc"),
             new BoolOption (
                     "verify-remove-last-capture",
@@ -879,13 +898,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
                     ));
 
-       add_option (_("Misc"),
-            new BoolOption (
-                    "sync-all-route-ordering",
-                    _("Synchronise editor and mixer track order"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_all_route_ordering),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering)
-                    ));
+       add_option (_("Misc"), new OptionEditorHeading (_("Misc")));
 
        add_option (_("Misc"),
             new BoolOption (
@@ -895,21 +908,12 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_only_copy_imported_files)
                     ));
 
-       add_option (_("Misc"),
-            new BoolOption (
-                    "default-narrow_ms",
-                    _("Use narrow mixer strips"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
-                    ));
-
-       add_option (_("Misc"),
-            new BoolOption (
-                    "name-new-markers",
-                    _("Name new markers"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
-                    ));
+       add_option (_("Misc"), new DirectoryOption (
+                           X_("default-session-parent-dir"),
+                           _("Default folder for new sessions:"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
+                           ));
 
        add_option (_("Misc"), new OptionEditorHeading (_("Click")));
 
@@ -1087,6 +1091,30 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_color_regions_using_track_color)
                            ));
 
+       add_option (_("Editor"),
+                   new BoolOption (
+                           "update-editor-during-summary-drag",
+                           _("Update editor window during drags of the summary"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_update_editor_during_summary_drag),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_update_editor_during_summary_drag)
+                           ));
+
+       add_option (_("Editor"),
+            new BoolOption (
+                    "sync-all-route-ordering",
+                    _("Synchronise editor and mixer track order"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_all_route_ordering),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering)
+                    ));
+
+       add_option (_("Editor"),
+            new BoolOption (
+                    "name-new-markers",
+                    _("Name new markers"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
+                    ));
+
        /* AUDIO */
 
        add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
@@ -1121,30 +1149,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Audio"), mm);
 
-       ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
-               "pfl-position",
-               _("PFL signals come from"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position)
-               );
-
-       pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
-       pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
-
-       add_option (_("Audio"), pp);
-
-       ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
-               "afl-position",
-               _("AFL signals come from"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position)
-               );
-
-       pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors"));
-       pa->add (AFLFromAfterProcessors, _("after post-fader processors"));
-
-       add_option (_("Audio"), pa);
-
        add_option (_("Audio"),
             new BoolOption (
                     "tape-machine-mode",
@@ -1218,7 +1222,7 @@ RCOptionEditor::RCOptionEditor ()
        }
 
        if (fpu.has_flush_to_zero() && fpu.has_denormals_are_zero()) {
-               dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZerO"));
+               dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZero"));
        }
 
        add_option (_("Audio"), dm);
@@ -1291,11 +1295,35 @@ RCOptionEditor::RCOptionEditor ()
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position)
                );
 
-       _listen_position->add (AfterFaderListen, _("after-fader listen"));
-       _listen_position->add (PreFaderListen, _("pre-fader listen"));
+       _listen_position->add (AfterFaderListen, _("after-fader (AFL)"));
+       _listen_position->add (PreFaderListen, _("pre-fader (PFL)"));
 
        add_option (_("Solo / mute"), _listen_position);
 
+       ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
+               "pfl-position",
+               _("PFL signals come from"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position)
+               );
+
+       pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
+       pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
+
+       add_option (_("Solo / mute"), pp);
+
+       ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
+               "afl-position",
+               _("AFL signals come from"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position)
+               );
+
+       pa->add (AFLFromBeforeProcessors, _("immediately post-fader"));
+       pa->add (AFLFromAfterProcessors, _("after post-fader processors (before pan)"));
+
+       add_option (_("Solo / mute"), pa);
+
        parameter_changed ("use-monitor-bus");
 
        add_option (_("Solo / mute"),
@@ -1440,9 +1468,15 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
                            ));
 
-       /* CONTROL SURFACES */
+       /* USER INTERACTION */
+
+       add_option (_("User interaction"), new OptionEditorHeading (_("Keyboard")));
+
+       add_option (_("User interaction"), new KeyboardOptions);
+
+       add_option (_("User interaction"), new OptionEditorHeading (_("Control surfaces")));
 
-       add_option (_("Control surfaces"), new ControlSurfacesOptions (*this));
+       add_option (_("User interaction"), new ControlSurfacesOptions (*this));
 
        ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
                "remote-model",
@@ -1455,11 +1489,83 @@ RCOptionEditor::RCOptionEditor ()
        rm->add (MixerOrdered, _("follows order of mixer"));
        rm->add (EditorOrdered, _("follows order of editor"));
 
-       add_option (_("Control surfaces"), rm);
+       add_option (_("User interaction"), rm);
 
-       /* KEYBOARD */
+       /* INTERFACE */
+
+       add_option (_("Interface"),
+            new BoolOption (
+                    "widget_prelight",
+                    _("Graphically indicate mouse pointer hovering over various widgets"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_widget_prelight),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
+                    ));
+
+#ifndef GTKOSX
+       /* font scaling does nothing with GDK/Quartz */
+       add_option (_("Interface"), new FontScalingOptions (_rc_config));
+#endif
+
+       /* The names of these controls must be the same as those given in MixerStrip
+          for the actual widgets being controlled.
+       */
+       _mixer_strip_visibility.add (0, X_("PhaseInvert"), _("Phase Invert"));
+       _mixer_strip_visibility.add (0, X_("SoloSafe"), _("Solo Safe"));
+       _mixer_strip_visibility.add (0, X_("SoloIsolated"), _("Solo Isolated"));
+       _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
+       _mixer_strip_visibility.add (0, X_("Group"), _("Group"));
+       _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
+       
+       add_option (
+               _("Interface"),
+               new VisibilityOption (
+                       _("Mixer Strip"),
+                       &_mixer_strip_visibility,
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_mixer_strip_visibility),
+                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_mixer_strip_visibility)
+                       )
+               );
+
+       add_option (_("Interface"),
+            new BoolOption (
+                    "default-narrow_ms",
+                    _("Use narrow mixer strips by default"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
+                    ));
+
+       add_option (_("Interface"), new OptionEditorHeading (_("Metering")));
+
+       ComboOption<float>* mht = new ComboOption<float> (
+               "meter-hold",
+               _("Meter hold time"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_hold),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_hold)
+               );
+
+       mht->add (MeterHoldOff, _("off"));
+       mht->add (MeterHoldShort, _("short"));
+       mht->add (MeterHoldMedium, _("medium"));
+       mht->add (MeterHoldLong, _("long"));
+
+       add_option (_("Interface"), mht);
+
+       ComboOption<float>* mfo = new ComboOption<float> (
+               "meter-falloff",
+               _("Meter fall-off"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
+               );
+
+       mfo->add (METER_FALLOFF_OFF, _("off"));
+       mfo->add (METER_FALLOFF_SLOWEST, _("slowest"));
+       mfo->add (METER_FALLOFF_SLOW, _("slow"));
+       mfo->add (METER_FALLOFF_MEDIUM, _("medium"));
+       mfo->add (METER_FALLOFF_FAST, _("fast"));
+       mfo->add (METER_FALLOFF_FASTER, _("faster"));
+       mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
 
-       add_option (_("Keyboard"), new KeyboardOptions);
+       add_option (_("Interface"), mfo);
 }
 
 void