#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"
class ClickOptions : public OptionEditorBox
{
public:
- ClickOptions (RCConfiguration* c, ArdourDialog* p)
+ ClickOptions (RCConfiguration* c, Gtk::Window* p)
: _rc_config (c),
_parent (p)
{
}
RCConfiguration* _rc_config;
- ArdourDialog* _parent;
+ Gtk::Window* _parent;
Entry _click_path_entry;
Entry _click_emphasis_path_entry;
};
/* 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 },
{ "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 },
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);
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;
}
}
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;
}
}
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;
}
}
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;
}
}
class ControlSurfacesOptions : public OptionEditorBox
{
public:
- ControlSurfacesOptions (ArdourDialog& parent)
+ ControlSurfacesOptions (Gtk::Window& parent)
: _parent (parent)
{
_store = ListStore::create (_model);
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;
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 OptionEditorHeading (S_("Options|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",
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 (
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")));
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 (
+ "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",
+ _("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")));
sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
);
- add_option (_("Audio"), mm);
-
#ifndef __APPLE__
/* no JACK monitoring on CoreAudio */
if (AudioEngine::instance()->can_request_hardware_monitoring()) {
mm->add (SoftwareMonitoring, _("ardour"));
mm->add (ExternalMonitoring, _("audio hardware"));
+ add_option (_("Audio"), mm);
+
add_option (_("Audio"),
new BoolOption (
"tape-machine-mode",
}
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);
sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
));
- /* CONTROL SURFACES */
+ 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 (_("Control surfaces"), new ControlSurfacesOptions (*this));
+ add_option (_("User interaction"), new OptionEditorHeading (_("Keyboard")));
+
+ add_option (_("User interaction"), new KeyboardOptions);
+
+ add_option (_("User interaction"), new OptionEditorHeading (_("Control surfaces")));
+
+ add_option (_("User interaction"), new ControlSurfacesOptions (*this));
ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
"remote-model",
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 (_("Keyboard"), new KeyboardOptions);
+ 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)
+ ));
- /* INTERFACE */
+#ifndef GTKOSX
+ /* font scaling does nothing with GDK/Quartz */
+ 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 Ardour's basic 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.
_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"),
+ S_("Visual|Interface"),
new VisibilityOption (
_("Mixer Strip"),
&_mixer_strip_visibility,
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mixer_strip_visibility)
)
);
+
+ add_option (S_("Visual|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 (S_("Visual|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 (S_("Visual|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 (S_("Visual|Interface"), mfo);
}
void
projects / ardour.git / blobdiff