#include "canvas/wave_view.h"
+#include "ardour_ui.h"
#include "ardour_window.h"
#include "ardour_dialog.h"
#include "gui_thread.h"
using namespace Gtkmm2ext;
using namespace PBD;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
class ClickOptions : public OptionEditorBox
{
Gtkmm2ext::UI::instance()->set_tip (_discover_vst_on_start,
_("<b>When enabled</b> new VST plugins are searched, tested and added to the cache index on application start. When disabled new plugins will only be available after triggering a 'Scan' manually"));
-#ifdef WINDOWS_VST_SUPPORT
- t->attach (*manage (left_aligned_label (_("Windows VST Path:"))), 0, 1, n, n+1);
+#ifdef LXVST_SUPPORT
+ t->attach (*manage (left_aligned_label (_("Linux VST Path:"))), 0, 1, n, n+1);
b = manage (new Button (_("Edit")));
- b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_vst_path_clicked));
+ b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_lxvst_path_clicked));
t->attach (*b, 1, 2, n, n+1, FILL); ++n;
#endif
-#ifdef LXVST_SUPPORT
- t->attach (*manage (left_aligned_label (_("Linux VST:"))), 0, 1, n, n+1);
+#ifdef WINDOWS_VST_SUPPORT
+ t->attach (*manage (left_aligned_label (_("Windows VST Path:"))), 0, 1, n, n+1);
b = manage (new Button (_("Edit")));
- b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_lxvst_path_clicked));
+ b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_vst_path_clicked));
t->attach (*b, 1, 2, n, n+1, FILL); ++n;
#endif
RCOptionEditor::RCOptionEditor ()
: OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
, _rc_config (Config)
- , _mixer_strip_visibility ("mixer-strip-visibility")
+ , _mixer_strip_visibility ("mixer-element-visibility")
{
/* MISC */
PROGRAM_NAME));
add_option (_("Transport"), tsf);
+ tsf = new BoolOption (
+ "loop-is-mode",
+ _("Play loop is a transport mode"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_loop_is_mode),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_loop_is_mode)
+ );
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ (_("<b>When enabled</b> the loop button does not start playback but forces playback to always play the loop\n\n"
+ "<b>When disabled</b> the loop button starts playing the loop, but stop then cancels loop playback")));
+ add_option (_("Transport"), tsf);
+
tsf = new BoolOption (
"create-xrun-marker",
_("Create markers where xruns occur"),
_ltc_send_continuously = new BoolOption (
"ltc-send-continuously",
- _("send LTC while stopped"),
+ _("Send LTC while stopped"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_send_continuously),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_send_continuously)
);
/* EDITOR */
- add_option (_("Editor"),
+ add_option (S_("Editor"),
new BoolOption (
- "link-region-and-track-selection",
- _("Link selection of regions and tracks"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_region_and_track_selection),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_region_and_track_selection)
+ "draggable-playhead",
+ _("Allow dragging of playhead"),
+ sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_draggable_playhead),
+ sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_draggable_playhead)
));
add_option (_("Editor"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_editor_meter)
));
+ ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
+ "default-fade-shape",
+ _("Default fade shape"),
+ sigc::mem_fun (*_rc_config,
+ &RCConfiguration::get_default_fade_shape),
+ sigc::mem_fun (*_rc_config,
+ &RCConfiguration::set_default_fade_shape)
+ );
+
+ fadeshape->add (FadeLinear,
+ _("Linear (for highly correlated material)"));
+ fadeshape->add (FadeConstantPower, _("Constant power"));
+ fadeshape->add (FadeSymmetric, _("Symmetric"));
+ fadeshape->add (FadeSlow, _("Slow"));
+ fadeshape->add (FadeFast, _("Fast"));
+
+ add_option (_("Editor"), fadeshape);
+
+
bco = new BoolComboOption (
"use-overlap-equivalency",
_("Regions in active edit groups are edited together"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_tooltips)
));
+ add_option (S_("Preferences|GUI"),
+ new BoolOption (
+ "show-name-highlight",
+ _("Use name highlight bars in region displays"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_name_highlight),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_name_highlight)
+ ));
+
#ifndef GTKOSX
/* font scaling does nothing with GDK/Quartz */
add_option (S_("Preferences|GUI"), new FontScalingOptions (_rc_config));
add_option (S_("GUI"),
new BoolOption (
"super-rapid-clock-update",
- _("update transport clock display every 40ms instead of every 100ms"),
+ _("update transport clock display at FPS instead of every 100ms"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_super_rapid_clock_update),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_super_rapid_clock_update)
));
+ /* Lock GUI timeout */
+
+ Gtk::Adjustment *lts = manage (new Gtk::Adjustment(0, 0, 1000, 1, 10));
+ HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
+ _("Lock timeout (seconds)"),
+ lts,
+ sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_lock_gui_after_seconds),
+ sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_lock_gui_after_seconds)
+ );
+ slts->scale().set_digits (0);
+ Gtkmm2ext::UI::instance()->set_tip
+ (slts->tip_widget(),
+ _("Lock GUI after this many idle seconds (zero to never lock)"));
+ add_option (S_("Preferences|GUI"), slts);
+
/* 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_("Input"), _("Input"));
_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_("RecMon"), _("Record & Monitor"));
+ _mixer_strip_visibility.add (0, X_("SoloIsoLock"), _("Solo Iso / Lock"));
+ _mixer_strip_visibility.add (0, X_("Output"), _("Output"));
_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 (
S_("Preferences|GUI"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
));
- add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Metering")));
+ add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering")));
ComboOption<float>* mht = new ComboOption<float> (
"meter-hold",
mht->add (MeterHoldMedium, _("medium"));
mht->add (MeterHoldLong, _("long"));
- add_option (S_("Preferences|GUI"), mht);
+ add_option (S_("Preferences|Metering"), mht);
ComboOption<float>* mfo = new ComboOption<float> (
"meter-falloff",
mfo->add (METER_FALLOFF_FASTER, _("faster [46dB/sec]"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest [70dB/sec]"));
- add_option (S_("Preferences|GUI"), mfo);
+ add_option (S_("Preferences|Metering"), mfo);
ComboOption<MeterLineUp>* mlu = new ComboOption<MeterLineUp> (
"meter-line-up-level",
Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-marks and color-knee point for dBFS scale DPM, set reference level for IEC1/Nordic, IEC2 PPM and VU meter."));
- add_option (S_("Preferences|GUI"), mlu);
+ add_option (S_("Preferences|Metering"), mlu);
ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
"meter-line-up-din",
Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter."));
- add_option (S_("Preferences|GUI"), mld);
+ add_option (S_("Preferences|Metering"), mld);
ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
"meter-vu-standard",
mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)"));
mvu->add (MeteringVUeight, _("0VU = +8dBu"));
- add_option (S_("Preferences|GUI"), mvu);
+ add_option (S_("Preferences|Metering"), mvu);
Gtk::Adjustment *mpk = manage (new Gtk::Adjustment(0, -10, 0, .1, .1));
HSliderOption *mpks = new HSliderOption("meter-peak",
(mpks->tip_widget(),
_("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));
- add_option (S_("Preferences|GUI"), mpks);
+ add_option (S_("Preferences|Metering"), mpks);
- add_option (S_("Preferences|GUI"),
+ add_option (S_("Preferences|Metering"),
new BoolOption (
"meter-style-led",
_("LED meter style"),