X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Frc_option_editor.cc;h=5a4580f5d4ed81b1adfc625c3b3a1919d3f24149;hb=7c6a62452dcbfa2196fee44fa411c27c65505c3b;hp=6f059fde8d051299a2a5296c0d645d0774fe1656;hpb=1115c26e173ca9639443ba12927c89c5ccf59196;p=ardour.git
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 6f059fde8d..5a4580f5d4 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -86,42 +86,48 @@ public:
{
// 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;
- FaderOption* fo = new FaderOption (
+ _click_fader = new FaderOption (
"click-gain",
_("Gain level"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
);
- fo->add_to_page (this);
- fo->set_state_from_config ();
+ _click_fader->add_to_page (this);
+ _click_fader->set_state_from_config ();
_click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));
_click_emphasis_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_changed));
@@ -146,6 +152,8 @@ public:
} else if (p == "use-click-emphasis") {
bool x = _rc_config->get_use_click_emphasis ();
_use_emphasis_on_click_check_button.set_active (x);
+ } else if (p == "click-gain") {
+ _click_fader->set_state_from_config ();
}
}
@@ -237,6 +245,7 @@ private:
Entry _click_emphasis_path_entry;
Button _click_browse_button;
Button _click_emphasis_browse_button;
+ FaderOption* _click_fader;
};
class UndoOptions : public OptionEditorComponent
@@ -393,13 +402,13 @@ static const struct {
class KeyboardOptions : public OptionEditorMiniPage
{
public:
- KeyboardOptions () :
- _delete_button_adjustment (3, 1, 12),
- _delete_button_spin (_delete_button_adjustment),
- _edit_button_adjustment (3, 1, 5),
- _edit_button_spin (_edit_button_adjustment),
- _insert_note_button_adjustment (3, 1, 5),
- _insert_note_button_spin (_insert_note_button_adjustment)
+ KeyboardOptions ()
+ : _delete_button_adjustment (3, 1, 12)
+ , _delete_button_spin (_delete_button_adjustment)
+ , _edit_button_adjustment (3, 1, 5)
+ , _edit_button_spin (_edit_button_adjustment)
+ , _insert_note_button_adjustment (3, 1, 5)
+ , _insert_note_button_spin (_insert_note_button_adjustment)
{
// TODO get rid of GTK -> use OptionEditor Widgets
@@ -414,13 +423,7 @@ public:
set_popdown_strings (_edit_modifier_combo, dumb);
_edit_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_edit_modifier_combo,
- (string_compose (_("Recommended Setting: %1 + button 3 (right mouse button)%2"), Keyboard::primary_modifier_name (), restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
- _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1 + button 3 (right mouse button)%2"), Keyboard::primary_modifier_name (), restart_msg)));
Table* t = &table;
@@ -467,7 +470,6 @@ public:
t->attach (_edit_button_spin, col + 4, col + 5, row, row + 1, SHRINK , FILL);
_edit_button_spin.set_name ("OptionsEntry");
- _edit_button_adjustment.set_value (Keyboard::edit_button());
_edit_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_button_changed));
++row;
@@ -476,13 +478,7 @@ public:
set_popdown_strings (_delete_modifier_combo, dumb);
_delete_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_delete_modifier_combo,
- (string_compose (_("Recommended Setting: %1 + button 3 (right mouse button)%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
- _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1 + button 3 (right mouse button)%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
l = manage (left_aligned_label (_("Delete using:")));
l->set_name ("OptionsLabel");
@@ -497,7 +493,6 @@ public:
t->attach (_delete_button_spin, col + 4, col + 5, row, row + 1, SHRINK, FILL);
_delete_button_spin.set_name ("OptionsEntry");
- _delete_button_adjustment.set_value (Keyboard::delete_button());
_delete_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_button_changed));
++row;
@@ -506,13 +501,7 @@ public:
set_popdown_strings (_insert_note_modifier_combo, dumb);
_insert_note_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_insert_note_modifier_combo,
- (string_compose (_("Recommended Setting: %1 + button 1 (left mouse button)%2"), Keyboard::primary_modifier_name (), restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
- _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1 + button 1 (left mouse button)%2"), Keyboard::primary_modifier_name (), restart_msg)));
l = manage (left_aligned_label (_("Insert note using:")));
l->set_name ("OptionsLabel");
@@ -527,7 +516,6 @@ public:
t->attach (_insert_note_button_spin, col + 4, col + 5, row, row + 1, SHRINK, FILL);
_insert_note_button_spin.set_name ("OptionsEntry");
- _insert_note_button_adjustment.set_value (Keyboard::insert_note_button());
_insert_note_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_button_changed));
++row;
@@ -551,12 +539,6 @@ public:
Keyboard::primary_modifier_name (),
#endif
restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
- _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
l = manage (left_aligned_label (_("Copy items using:")));
l->set_name ("OptionsLabel");
@@ -570,7 +552,6 @@ public:
/* constraint modifier */
set_popdown_strings (_constraint_modifier_combo, dumb);
_constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
- std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
(string_compose (_("Recommended Setting: %1%2"),
#ifdef __APPLE__
@@ -579,12 +560,6 @@ public:
Keyboard::tertiary_modifier_name (),
#endif
restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
- _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
l = manage (left_aligned_label (_("Constrain drag using:")));
l->set_name ("OptionsLabel");
@@ -599,15 +574,9 @@ public:
set_popdown_strings (_push_points_combo, dumb);
_push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
- mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
+ std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
- (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
- _push_points_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
l = manage (left_aligned_label (_("Push points using:")));
l->set_name ("OptionsLabel");
@@ -629,13 +598,7 @@ public:
set_popdown_strings (_trim_contents_combo, dumb);
_trim_contents_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_contents_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_trim_contents_combo,
- (string_compose (_("Recommended Setting: %1%2"), Keyboard::primary_modifier_name (), restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_contents_modifier ()) {
- _trim_contents_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), Keyboard::primary_modifier_name (), restart_msg)));
l = manage (left_aligned_label (_("Trim contents using:")));
l->set_name ("OptionsLabel");
@@ -652,13 +615,7 @@ public:
mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::tertiary_modifier_name ());
Gtkmm2ext::UI::instance()->set_tip (_trim_anchored_combo,
- (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_anchored_modifier ()) {
- _trim_anchored_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
l = manage (left_aligned_label (_("Anchored trim using:")));
l->set_name ("OptionsLabel");
@@ -674,13 +631,6 @@ public:
set_popdown_strings (_trim_jump_combo, dumb);
_trim_jump_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_jump_modifier_chosen));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) Keyboard::trim_jump_modifier ()) {
- _trim_jump_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
-
l = manage (left_aligned_label (_("Jump after trim using:")));
l->set_name ("OptionsLabel");
@@ -696,13 +646,7 @@ public:
set_popdown_strings (_note_size_relative_combo, dumb);
_note_size_relative_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::note_size_relative_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_note_size_relative_combo,
- (string_compose (_("Recommended Setting: %1%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
- _note_size_relative_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), Keyboard::tertiary_modifier_name (), restart_msg))); // XXX 2ndary
l = manage (left_aligned_label (_("Resize notes relatively using:")));
l->set_name ("OptionsLabel");
@@ -730,13 +674,7 @@ public:
mod_str = Keyboard::secondary_modifier_name();
#endif
Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
- (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
- _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
l = manage (left_aligned_label (_("Ignore snap using:")));
l->set_name ("OptionsLabel");
@@ -756,13 +694,7 @@ public:
mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
#endif
Gtkmm2ext::UI::instance()->set_tip (_snap_delta_combo,
- (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) Keyboard::snap_delta_modifier ()) {
- _snap_delta_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
l = manage (left_aligned_label (_("Snap relatively using:")));
l->set_name ("OptionsLabel");
@@ -785,13 +717,7 @@ public:
_trim_overlap_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_overlap_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_trim_overlap_combo,
- (string_compose (_("Recommended Setting: %1%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_overlap_modifier ()) {
- _trim_overlap_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
l = manage (left_aligned_label (_("Resize overlapped regions using:")));
l->set_name ("OptionsLabel");
@@ -813,21 +739,24 @@ public:
set_popdown_strings (_fine_adjust_combo, dumb);
_fine_adjust_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::fine_adjust_modifier_chosen));
- mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::secondary_modifier_name ());
+ mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::secondary_modifier_name ()); // XXX just 2ndary ?!
Gtkmm2ext::UI::instance()->set_tip (_fine_adjust_combo,
- (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
- for (int x = 0; modifiers[x].name; ++x) {
- if (modifiers[x].modifier == (guint) ArdourKeyboard::fine_adjust_modifier ()) {
- _fine_adjust_combo.set_active_text (S_(modifiers[x].name));
- break;
- }
- }
+ (string_compose (_("Recommended Setting: %1%2"), mod_str, restart_msg)));
l = manage (left_aligned_label (_("Fine adjust using:")));
l->set_name ("OptionsLabel");
t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
t->attach (_fine_adjust_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+ OptionEditorHeading* h = new OptionEditorHeading (_("Reset"));
+ h->add_to_page (this);
+
+ RcActionButton* rb = new RcActionButton (_("Reset to recommended defaults"),
+ sigc::mem_fun (*this, &KeyboardOptions::reset_to_defaults));
+ rb->add_to_page (this);
+
+ set_state_from_config ();
}
void parameter_changed (string const &)
@@ -837,7 +766,56 @@ public:
void set_state_from_config ()
{
- /* XXX: these aren't really config options... */
+ _delete_button_adjustment.set_value (Keyboard::delete_button());
+ _insert_note_button_adjustment.set_value (Keyboard::insert_note_button());
+ _edit_button_adjustment.set_value (Keyboard::edit_button());
+
+ for (int x = 0; modifiers[x].name; ++x) {
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_overlap_modifier ()) {
+ _trim_overlap_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
+ _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
+ _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
+ _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
+ _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
+ _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
+ _push_points_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_contents_modifier ()) {
+ _trim_contents_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_anchored_modifier ()) {
+ _trim_anchored_combo.set_active_text (S_(modifiers[x].name));
+ }
+#if 0
+ if (modifiers[x].modifier == (guint) Keyboard::trim_jump_modifier ()) {
+ _trim_jump_combo.set_active_text (S_(modifiers[x].name));
+ }
+#endif
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
+ _note_size_relative_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
+ _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) Keyboard::snap_delta_modifier ()) {
+ _snap_delta_combo.set_active_text (S_(modifiers[x].name));
+ }
+ if (modifiers[x].modifier == (guint) ArdourKeyboard::fine_adjust_modifier ()) {
+ _fine_adjust_combo.set_active_text (S_(modifiers[x].name));
+ }
+ }
}
void add_to_page (OptionEditorPage* p)
@@ -1035,6 +1013,56 @@ private:
Keyboard::set_insert_note_button (_insert_note_button_spin.get_value_as_int());
}
+ void reset_to_defaults ()
+ {
+ /* when clicking*/
+ Keyboard::set_edit_modifier (Keyboard::PrimaryModifier);
+ Keyboard::set_edit_button (3);
+ Keyboard::set_delete_modifier (Keyboard::TertiaryModifier);
+ Keyboard::set_delete_button (3);
+ Keyboard::set_insert_note_modifier (Keyboard::PrimaryModifier);
+ Keyboard::set_insert_note_button (1);
+
+ /* when beginning a drag */
+#ifdef __APPLE__
+ Keyboard::set_copy_modifier (Keyboard::SecondaryModifier);
+#else
+ Keyboard::set_copy_modifier (Keyboard::PrimaryModifier);
+#endif
+
+#ifdef __APPLE__
+ ArdourKeyboard::set_constraint_modifier (Keyboard::PrimaryModifier);
+#else
+ ArdourKeyboard::set_constraint_modifier (Keyboard::TertiaryModifier);
+#endif
+ ArdourKeyboard::set_push_points_modifier (Keyboard::PrimaryModifier | Keyboard::Level4Modifier);
+
+ /* when beginning a trim */
+ ArdourKeyboard::set_trim_contents_modifier (Keyboard::PrimaryModifier);
+ ArdourKeyboard::set_trim_anchored_modifier (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier);
+ ArdourKeyboard::set_note_size_relative_modifier (Keyboard::TertiaryModifier); // XXX better: 2ndary
+
+ /* while dragging */
+#ifdef __APPLE__
+ Keyboard::set_snap_modifier (Keyboard::TertiaryModifier);
+#else
+ Keyboard::set_snap_modifier (Keyboard::SecondaryModifier);
+#endif
+#ifdef __APPLE__
+ Keyboard::set_snap_delta_modifier (Keyboard::Level4Modifier);
+#else
+ Keyboard::set_snap_delta_modifier (Keyboard::SecondaryModifier | Keyboard::Level4Modifier);
+#endif
+
+ /* while trimming */
+ ArdourKeyboard::set_trim_overlap_modifier (Keyboard::TertiaryModifier);
+
+ /* while dragging ctrl points */
+ ArdourKeyboard::set_fine_adjust_modifier (/*Keyboard::PrimaryModifier | */Keyboard::SecondaryModifier); // XXX
+
+ set_state_from_config ();
+ }
+
ComboBoxText _keyboard_layout_selector;
ComboBoxText _edit_modifier_combo;
ComboBoxText _delete_modifier_combo;
@@ -1346,7 +1374,7 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
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;
}
}
@@ -1363,8 +1391,9 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
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;
}
}
@@ -1440,7 +1469,7 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
* tear_down_gui() hides an deletes the Window if it exists.
*/
ArdourWindow* win = new ArdourWindow (*((Gtk::Window*) _view.get_toplevel()), title.get_string());
- win->set_title ("Control Protocol Options");
+ win->set_title (_("Control Protocol Settings"));
win->add (*box);
box->show ();
win->present ();
@@ -2092,7 +2121,11 @@ MidiPortOptions::pretty_name_edit (std::string const & path, string const & new_
RCOptionEditor::RCOptionEditor ()
: OptionEditorContainer (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
- , Tabbable (*this, _("Preferences")) /* pack self-as-vbox into tabbable */
+ , Tabbable (*this, _("Preferences")
+#ifdef MIXBUS
+ , false // detached by default (first start, no instant.xml)
+#endif
+ ) /* pack self-as-vbox into tabbable */
, _rc_config (Config)
, _mixer_strip_visibility ("mixer-element-visibility")
{
@@ -2126,11 +2159,87 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("General"), procs);
}
- add_option (_("General"), new OptionEditorHeading (S_("Options|Undo")));
+ /* Image cache size */
+ add_option (_("General"), new OptionEditorHeading (_("Memory Usage")));
- add_option (_("General"), new UndoOptions (_rc_config));
+ HSliderOption *sics = new HSliderOption ("waveform-cache-size",
+ _("Waveform image cache size (megabytes)"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size),
+ 1, 1024, 10 /* 1 MB to 1GB in steps of 10MB */
+ );
+ sics->scale().set_digits (0);
+ Gtkmm2ext::UI::instance()->set_tip (
+ sics->tip_widget(),
+ _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
+ add_option (_("General"), sics);
+
+ add_option (_("General"), new OptionEditorHeading (_("Engine")));
add_option (_("General"),
+ new BoolOption (
+ "try-autostart-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"), new OptionEditorHeading (_("Automation")));
+
+ add_option (_("General"),
+ new SpinOption (
+ "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
+ ));
+
+ add_option (_("General"),
+ new SpinOption (
+ "automation-interval-msecs",
+ _("Automation sampling interval (milliseconds)"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs),
+ 1, 1000, 1, 20
+ ));
+
+ add_option (_("General"), new OptionEditorHeading (_("Tempo")));
+
+ bo = new BoolOption (
+ "allow-non-quarter-pulse",
+ _("Allow non quarter-note pulse"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_allow_non_quarter_pulse),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_allow_non_quarter_pulse)
+ );
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ string_compose (_("When enabled %1 will allow tempo to be expressed in divisions per minute\n"
+ "When disabled %1 will only allow tempo to be expressed in quarter notes per minute"),
+ PROGRAM_NAME));
+ add_option (_("General"), bo);
+
+ if (!ARDOUR::Profile->get_mixbus()) {
+ add_option (_("General"), new OptionEditorHeading (_("GUI Lock")));
+ /* Lock GUI timeout */
+
+ HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
+ _("Lock timeout (seconds)"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds),
+ 0, 1000, 1, 10
+ );
+ 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 (_("General"), slts);
+ } // !mixbus
+
+ add_option (_("General/Session"), new OptionEditorHeading (S_("Options|Undo")));
+
+ add_option (_("General/Session"), new UndoOptions (_rc_config));
+
+ add_option (_("General/Session"),
new BoolOption (
"verify-remove-last-capture",
_("Verify removal of last capture"),
@@ -2138,9 +2247,9 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
));
- add_option (_("General"), new OptionEditorHeading (_("Session Management")));
+ add_option (_("General/Session"), new OptionEditorHeading (_("Session Management")));
- add_option (_("General"),
+ add_option (_("General/Session"),
new BoolOption (
"periodic-safety-backups",
_("Make periodic backups of the session file"),
@@ -2148,7 +2257,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
));
- add_option (_("General"),
+ add_option (_("General/Session"),
new BoolOption (
"only-copy-imported-files",
_("Always copy imported files"),
@@ -2156,14 +2265,14 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files)
));
- add_option (_("General"), new DirectoryOption (
+ add_option (_("General/Session"), new DirectoryOption (
X_("default-session-parent-dir"),
_("Default folder for new sessions:"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
));
- add_option (_("General"),
+ add_option (_("General/Session"),
new SpinOption (
"max-recent-sessions",
_("Maximum number of recent sessions"),
@@ -2172,41 +2281,6 @@ RCOptionEditor::RCOptionEditor ()
0, 1000, 1, 20
));
- add_option (_("General"), new OptionEditorHeading (_("Automation")));
-
- add_option (_("General"),
- new SpinOption (
- "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
- ));
-
- add_option (_("General"),
- new SpinOption (
- "automation-interval-msecs",
- _("Automation sampling interval (milliseconds)"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs),
- 1, 1000, 1, 20
- ));
-
- add_option (_("General"), new OptionEditorHeading (_("Tempo")));
-
- BoolOption* tsf;
-
- tsf = new BoolOption (
- "allow-non-quarter-pulse",
- _("Allow non quarter-note pulse"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_allow_non_quarter_pulse),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_allow_non_quarter_pulse)
- );
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
- string_compose (_("When enabled %1 will allow tempo to be expressed in divisions per minute\n"
- "When disabled %1 will only allow tempo to be expressed in quarter notes per minute"),
- PROGRAM_NAME));
- add_option (_("General"), tsf);
#ifdef ENABLE_NLS
@@ -2223,19 +2297,6 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("General/Translation"), bo);
- _l10n = new ComboOption (
- "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
@@ -2254,7 +2315,7 @@ RCOptionEditor::RCOptionEditor ()
bo = new BoolOption (
"name-new-markers",
- _("Prompt for a new marker name"),
+ _("Prompt for new marker names"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_name_new_markers),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_name_new_markers)
);
@@ -2476,7 +2537,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Mixer"), pa);
- add_option (_("Mixer"), new OptionEditorHeading (_("Default track / bus muting options")));
+ add_option (_("Mixer"), new OptionEditorHeading (_("Default Track / Bus Muting Options")));
add_option (_("Mixer"),
new BoolOption (
@@ -2544,13 +2605,16 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Signal Flow"), mm);
- add_option (_("Signal Flow"),
- new BoolOption (
+ bo = new BoolOption (
"tape-machine-mode",
_("Tape machine mode"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_tape_machine_mode),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
- ));
+ );
+ add_option (_("Signal Flow"), bo);
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ string_compose (_("When enabled %1 will not monitor a track's input if the transport is stopped."),
+ PROGRAM_NAME));
if (!Profile->get_mixbus()) {
@@ -2591,7 +2655,7 @@ RCOptionEditor::RCOptionEditor ()
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)
);
@@ -2701,24 +2765,6 @@ RCOptionEditor::RCOptionEditor ()
-1, 65536, 1, 10
));
- add_option (_("MIDI"), new OptionEditorHeading (_("Display")));
-
- add_option (_("MIDI"),
- new BoolOption (
- "display-first-midi-bank-as-zero",
- _("Display first MIDI bank/program as 0"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
- ));
-
- add_option (_("MIDI"),
- new BoolOption (
- "never-display-periodic-midi",
- _("Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
- ));
-
add_option (_("MIDI"), new OptionEditorHeading (_("Audition")));
add_option (_("MIDI"),
@@ -2760,6 +2806,20 @@ RCOptionEditor::RCOptionEditor ()
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 (_("When enabled the metronome will remain silent if %1 is not recording."), PROGRAM_NAME));
+ add_option (_("Metronome"), bo);
+ add_option (_("Metronome"), new OptionEditorBlank ());
+
/* Meters */
@@ -2842,6 +2902,24 @@ RCOptionEditor::RCOptionEditor ()
add_option (S_("Preferences|Metering"), mvu);
+ HSliderOption *mpks = new HSliderOption("meter-peak",
+ _("Peak indicator threshold [dBFS]"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
+ -10, 0, .1, .1
+ );
+
+ Gtkmm2ext::UI::instance()->set_tip (
+ 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|Metering"), mpks);
+
+ OptionEditorHeading* default_meter_head = new OptionEditorHeading (_("Default Meter Types"));
+ default_meter_head->set_note (_("These settings apply to newly created tracks and busses. For the Master bus, this will be when a new session is created."));
+
+ add_option (S_("Preferences|Metering"), default_meter_head);
+
ComboOption* mtm = new ComboOption (
"meter-type-master",
_("Default Meter Type for Master Bus"),
@@ -2862,7 +2940,7 @@ RCOptionEditor::RCOptionEditor ()
ComboOption* mtb = new ComboOption (
"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)
);
@@ -2879,7 +2957,7 @@ RCOptionEditor::RCOptionEditor ()
ComboOption* mtt = new ComboOption (
"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)
);
@@ -2888,19 +2966,6 @@ RCOptionEditor::RCOptionEditor ()
add_option (S_("Preferences|Metering"), mtt);
- HSliderOption *mpks = new HSliderOption("meter-peak",
- _("Peak threshold [dBFS]"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
- -10, 0, .1, .1
- );
-
- Gtkmm2ext::UI::instance()->set_tip (
- 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|Metering"), mpks);
-
add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
add_option (S_("Preferences|Metering"),
@@ -2915,46 +2980,48 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Transport"), new OptionEditorHeading (_("General")));
- tsf = new BoolOption (
+ bo = new BoolOption (
"stop-at-session-end",
_("Stop at the end of the session"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
string_compose (_("When enabled if %1 is not recording, it will stop the transport "
"when it reaches the current session end marker\n\n"
"When disabled %1 will continue to roll past the session end marker at all times"),
PROGRAM_NAME));
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
- tsf = new BoolOption (
+ bo = new BoolOption (
"latched-record-enable",
_("Keep record-enable engaged on stop"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
);
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ _("When enabled master record will remain engaged when the transport transitions to stop.\nWhen disabled master record will be disabled when the transport transitions to stop."));
- tsf = new BoolOption (
+ bo = new BoolOption (
"disable-disarm-during-roll",
_("Disable per-track record disarm while rolling"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_disable_disarm_during_roll),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("When enabled this will prevent you from accidentally stopping specific tracks recording during a take"));
- add_option (_("Transport"), tsf);
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("When enabled this will prevent you from accidentally stopping specific tracks recording during a take."));
+ add_option (_("Transport"), bo);
- tsf = new BoolOption (
+ bo = new BoolOption (
"quieten_at_speed",
_("12dB gain reduction during fast-forward and fast-rewind"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
- _("When enabled rhis will reduce the unpleasant increase in perceived volume "
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ _("When enabled this will reduce the unpleasant increase in perceived volume "
"that occurs when fast-forwarding or rewinding through some kinds of audio"));
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
ComboOption* psc = new ComboOption (
"preroll-seconds",
@@ -2963,8 +3030,11 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_preroll_seconds)
);
Gtkmm2ext::UI::instance()->set_tip (psc->tip_widget(),
- (_("The amount of preroll (in seconds) to apply when Play with Preroll is initiated.\n\n"
+ (_("The amount of preroll to apply when Play with Preroll or Record with Prerollis initiated.\n\n"
"If Follow Edits is enabled, the preroll is applied to the playhead position when a region is selected or trimmed.")));
+ psc->add (-4.0, _("4 Bars"));
+ psc->add (-2.0, _("2 Bars"));
+ psc->add (-1.0, _("1 Bar"));
psc->add (0.0, _("0 (no pre-roll)"));
psc->add (0.1, _("0.1 second"));
psc->add (0.25, _("0.25 second"));
@@ -2976,49 +3046,49 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Transport"), new OptionEditorHeading (_("Looping")));
- tsf = new BoolOption (
+ bo = 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(),
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
(_("When enabled the loop button does not start playback but forces playback to always play the loop\n\n"
"When disabled the loop button starts playing the loop, but stop then cancels loop playback")));
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
- tsf = new BoolOption (
+ bo = new BoolOption (
"seamless-loop",
_("Do seamless looping (not possible when slaved to MTC, LTC etc)"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
string_compose (_("When enabled this will loop by reading ahead and wrapping around at the loop point, "
"preventing any need to do a transport locate at the end of the loop\n\n"
"When disabled looping is done by locating back to the start of the loop when %1 reaches the end "
"which will often cause a small click or delay"), PROGRAM_NAME));
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
add_option (_("Transport"), new OptionEditorHeading (_("Dropout (xrun) Handling")));
- tsf = new BoolOption (
+ bo = new BoolOption (
"stop-recording-on-xrun",
_("Stop recording when an xrun occurs"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
string_compose (_("When enabled %1 will stop recording if an over- or underrun is detected by the audio engine"),
PROGRAM_NAME));
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
- tsf = new BoolOption (
+ bo = new BoolOption (
"create-xrun-marker",
_("Create markers where xruns occur"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
);
- add_option (_("Transport"), tsf);
+ add_option (_("Transport"), bo);
/* SYNC */
@@ -3435,7 +3505,7 @@ RCOptionEditor::RCOptionEditor ()
/* INTERFACE */
#if (defined OPTIONAL_CAIRO_IMAGE_SURFACE || defined CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE)
- add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphics Acceleration")));
+ add_option (_("Appearance"), new OptionEditorHeading (_("Graphics Acceleration")));
#endif
#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
@@ -3448,7 +3518,7 @@ RCOptionEditor::RCOptionEditor ()
Gtkmm2ext::UI::instance()->set_tip (bgc->tip_widget(), string_compose (
_("Render large parts of the application user-interface in software, instead of using 2D-graphics acceleration.\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
- add_option (S_("Preferences|GUI"), bgc);
+ add_option (_("Appearance"), bgc);
#endif
#ifdef CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE
@@ -3460,11 +3530,11 @@ RCOptionEditor::RCOptionEditor ()
);
Gtkmm2ext::UI::instance()->set_tip (bgo->tip_widget(), string_compose (_("Disables hardware gradient rendering on buggy video drivers (\"buggy gradients patch\").\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
- add_option (S_("Preferences|GUI"), bgo);
+ add_option (_("Appearance"), bgo);
#endif
- add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphical User Interface")));
+ add_option (_("Appearance"), new OptionEditorHeading (_("Graphical User Interface")));
- add_option (S_("Preferences|GUI"),
+ add_option (_("Appearance"),
new BoolOption (
"widget-prelight",
_("Highlight widgets on mouseover"),
@@ -3472,7 +3542,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_widget_prelight)
));
- add_option (S_("Preferences|GUI"),
+ add_option (_("Appearance"),
new BoolOption (
"use-tooltips",
_("Show tooltips if mouse hovers over a control"),
@@ -3490,9 +3560,9 @@ RCOptionEditor::RCOptionEditor ()
_("When enabled clock displays are updated every Timecode Frame (fps).\n\n"
"When disabled clock displays are updated only every 100ms."
));
- add_option (S_("Preferences|GUI"), bo);
+ add_option (_("Appearance"), bo);
- add_option (S_("Preferences|GUI"),
+ add_option (_("Appearance"),
new BoolOption (
"blink-rec-arm",
_("Blink Rec-Arm buttons"),
@@ -3500,44 +3570,21 @@ RCOptionEditor::RCOptionEditor ()
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 */
- add_option (S_("Preferences|GUI"), new FontScalingOptions ());
+ add_option (_("Appearance"), new FontScalingOptions ());
#endif
-
- /* Image cache size */
-
- HSliderOption *sics = new HSliderOption ("waveform-cache-size",
- _("Waveform image cache size (megabytes)"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size),
- 1, 1024, 10 /* 1 MB to 1GB in steps of 10MB */
- );
- sics->scale().set_digits (0);
- Gtkmm2ext::UI::instance()->set_tip (
- sics->tip_widget(),
- _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
- add_option (S_("Preferences|GUI"), sics);
-
- if (!ARDOUR::Profile->get_mixbus()) {
- /* Lock GUI timeout */
-
- HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
- _("Lock timeout (seconds)"),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
- sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds),
- 0, 1000, 1, 10
- );
- 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);
- } // !mixbus
-
- add_option (_("GUI/Editor"), new OptionEditorHeading (_("General")));
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"), new OptionEditorHeading (_("General")));
+ add_option (_("Appearance/Editor"),
new BoolOption (
"show-name-highlight",
_("Use name highlight bars in region displays (requires a restart)"),
@@ -3545,7 +3592,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
));
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"),
new BoolOption (
"color-regions-using-track-color",
_("Region color follows track color"),
@@ -3553,10 +3600,10 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color)
));
- add_option (_("GUI/Editor"), new OptionEditorHeading (_("Waveforms")));
+ add_option (_("Appearance/Editor"), new OptionEditorHeading (_("Waveforms")));
if (!Profile->get_mixbus()) {
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"),
new BoolOption (
"show-waveforms",
_("Show waveforms in regions"),
@@ -3565,7 +3612,7 @@ RCOptionEditor::RCOptionEditor ()
));
} // !mixbus
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"),
new BoolOption (
"show-waveforms-while-recording",
_("Show waveforms while recording"),
@@ -3573,7 +3620,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms_while_recording)
));
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"),
new BoolOption (
"show-waveform-clipping",
_("Show waveform clipping"),
@@ -3581,7 +3628,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
));
- add_option (_("GUI/Editor"), new ClipLevelOptions ());
+ add_option (_("Appearance/Editor"), new ClipLevelOptions ());
ComboOption* wfs = new ComboOption (
"waveform-scale",
@@ -3593,7 +3640,7 @@ RCOptionEditor::RCOptionEditor ()
wfs->add (Linear, _("linear"));
wfs->add (Logarithmic, _("logarithmic"));
- add_option (_("GUI/Editor"), wfs);
+ add_option (_("Appearance/Editor"), wfs);
ComboOption* wfsh = new ComboOption (
"waveform-shape",
@@ -3605,11 +3652,11 @@ RCOptionEditor::RCOptionEditor ()
wfsh->add (Traditional, _("traditional"));
wfsh->add (Rectified, _("rectified"));
- add_option (_("GUI/Editor"), wfsh);
+ add_option (_("Appearance/Editor"), wfsh);
- add_option (_("GUI/Editor"), new OptionEditorHeading (_("Editor Meters")));
+ add_option (_("Appearance/Editor"), new OptionEditorHeading (_("Editor Meters")));
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"),
new BoolOption (
"show-track-meters",
_("Show meters in track headers"),
@@ -3617,7 +3664,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
));
- add_option (_("GUI/Editor"),
+ add_option (_("Appearance/Editor"),
new BoolOption (
"editor-stereo-only-meters",
_("Limit track header meters to stereo"),
@@ -3625,7 +3672,25 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_editor_stereo_only_meters)
));
- add_option (_("GUI/Editor"), new OptionEditorBlank ());
+ add_option (_("Appearance/Editor"), new OptionEditorHeading (_("MIDI Regions")));
+
+ add_option (_("Appearance/Editor"),
+ new BoolOption (
+ "display-first-midi-bank-as-zero",
+ _("Display first MIDI bank/program as 0"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
+ ));
+
+ add_option (_("Appearance/Editor"),
+ new BoolOption (
+ "never-display-periodic-midi",
+ _("Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
+ ));
+
+ add_option (_("Appearance/Editor"), new OptionEditorBlank ());
/* The names of these controls must be the same as those given in MixerStrip
for the actual widgets being controlled.
@@ -3638,7 +3703,7 @@ RCOptionEditor::RCOptionEditor ()
_mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
_mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns"));
- add_option (_("GUI/Mixer"),
+ add_option (_("Appearance/Mixer"),
new VisibilityOption (
_("Mixer Strip"),
&_mixer_strip_visibility,
@@ -3647,19 +3712,35 @@ RCOptionEditor::RCOptionEditor ()
)
);
- add_option (_("GUI/Mixer"),
+ add_option (_("Appearance/Mixer"),
new BoolOption (
"default-narrow_ms",
- _("Use narrow strips in the mixer by default"),
+ _("Use narrow strips in the mixer for new strips by default"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_default_narrow_ms),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
));
- add_option (_("GUI/Mixer"), new OptionEditorBlank ());
+ add_option (_("Appearance/Mixer"), new OptionEditorBlank ());
- add_option (_("GUI/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
+ add_option (_("Appearance/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
- add_option (_("GUI/Toolbar"),
+ add_option (_("Appearance/Toolbar"),
+ new BoolOption (
+ "show-toolbar-recpunch",
+ _("Display Record/Punch Options"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_recpunch),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_recpunch)
+ ));
+
+ add_option (_("Appearance/Toolbar"),
+ new BoolOption (
+ "show-toolbar-monitoring",
+ _("Display Monitor Options"),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_monitoring),
+ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_monitoring)
+ ));
+
+ add_option (_("Appearance/Toolbar"),
new BoolOption (
"show-toolbar-selclock",
_("Display Selection Clock"),
@@ -3668,7 +3749,7 @@ RCOptionEditor::RCOptionEditor ()
));
if (!ARDOUR::Profile->get_small_screen()) {
- add_option (_("GUI/Toolbar"),
+ add_option (_("Appearance/Toolbar"),
new BoolOption (
"show-secondary-clock",
_("Display Secondary Clock"),
@@ -3677,7 +3758,7 @@ RCOptionEditor::RCOptionEditor ()
));
}
- add_option (_("GUI/Toolbar"),
+ add_option (_("Appearance/Toolbar"),
new BoolOption (
"show-mini-timeline",
_("Display Navigation Timeline"),
@@ -3685,7 +3766,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_mini_timeline)
));
- add_option (_("GUI/Toolbar"),
+ add_option (_("Appearance/Toolbar"),
new BoolOption (
"show-editor-meter",
_("Display Master Level Meter"),
@@ -3693,32 +3774,28 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_editor_meter)
));
- add_option (_("GUI/Toolbar"),
+ add_option (_("Appearance/Toolbar"),
new ColumVisibilityOption (
"action-table-columns", _("Lua Action Script Button Visibility"), 4,
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_action_table_columns),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_action_table_columns)
)
);
- add_option (_("GUI/Toolbar"), new OptionEditorBlank ());
-
+ add_option (_("Appearance/Toolbar"), new OptionEditorBlank ());
- OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
-
- quirks_head->set_note (string_compose (_("These settings will only take effect after %1 is restarted."), PROGRAM_NAME));
/* and now the theme manager */
- add_option (_("GUI/Theme"), new OptionEditorHeading (_("Theme")));
+ add_option (_("Appearance/Theme"), new OptionEditorHeading (_("Theme")));
- add_option (_("GUI/Theme"), new BoolOption (
+ add_option (_("Appearance/Theme"), new BoolOption (
"flat-buttons",
_("Draw \"flat\" buttons"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_flat_buttons),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_flat_buttons)
));
- add_option (_("GUI/Theme"), new BoolOption (
+ add_option (_("Appearance/Theme"), new BoolOption (
"meter-style-led",
_("LED meter style"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_style_led),
@@ -3734,7 +3811,7 @@ RCOptionEditor::RCOptionEditor ()
0, 1.0, 0.05
);
gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED);
- add_option (_("GUI/Theme"), gui_hs);
+ add_option (_("Appearance/Theme"), gui_hs);
gui_hs = new HSliderOption(
"timeline-item-gradient-depth",
@@ -3744,7 +3821,7 @@ RCOptionEditor::RCOptionEditor ()
0, 1.0, 0.05
);
gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED);
- add_option (_("GUI/Theme"), gui_hs);
+ add_option (_("Appearance/Theme"), gui_hs);
vector icon_sets = ::get_icon_sets ();
if (icon_sets.size() > 1) {
@@ -3756,24 +3833,34 @@ RCOptionEditor::RCOptionEditor ()
for (vector::const_iterator i = icon_sets.begin (); i != icon_sets.end (); ++i) {
io->add (*i, *i);
}
- add_option (_("GUI/Theme"), io);
+ add_option (_("Appearance/Theme"), io);
}
- add_option (_("GUI/Colors"), new OptionEditorHeading (_("Colors")));
- add_option (_("GUI/Colors"), new ColorThemeManager);
- add_option (_("GUI/Colors"), new OptionEditorBlank ());
+ add_option (_("Appearance/Colors"), new OptionEditorHeading (_("Colors")));
+ add_option (_("Appearance/Colors"), new ColorThemeManager);
+ add_option (_("Appearance/Colors"), new OptionEditorBlank ());
/* Quirks */
- add_option (_("GUI/Quirks"), quirks_head);
+ OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
- add_option (_("GUI/Quirks"),
- new BoolOption (
+ quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary\
+with each version of your OS, and the preferences that you've set in your OS.\n\n\
+You can adjust the options, below, to change how %1's windows and dialogs behave.\n\n\
+These settings will only take effect after %1 is restarted.\n\
+ "), PROGRAM_NAME));
+
+ add_option (_("Appearance/Quirks"), quirks_head);
+
+ bo = new BoolOption (
"use-wm-visibility",
- _("Use Window Manager/Desktop visibility information"),
+ _("Use visibility information provided by your Window Manager/Desktop"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_wm_visibility),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_wm_visibility)
- ));
+ );
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
+ _("If you have trouble toggling between hidden Editor and Mixer windows, try changing this setting."));
+ add_option (_("Appearance/Quirks"), bo);
#ifndef __APPLE__
bo = new BoolOption (
@@ -3784,7 +3871,7 @@ RCOptionEditor::RCOptionEditor ()
);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
_("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\nThis may help with some window managers."));
- add_option (_("GUI/Quirks"), bo);
+ add_option (_("Appearance/Quirks"), bo);
bo = new BoolOption (
"transients-follow-front",
@@ -3794,7 +3881,7 @@ RCOptionEditor::RCOptionEditor ()
);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
_("Make transient windows follow the front window when toggling between the editor and mixer."));
- add_option (_("GUI/Quirks"), bo);
+ add_option (_("Appearance/Quirks"), bo);
#endif
if (!Profile->get_mixbus()) {
@@ -3806,10 +3893,10 @@ RCOptionEditor::RCOptionEditor ()
);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
_("When detaching the monitoring section, mark it as \"Utility\" window to stay in front."));
- add_option (_("GUI/Quirks"), bo);
+ add_option (_("Appearance/Quirks"), bo);
}
- add_option (_("GUI/Quirks"), new OptionEditorBlank ());
+ add_option (_("Appearance/Quirks"), new OptionEditorBlank ());
/* VIDEO Timeline */
add_option (_("Video"), new OptionEditorHeading (_("Video Server")));
@@ -3872,10 +3959,6 @@ RCOptionEditor::parameter_changed (string const & p)
} 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
}
}
@@ -3911,6 +3994,14 @@ void RCOptionEditor::edit_lxvst_path () {
pd->hide();
if (r == RESPONSE_ACCEPT) {
_rc_config->set_plugin_path_lxvst(pd->get_serialized_paths());
+
+ MessageDialog msg (_("Re-scan Plugins now?"),
+ 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 ();
+ }
}
delete pd;
}
@@ -3925,6 +4016,13 @@ void RCOptionEditor::edit_vst_path () {
pd->hide();
if (r == RESPONSE_ACCEPT) {
_rc_config->set_plugin_path_vst(pd->get_serialized_paths());
+ MessageDialog msg (_("Re-scan Plugins now?"),
+ 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 ();
+ }
}
delete pd;
}
@@ -3962,6 +4060,8 @@ RCOptionEditor::use_own_window (bool and_fill_it)
if (win && new_window) {
win->set_name ("PreferencesWindow");
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Preferences"), this);
+ win->resize (1, 1);
+ win->set_resizable (false);
}
return win;