#include <gtkmm/stock.h>
#include <gtkmm/scale.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/paths_dialog.h>
-#include <gtkmm2ext/window_title.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/window_title.h"
#include "pbd/fpu.h"
#include "pbd/cpus.h"
#include "ardour/plugin_manager.h"
#include "control_protocol/control_protocol.h"
-#include "canvas/wave_view.h"
+#include "waveview/wave_view.h"
+
+#include "widgets/paths_dialog.h"
+#include "widgets/tooltips.h"
#include "ardour_dialog.h"
#include "ardour_ui.h"
#include "midi_tracer.h"
#include "rc_option_editor.h"
#include "sfdb_ui.h"
-#include "tooltips.h"
#include "ui_config.h"
#include "utils.h"
using namespace PBD;
using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
class ClickOptions : public OptionEditorMiniPage
{
{
// TODO get rid of GTK -> use OptionEditor Widgets
Table* t = &table;
+ Label* l;
+ int row = 0;
- Label* l = manage (left_aligned_label (_("Emphasis on first beat")));
+ l = manage (left_aligned_label (_("Emphasis on first beat")));
_use_emphasis_on_click_check_button.add (*l);
- t->attach (_use_emphasis_on_click_check_button, 1, 3, 0, 1, FILL);
+ t->attach (_use_emphasis_on_click_check_button, 1, 3, row, row + 1, FILL);
_use_emphasis_on_click_check_button.signal_toggled().connect (
sigc::mem_fun (*this, &ClickOptions::use_emphasis_on_click_toggled));
+ ++row;
l = manage (left_aligned_label (_("Use built-in default sounds")));
_use_default_click_check_button.add (*l);
- t->attach (_use_default_click_check_button, 1, 3, 1, 2, FILL);
+ t->attach (_use_default_click_check_button, 1, 3, row, row + 1, FILL);
_use_default_click_check_button.signal_toggled().connect (
sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
+ ++row;
l = manage (left_aligned_label (_("Audio file:")));
- t->attach (*l, 1, 2, 2, 3, FILL);
- t->attach (_click_path_entry, 2, 3, 2, 3, FILL);
+ t->attach (*l, 1, 2, row, row + 1, FILL);
+ t->attach (_click_path_entry, 2, 3, row, row + 1, FILL);
_click_browse_button.signal_clicked ().connect (
sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
- t->attach (_click_browse_button, 3, 4, 2, 3, FILL);
+ t->attach (_click_browse_button, 3, 4, row, row + 1, FILL);
+ ++row;
l = manage (left_aligned_label (_("Emphasis audio file:")));
- t->attach (*l, 1, 2, 3, 4, FILL);
- t->attach (_click_emphasis_path_entry, 2, 3, 3, 4, FILL);
+ t->attach (*l, 1, 2, row, row + 1, FILL);
+ t->attach (_click_emphasis_path_entry, 2, 3, row, row + 1, FILL);
_click_emphasis_browse_button.signal_clicked ().connect (
sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
- t->attach (_click_emphasis_browse_button, 3, 4, 3, 4, FILL);
+ t->attach (_click_emphasis_browse_button, 3, 4, row, row + 1, FILL);
+ ++row;
_click_fader = new FaderOption (
"click-gain",
{
public:
VstTimeOutSliderOption (RCConfiguration* c)
- : HSliderOption ("vst-scan-timeout", _("Scan Time Out"),
+ : HSliderOption ("vst-scan-timeout", _("Scan Timeout"),
sigc::mem_fun (*c, &RCConfiguration::get_vst_scan_timeout),
sigc::mem_fun (*c, &RCConfiguration::set_vst_scan_timeout),
0, 3000, 50, 50)
{
UIConfiguration::instance().set_waveform_clip_level (_clip_level_adjustment.get_value());
/* XXX: should be triggered from the parameter changed signal */
- ArdourCanvas::WaveView::set_clip_level (_clip_level_adjustment.get_value());
+ ArdourWaveView::WaveView::set_clip_level (_clip_level_adjustment.get_value());
}
Adjustment _clip_level_adjustment;
if (!(*i)->mandatory) {
TreeModel::Row r = *_store->append ();
r[_model.name] = (*i)->name;
- r[_model.enabled] = ((*i)->protocol || (*i)->requested);
+ r[_model.enabled] = 0 != (*i)->protocol;
r[_model.protocol_info] = *i;
}
}
if ((*x)[_model.protocol_info] == cpi) {
_ignore_view_change++;
- (*x)[_model.enabled] = (cpi->protocol || cpi->requested);
+ (*x)[_model.enabled] = 0 != cpi->protocol;
_ignore_view_change--;
+ selection_changed (); // update sensitivity
break;
}
}
t->attach (_video_advanced_setup_button, 1, 4, n, n + 1, FILL);
_video_advanced_setup_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::video_advanced_setup_toggled));
Gtkmm2ext::UI::instance()->set_tip (_video_advanced_setup_button,
- _("<b>When enabled</b> you can speficify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
+ _("<b>When enabled</b> you can specify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
++n;
Label* l = manage (new Label (_("Video Server URL:")));
t->attach (*l, 1, 2, n, n + 1, FILL);
t->attach (_video_server_docroot_entry, 2, 4, n, n + 1);
Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
- _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+ _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
++n;
l = manage (new Label (""));
add_option (_("General"),
new BoolOption (
"try-autostart-engine",
- _("Try to auto-launch audio/midi engine"),
+ _("Try to auto-launch audio/MIDI engine"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_try_autostart_engine),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_try_autostart_engine)
));
add_option (_("General/Translation"), bo);
- _l10n = new ComboOption<ARDOUR::LocaleMode> (
- "locale-mode",
- _("Localization"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_locale_mode),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_locale_mode)
- );
-
- _l10n->add (ARDOUR::SET_LC_ALL, _("Set complete locale"));
- _l10n->add (ARDOUR::SET_LC_MESSAGES, _("Enable only message translation"));
- _l10n->add (ARDOUR::SET_LC_MESSAGES_AND_LC_NUMERIC, _("Translate messages and format numeric format"));
- _l10n->set_note (_("This setting is provided for plugin compatibility. e.g. some plugins on some systems expect the decimal point to be a dot."));
-
- add_option (_("General/Translation"), _l10n);
parameter_changed ("enable-translation");
#endif // ENABLE_NLS
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
));
+ ComboOption<float>* dps = new ComboOption<float> (
+ "draggable-playhead-speed",
+ _("Playhead dragging speed (%)"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_draggable_playhead_speed),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead_speed)
+ );
+ dps->add (0.05, _("5%"));
+ dps->add (0.1, _("10%"));
+ dps->add (0.25, _("25%"));
+ dps->add (0.5, _("50%"));
+ dps->add (1.0, _("100%"));
+ add_option (_("Editor"), dps);
+
+ ComboOption<float>* eet = new ComboOption<float> (
+ "extra-ui-extents-time",
+ _("Limit zooming & summary view to X minutes beyond session extents"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_extra_ui_extents_time),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_extra_ui_extents_time)
+ );
+ eet->add (1, _("1 minute"));
+ eet->add (2, _("2 minutes"));
+ eet->add (20, _("20 minutes"));
+ eet->add (60, _("1 hour"));
+ eet->add (60*2, _("2 hours"));
+ eet->add (60*24, _("24 hours"));
+ add_option (_("Editor"), eet);
+
if (!Profile->get_mixbus()) {
add_option (_("Editor"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
));
+ bo = new BoolOption (
+ "new-automation-points-on-lane",
+ _("Ignore Y-axis click position when adding new automation-points"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_new_automation_points_on_lane),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_new_automation_points_on_lane)
+ );
+ add_option (_("Editor"), bo);
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ _("<b>When enabled</b> The new points drawn in any automation lane will be placed on the existing line, regardless of mouse y-axis position."));
+
ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
"default-fade-shape",
_("Default fade shape"),
bo = new BoolOption (
"strict-io",
- _("Use 'Strict-I/O' for new tracks or Busses"),
+ _("Use 'Strict-I/O' for new tracks or busses"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_strict_io),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_strict_io)
);
add_option (_("Metronome"), new OptionEditorHeading (_("Metronome")));
add_option (_("Metronome"), new ClickOptions (_rc_config));
+ add_option (_("Metronome"), new OptionEditorHeading (_("Options")));
+
+ bo = new BoolOption (
+ "click-record-only",
+ _("Enable metronome only while recording"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_record_only),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_record_only)
+ );
+
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ string_compose (_("<b>When enabled</b> the metronome will remain silent if %1 is <b>not recording</b>."), PROGRAM_NAME));
+ add_option (_("Metronome"), bo);
+ add_option (_("Metronome"), new OptionEditorBlank ());
+
/* Meters */
ComboOption<MeterType>* mtb = new ComboOption<MeterType> (
"meter-type-bus",
- _("Default Meter Type for Busses"),
+ _("Default meter type for busses"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_bus),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_bus)
);
ComboOption<MeterType>* mtt = new ComboOption<MeterType> (
"meter-type-track",
- _("Default Meter Type for Tracks"),
+ _("Default meter type for tracks"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_track),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_track)
);
sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
- _("<b>When enabled</b> rhis will reduce the unpleasant increase in perceived volume "
+ _("<b>When enabled</b> this will reduce the unpleasant increase in perceived volume "
"that occurs when fast-forwarding or rewinding through some kinds of audio"));
add_option (_("Transport"), bo);
/* SYNC */
- add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
+ add_option (_("Sync"), new OptionEditorHeading (_("External Synchronization")));
_sync_source = new ComboOption<SyncSource> (
"sync-source",
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm)
));
+ add_option (_("Appearance"),
+ new BoolOption (
+ "blink-alert-indicators",
+ _("Blink Alert Indicators"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_alert_indicators),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_alert_indicators)
+ ));
+
#ifndef __APPLE__
/* font scaling does nothing with GDK/Quartz */
bo = new BoolOption (
"transients-follow-front",
- _("Transient windows follow front window."),
+ _("Transient windows follow front window"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_transients_follow_front),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_transients_follow_front)
);
} else if (p == "open-gui-after-adding-plugin" || p == "show-inline-display-by-default") {
#if (defined LV2_SUPPORT && defined LV2_EXTENDED)
_plugin_prefer_inline->set_sensitive (UIConfiguration::instance().get_open_gui_after_adding_plugin() && UIConfiguration::instance().get_show_inline_display_by_default());
-#endif
-#ifdef ENABLE_NLS
- } else if (p == "enable-translation") {
- _l10n->set_sensitive (ARDOUR::translations_are_enabled ());
#endif
}
}
void RCOptionEditor::edit_lxvst_path () {
Glib::RefPtr<Gdk::Window> win = get_parent_window ();
- Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+ PathsDialog *pd = new PathsDialog (
*current_toplevel(), _("Set Linux VST Search Path"),
_rc_config->get_plugin_path_lxvst(),
PluginManager::instance().get_default_lxvst_path()
false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
msg.set_default_response (Gtk::RESPONSE_YES);
if (msg.run() == Gtk::RESPONSE_YES) {
+ msg.hide ();
plugin_scan_refresh ();
}
}
}
void RCOptionEditor::edit_vst_path () {
- Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+ PathsDialog *pd = new PathsDialog (
*current_toplevel(), _("Set Windows VST Search Path"),
_rc_config->get_plugin_path_vst(),
PluginManager::instance().get_default_windows_vst_path()
false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
msg.set_default_response (Gtk::RESPONSE_YES);
if (msg.run() == Gtk::RESPONSE_YES) {
+ msg.hide ();
plugin_scan_refresh ();
}
}
projects / ardour.git / blobdiff