{
_store = ListStore::create (_model);
_view.set_model (_store);
- _view.append_column (_("Name"), _model.name);
+ _view.append_column (_("Control Surface Protocol"), _model.name);
_view.get_column(0)->set_resizable (true);
_view.get_column(0)->set_expand (true);
_view.append_column_editable (_("Enabled"), _model.enabled);
PBD::ScopedConnection protocol_status_connection;
};
-#ifdef WITH_VIDEOTIMELINE
class VideoTimelineOptions : public OptionEditorBox
{
public:
VideoTimelineOptions (RCConfiguration* c)
: _rc_config (c)
- , _show_xjadeo_setup_button (_("Show Video Monitor Option Dialog"))
, _show_video_export_info_button (_("Show Video Export Info before export"))
, _show_video_server_dialog_button (_("Show Video Server Startup Dialog"))
, _video_advanced_setup_button (_("Advanced Setup (remote video server)"))
{
- Table* t = manage (new Table (2, 7));
+ Table* t = manage (new Table (2, 6));
t->set_spacings (4);
t->attach (_video_advanced_setup_button, 0, 2, 0, 1);
/* small vspace y=3..4 */
- t->attach (_show_xjadeo_setup_button, 0, 2, 4, 5);
- _show_xjadeo_setup_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_xjadeo_setup_toggled));
- Gtkmm2ext::UI::instance()->set_tip (_show_xjadeo_setup_button,
- _("<b>When enabled</b> an option dialog is presented before opening the video monitor"));
-
- t->attach (_show_video_export_info_button, 0, 2, 5, 6);
+ t->attach (_show_video_export_info_button, 0, 2, 4, 5);
_show_video_export_info_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_export_info_toggled));
Gtkmm2ext::UI::instance()->set_tip (_show_video_export_info_button,
_("<b>When enabled</b> an information window with details is displayed before the video-export dialog."));
- t->attach (_show_video_server_dialog_button, 0, 2, 6, 7);
+ t->attach (_show_video_server_dialog_button, 0, 2, 5, 6);
_show_video_server_dialog_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_server_dialog_toggled));
Gtkmm2ext::UI::instance()->set_tip (_show_video_server_dialog_button,
_("<b>When enabled</b> the video server is never launched automatically without confirmation"));
_rc_config->set_video_server_docroot (_video_server_docroot_entry.get_text());
}
- void show_xjadeo_setup_toggled ()
- {
- bool const x = _show_xjadeo_setup_button.get_active ();
- _rc_config->set_video_monitor_setup_dialog (x);
- }
-
void show_video_export_info_toggled ()
{
bool const x = _show_video_export_info_button.get_active ();
_video_server_url_entry.set_text (_rc_config->get_video_server_url());
} else if (p == "video-server-docroot") {
_video_server_docroot_entry.set_text (_rc_config->get_video_server_docroot());
- } else if (p == "video-monitor-setup-dialog") {
- bool const x = _rc_config->get_video_monitor_setup_dialog();
- _show_xjadeo_setup_button.set_active (x);
} else if (p == "show-video-export-info") {
bool const x = _rc_config->get_show_video_export_info();
_show_video_export_info_button.set_active (x);
RCConfiguration* _rc_config;
Entry _video_server_url_entry;
Entry _video_server_docroot_entry;
- CheckButton _show_xjadeo_setup_button;
CheckButton _show_video_export_info_button;
CheckButton _show_video_server_dialog_button;
CheckButton _video_advanced_setup_button;
};
-#endif
/** A class which allows control of visibility of some editor components usign
* a VisibilityGroup. The caller should pass in a `dummy' VisibilityGroup
add_option (_("User interaction"), new KeyboardOptions);
- add_option (_("User interaction"), new OptionEditorHeading (_("Control surfaces")));
+ /* Control Surfaces */
- add_option (_("User interaction"), new ControlSurfacesOptions (*this));
+ add_option (_("Control Surfaces"), 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 (_("User interaction"), rm);
+ add_option (_("Control Surfaces"), rm);
-#ifdef WITH_VIDEOTIMELINE
/* VIDEO Timeline */
add_option (_("Video"), new VideoTimelineOptions (_rc_config));
-#endif
/* INTERFACE */
- add_option (S_("GUI"),
+ add_option (S_("Preferences|GUI"),
new BoolOption (
"widget-prelight",
_("Graphically indicate mouse pointer hovering over various widgets"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
));
- add_option (S_("GUI"),
+ add_option (S_("Preferences|GUI"),
new BoolOption (
"use-tooltips",
_("Show tooltips if mouse hovers over a control"),
#ifndef GTKOSX
/* font scaling does nothing with GDK/Quartz */
- add_option (S_("GUI"), new FontScalingOptions (_rc_config));
+ add_option (S_("Preferences|GUI"), new FontScalingOptions (_rc_config));
#endif
- add_option (S_("GUI"),
- new BoolOption (
- "use-own-plugin-gui",
- string_compose (_("Use plugins' own interfaces instead of %1's"), PROGRAM_NAME),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
- ));
add_option (S_("GUI"),
new BoolOption (
_mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
add_option (
- S_("GUI"),
+ S_("Preferences|GUI"),
new VisibilityOption (
_("Mixer Strip"),
&_mixer_strip_visibility,
)
);
- add_option (S_("GUI"),
+ add_option (S_("Preferences|GUI"),
new BoolOption (
"default-narrow_ms",
_("Use narrow strips in the mixer by default"),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
));
- add_option (S_("GUI"), new OptionEditorHeading (_("Metering")));
+ add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Metering")));
ComboOption<float>* mht = new ComboOption<float> (
"meter-hold",
mht->add (MeterHoldMedium, _("medium"));
mht->add (MeterHoldLong, _("long"));
- add_option (S_("GUI"), mht);
+ add_option (S_("Preferences|GUI"), mht);
ComboOption<float>* mfo = new ComboOption<float> (
"meter-falloff",
mfo->add (METER_FALLOFF_FASTER, _("faster"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
- add_option (S_("GUI"), mfo);
+ add_option (S_("Preferences|GUI"), mfo);
}
void
projects / ardour.git / blobdiff