#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
{
{
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;
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)
));
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"),
/* SYNC */
- add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
+ add_option (_("Sync"), new OptionEditorHeading (_("External Synchronization")));
_sync_source = new ComboOption<SyncSource> (
"sync-source",
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)
);
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()
}
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()