X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=ec3dd466f431bb9f65b20c7f0669cffb08fba75d;hb=430b2c44d15e20015d8cab53904cc7684371d407;hp=31cbba521b9211886cebec0ec19c6bed8b979c40;hpb=c8921ea277ad6321ed4c699e5106fc53fbcdad71;p=ardour.git diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 31cbba521b..ec3dd466f4 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -38,6 +38,8 @@ #include "ardour/control_protocol_manager.h" #include "control_protocol/control_protocol.h" +#include "ardour_window.h" +#include "ardour_dialog.h" #include "gui_thread.h" #include "midi_tracer.h" #include "rc_option_editor.h" @@ -56,7 +58,7 @@ using namespace ARDOUR; class ClickOptions : public OptionEditorBox { public: - ClickOptions (RCConfiguration* c, ArdourDialog* p) + ClickOptions (RCConfiguration* c, Gtk::Window* p) : _rc_config (c), _parent (p) { @@ -149,7 +151,7 @@ private: } RCConfiguration* _rc_config; - ArdourDialog* _parent; + Gtk::Window* _parent; Entry _click_path_entry; Entry _click_emphasis_path_entry; }; @@ -259,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 }, @@ -269,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 }, @@ -300,7 +302,7 @@ public: vector 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); @@ -308,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; } } @@ -338,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; } } @@ -366,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; } } @@ -394,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; } } @@ -657,7 +659,7 @@ private: class ControlSurfacesOptions : public OptionEditorBox { public: - ControlSurfacesOptions (ArdourDialog& parent) + ControlSurfacesOptions (Gtk::Window& parent) : _parent (parent) { _store = ListStore::create (_model); @@ -754,8 +756,8 @@ private: Box* box = (Box*) cpi->protocol->get_gui (); if (box) { string title = row[_model.name]; - ArdourDialog* win = new ArdourDialog (_parent, title); - win->get_vbox()->pack_start (*box, false, false); + ArdourWindow* win = new ArdourWindow (_parent, title); + win->add (*box); box->show (); win->present (); row[_model.editor] = win; @@ -878,7 +880,7 @@ RCOptionEditor::RCOptionEditor () 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)); @@ -1107,6 +1109,14 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering) )); + add_option (_("Editor"), + new BoolOption ( + "link-editor-and-mixer-selection", + _("Synchronise editor and mixer selection"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_editor_and_mixer_selection), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_editor_and_mixer_selection) + )); + add_option (_("Editor"), new BoolOption ( "name-new-markers", @@ -1468,6 +1478,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"))); @@ -1493,9 +1519,17 @@ RCOptionEditor::RCOptionEditor () /* INTERFACE */ + add_option (S_("Visual|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)); + add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config)); #endif /* The names of these controls must be the same as those given in MixerStrip @@ -1509,7 +1543,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, @@ -1518,7 +1552,7 @@ RCOptionEditor::RCOptionEditor () ) ); - add_option (_("Interface"), + add_option (S_("Visual|Interface"), new BoolOption ( "default-narrow_ms", _("Use narrow mixer strips by default"), @@ -1526,7 +1560,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* mht = new ComboOption ( "meter-hold", @@ -1540,7 +1574,7 @@ RCOptionEditor::RCOptionEditor () mht->add (MeterHoldMedium, _("medium")); mht->add (MeterHoldLong, _("long")); - add_option (_("Interface"), mht); + add_option (S_("Visual|Interface"), mht); ComboOption* mfo = new ComboOption ( "meter-falloff", @@ -1557,7 +1591,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