#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)
{
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));
}
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->set_title ("Control Protocol Options");
+ win->add (*box);
box->show ();
win->present ();
row[_model.editor] = win;
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));
sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
));
- add_option (_("Misc"), new OptionEditorHeading (_("Misc")));
+ add_option (_("Misc"), new OptionEditorHeading (_("Session Management")));
add_option (_("Misc"),
new BoolOption (
sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
));
+ add_option (_("Misc"),
+ new SpinOption<uint32_t> (
+ "max-recent-sessions",
+ _("Maximum number of recent sessions"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions),
+ 0, 1000, 1, 20
+ ));
+
add_option (_("Misc"), new OptionEditorHeading (_("Click")));
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)
+ ));
+
+ add_option (_("Misc"), new OptionEditorHeading (_("Automation")));
+
+ add_option (_("Misc"),
+ new SpinOption<double> (
+ "automation-thinning-factor",
+ _("Thinning factor (larger value => less data)"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_thinning_factor),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_thinning_factor),
+ 0, 1000, 1, 20
+ ));
+
/* TRANSPORT */
add_option (_("Transport"),
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"),
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",
}
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);
add_option (_("Audio"),
new BoolOption (
"plugins-stop-with-transport",
- _("Stop plugins when the transport is stopped"),
+ _("Silence plugins when the transport is stopped"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
));
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")));
/* 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
+ add_option (S_("Visual|Interface"),
+ new BoolOption (
+ "use-own-plugin-gui",
+ _("Use plugins' own interfaces instead of Ardour's"),
+ 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_("MeterPoint"), _("Meter Point"));
add_option (
- _("Interface"),
+ S_("Visual|Interface"),
new VisibilityOption (
_("Mixer Strip"),
&_mixer_strip_visibility,
)
);
- add_option (_("Interface"),
+ add_option (S_("Visual|Interface"),
new BoolOption (
"default-narrow_ms",
_("Use narrow mixer strips by default"),
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",
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",
mfo->add (METER_FALLOFF_FASTER, _("faster"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
- add_option (_("Interface"), mfo);
+ add_option (S_("Visual|Interface"), mfo);
}
void
projects / ardour.git / blobdiff