projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Expand just entry fields when the dialog is expanded
[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 a82bce636e9472310d01f22e05a3e5f96d5de10f..c5952f0b6487b45eb546f8d0ed469c80d30a34cd 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -80,7 +80,7 @@ public:
                b = manage (new Button (_("Browse...")));
                b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
                t->attach (*b, 2, 3, 1, 2, FILL);
-
+               
                _box->pack_start (*t, false, false);
 
                _click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));      
@@ -261,7 +261,7 @@ static const struct {
        /* Command = Meta
           Option/Alt = Mod1
        */
-       { "Shift", GDK_SHIFT_MASK },
+       { "Key|Shift", GDK_SHIFT_MASK },
        { "Command", GDK_META_MASK },
        { "Control", GDK_CONTROL_MASK },
        { "Option", GDK_MOD1_MASK },
@@ -271,7 +271,7 @@ static const struct {
        { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
 
 #else
-       { "Shift", GDK_SHIFT_MASK },
+       { "Key|Shift", GDK_SHIFT_MASK },
        { "Control", GDK_CONTROL_MASK },
        { "Alt (Mod1)", GDK_MOD1_MASK },
        { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
@@ -302,7 +302,7 @@ public:
 
                vector<string> dumb;
                for (int i = 0; modifiers[i].name; ++i) {
-                       dumb.push_back (_(modifiers[i].name));
+                       dumb.push_back (S_(modifiers[i].name));
                }
 
                set_popdown_strings (_edit_modifier_combo, dumb);
@@ -310,7 +310,7 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
-                               _edit_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
@@ -340,7 +340,7 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
-                               _delete_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
@@ -368,7 +368,7 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
-                               _insert_note_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
@@ -396,7 +396,7 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
-                               _snap_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
@@ -877,10 +877,12 @@ RCOptionEditor::RCOptionEditor ()
                         procs->add (i, string_compose (_("%1 processors"), i));
                 }
 
+               procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME));
+
                 add_option (_("Misc"), procs);
         }
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Undo")));
+       add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo")));
 
        add_option (_("Misc"), new UndoOptions (_rc_config));
 
@@ -921,6 +923,14 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Misc"), new ClickOptions (_rc_config, this));
 
+       add_option (_("Misc"),
+            new FaderOption (
+                    "click-gain",
+                    _("Click Gain Level"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
+                    ));
+
        /* TRANSPORT */
 
        add_option (_("Transport"),
@@ -1045,6 +1055,14 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms)
                     ));
 
+       add_option (_("Editor"),
+            new BoolOption (
+                    "show-region-gain-envelopes",
+                    _("Show gain envelopes in audio regions"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_region_gain),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_region_gain)
+                    ));
+
        ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
                "waveform-scale",
                _("Waveform scale"),
@@ -1478,6 +1496,22 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
                            ));
 
+       add_option (_("MIDI"),
+            new BoolOption (
+                    "never-display-periodic-midi",
+                    _("Never display periodic MIDI messages (MTC, MIDI Clock)"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_never_display_periodic_midi),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_never_display_periodic_midi)
+                    ));
+
+       add_option (_("MIDI"),
+            new BoolOption (
+                    "sound-midi-notes",
+                    _("Sound MIDI notes as they are selected"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_sound_midi_notes),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_sound_midi_notes)
+                    ));
+
        /* USER INTERACTION */
 
        add_option (_("User interaction"), new OptionEditorHeading (_("Keyboard")));
@@ -1503,9 +1537,9 @@ RCOptionEditor::RCOptionEditor ()
 
        /* INTERFACE */
 
-       add_option (_("Interface"),
+       add_option (S_("Visual|Interface"),
             new BoolOption (
-                    "widget_prelight",
+                    "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)
@@ -1513,8 +1547,15 @@ RCOptionEditor::RCOptionEditor ()
 
 #ifndef GTKOSX
        /* font scaling does nothing with GDK/Quartz */
-       add_option (_("Interface"), new FontScalingOptions (_rc_config));
+       add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config));
 #endif
+       add_option (S_("Visual|Interface"),
+                   new BoolOption (
+                           "use-own-plugin-gui",
+                           _("Use plugins' own interface instead of a builtin one"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
+                           ));
 
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
@@ -1527,7 +1568,7 @@ RCOptionEditor::RCOptionEditor ()
        _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
        
        add_option (
-               _("Interface"),
+               S_("Visual|Interface"),
                new VisibilityOption (
                        _("Mixer Strip"),
                        &_mixer_strip_visibility,
@@ -1536,7 +1577,7 @@ RCOptionEditor::RCOptionEditor ()
                        )
                );
 
-       add_option (_("Interface"),
+       add_option (S_("Visual|Interface"),
             new BoolOption (
                     "default-narrow_ms",
                     _("Use narrow mixer strips by default"),
@@ -1544,7 +1585,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
                     ));
 
-       add_option (_("Interface"), new OptionEditorHeading (_("Metering")));
+       add_option (S_("Visual|Interface"), new OptionEditorHeading (_("Metering")));
 
        ComboOption<float>* mht = new ComboOption<float> (
                "meter-hold",
@@ -1558,7 +1599,7 @@ RCOptionEditor::RCOptionEditor ()
        mht->add (MeterHoldMedium, _("medium"));
        mht->add (MeterHoldLong, _("long"));
 
-       add_option (_("Interface"), mht);
+       add_option (S_("Visual|Interface"), mht);
 
        ComboOption<float>* mfo = new ComboOption<float> (
                "meter-falloff",
@@ -1575,7 +1616,7 @@ RCOptionEditor::RCOptionEditor ()
        mfo->add (METER_FALLOFF_FASTER, _("faster"));
        mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
 
-       add_option (_("Interface"), mfo);
+       add_option (S_("Visual|Interface"), mfo);
 }
 
 void
Unnamed repository; edit this file 'description' to name the repository.