Add some explanatory text to the Quirks settings
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 9729f1715eaf5772d6d14780172892624075df30..7d5683da587ad4985916064bd00b721b0895814a 100644 (file)
@@ -393,13 +393,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 +414,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 (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%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 (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"),  Keyboard::primary_modifier_name (), restart_msg)));
 
                Table* t = &table;
 
@@ -467,7 +461,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 +469,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 (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%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 (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Delete using:")));
                l->set_name ("OptionsLabel");
@@ -497,7 +484,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 +492,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 (_("<b>Recommended Setting: %1 + button 1 (left mouse button)</b>%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 (_("<b>Recommended Setting: %1 + button 1 (left mouse button)</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Insert note using:")));
                l->set_name ("OptionsLabel");
@@ -527,7 +507,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 +530,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 +543,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 (_("<b>Recommended Setting: %1</b>%2"),
 #ifdef __APPLE__
@@ -579,12 +551,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 +565,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Push points using:")));
                l->set_name ("OptionsLabel");
@@ -629,13 +589,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Trim contents using:")));
                l->set_name ("OptionsLabel");
@@ -652,13 +606,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Anchored trim using:")));
                l->set_name ("OptionsLabel");
@@ -674,13 +622,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 +637,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg))); // XXX 2ndary
 
                l = manage (left_aligned_label (_("Resize notes relatively using:")));
                l->set_name ("OptionsLabel");
@@ -730,13 +665,7 @@ public:
                mod_str = Keyboard::secondary_modifier_name();
 #endif
                Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Ignore snap using:")));
                l->set_name ("OptionsLabel");
@@ -756,13 +685,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Snap relatively using:")));
                l->set_name ("OptionsLabel");
@@ -785,13 +708,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Resize overlapped regions using:")));
                l->set_name ("OptionsLabel");
@@ -813,21 +730,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 (_("<b>Recommended Setting: %1</b>%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 (_("<b>Recommended Setting: %1</b>%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 +757,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 +1004,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;
@@ -2126,6 +2145,21 @@ RCOptionEditor::RCOptionEditor ()
                add_option (_("General"), procs);
        }
 
+       /* Image cache size */
+       add_option (_("General"), new OptionEditorHeading (_("Memory Usage")));
+
+       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 (S_("Options|Undo")));
 
        add_option (_("General"), new UndoOptions (_rc_config));
@@ -2194,19 +2228,34 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("General"), new OptionEditorHeading (_("Tempo")));
 
-       BoolOption* tsf;
-
-       tsf = new BoolOption (
+       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 (tsf->tip_widget(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                                            string_compose (_("<b>When enabled</b> %1 will allow tempo to be expressed in divisions per minute\n"
                                                              "<b>When disabled</b> %1 will only allow tempo to be expressed in quarter notes per minute"),
                                                            PROGRAM_NAME));
-       add_option (_("General"), tsf);
+       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
 
 #ifdef ENABLE_NLS
 
@@ -2254,7 +2303,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)
                );
@@ -2270,16 +2319,16 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
                     ));
 
-if (!Profile->get_mixbus()) {
+       if (!Profile->get_mixbus()) {
 
-       add_option (_("Editor"),
-                   new BoolOption (
-                           "use-mouse-position-as-zoom-focus-on-scroll",
-                           _("Zoom to mouse position when zooming with scroll wheel"),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_mouse_position_as_zoom_focus_on_scroll),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_mouse_position_as_zoom_focus_on_scroll)
-                           ));
-}  // !mixbus
+               add_option (_("Editor"),
+                               new BoolOption (
+                                       "use-mouse-position-as-zoom-focus-on-scroll",
+                                       _("Zoom to mouse position when zooming with scroll wheel"),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_mouse_position_as_zoom_focus_on_scroll),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_mouse_position_as_zoom_focus_on_scroll)
+                                       ));
+       }  // !mixbus
 
        add_option (_("Editor"),
                    new BoolOption (
@@ -2511,25 +2560,20 @@ if (!Profile->get_mixbus()) {
                     ));
 
 
-if (!ARDOUR::Profile->get_mixbus()) {
-       add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
-       add_option (_("Mixer"),
-            new BoolOption (
-                    "link-send-and-route-panner",
-                    _("Link panners of Aux and External Sends with main panner by default"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
-                    ));
-}
-
-
-       /* AUDIO */
-
-       add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
+       if (!ARDOUR::Profile->get_mixbus()) {
+               add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
+               add_option (_("Mixer"),
+                               new BoolOption (
+                                       "link-send-and-route-panner",
+                                       _("Link panners of Aux and External Sends with main panner by default"),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
+                                       ));
+       }
 
-       add_option (_("Audio"), new BufferingOptions (_rc_config));
+       /* Signal Flow */
 
-       add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
+       add_option (_("Signal Flow"), new OptionEditorHeading (_("Monitoring")));
 
        ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
                "monitoring-model",
@@ -2547,64 +2591,75 @@ if (!ARDOUR::Profile->get_mixbus()) {
        mm->add (SoftwareMonitoring, string_compose (_("%1"), prog));
        mm->add (ExternalMonitoring, _("audio hardware"));
 
-       add_option (_("Audio"), mm);
+       add_option (_("Signal Flow"), mm);
 
-       add_option (_("Audio"),
-            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 (_("<b>When enabled</b> %1 will not monitor a track's input if the transport is stopped."),
+                                       PROGRAM_NAME));
 
-       add_option (_("Audio"), new OptionEditorHeading (_("Track and Bus Connections")));
-if (!Profile->get_mixbus()) {
+       if (!Profile->get_mixbus()) {
 
-       add_option (_("Audio"),
-                   new BoolOption (
-                           "auto-connect-standard-busses",
-                           _("Auto-connect master/monitor busses"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_auto_connect_standard_busses),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_auto_connect_standard_busses)
-                           ));
+               add_option (_("Signal Flow"), new OptionEditorHeading (_("Track and Bus Connections")));
 
-       ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
-               "input-auto-connect",
-               _("Connect track inputs"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
-               );
+               add_option (_("Signal Flow"),
+                               new BoolOption (
+                                       "auto-connect-standard-busses",
+                                       _("Auto-connect master/monitor busses"),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_auto_connect_standard_busses),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_auto_connect_standard_busses)
+                                       ));
 
-       iac->add (AutoConnectPhysical, _("automatically to physical inputs"));
-       iac->add (ManualConnect, _("manually"));
+               ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
+                               "input-auto-connect",
+                               _("Connect track inputs"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
+                               );
 
-       add_option (_("Audio"), iac);
+               iac->add (AutoConnectPhysical, _("automatically to physical inputs"));
+               iac->add (ManualConnect, _("manually"));
 
-       ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> (
-               "output-auto-connect",
-               _("Connect track and bus outputs"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_output_auto_connect),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_output_auto_connect)
-               );
+               add_option (_("Signal Flow"), iac);
 
-       oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
-       oac->add (AutoConnectMaster, _("automatically to master bus"));
-       oac->add (ManualConnect, _("manually"));
+               ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> (
+                               "output-auto-connect",
+                               _("Connect track and bus outputs"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_output_auto_connect),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::set_output_auto_connect)
+                               );
 
-       add_option (_("Audio"), oac);
+               oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
+               oac->add (AutoConnectMaster, _("automatically to master bus"));
+               oac->add (ManualConnect, _("manually"));
 
-       bo = new BoolOption (
-                       "strict-io",
-                       _("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 (_("Signal Flow"), oac);
 
-       add_option (_("Audio"), bo);
-       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
-                       _("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
+               bo = new BoolOption (
+                               "strict-io",
+                               _("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)
+                               );
 
-}  // !mixbus
+               add_option (_("Signal Flow"), bo);
+               Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                               _("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
+
+       }  // !mixbus
+
+
+       /* AUDIO */
+
+       add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
+
+       add_option (_("Audio"), new BufferingOptions (_rc_config));
 
        add_option (_("Audio"), new OptionEditorHeading (_("Denormals")));
 
@@ -2698,24 +2753,6 @@ if (!Profile->get_mixbus()) {
                     -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"),
@@ -2898,14 +2935,6 @@ if (!Profile->get_mixbus()) {
 
        add_option (S_("Preferences|Metering"), mpks);
 
-       add_option (S_("Preferences|Metering"),
-            new BoolOption (
-                    "meter-style-led",
-                    _("LED meter style"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_style_led),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_style_led)
-                    ));
-
        add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
 
        add_option (S_("Preferences|Metering"),
@@ -2920,46 +2949,48 @@ if (!Profile->get_mixbus()) {
 
        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 (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
                                                              "when it reaches the current session end marker\n\n"
                                                              "<b>When disabled</b> %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(),
+                       _("<b>When enabled</b> master record will remain engaged when the transport transitions to stop.\n<b>When disabled</b> 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(), _("<b>When enabled</b> 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(), _("<b>When enabled</b> 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(),
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
                        _("<b>When enabled</b> rhis 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<float>* psc = new ComboOption<float> (
                     "preroll-seconds",
@@ -2981,49 +3012,49 @@ if (!Profile->get_mixbus()) {
 
        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(),
                                            (_("<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);
+       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 (_("<b>When enabled</b> 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"
                                                              "<b>When disabled</b> 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 (_("<b>When enabled</b> %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 */
@@ -3134,7 +3165,7 @@ if (!Profile->get_mixbus()) {
                 string_compose (_("<b>When enabled</b> %1 will continue to send LTC information even when the transport (playhead) is not moving"), PROGRAM_NAME));
        add_option (_("Sync/LTC"), _ltc_send_continuously);
 
-       _ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level"),
+       _ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level [dBFS]"),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_output_volume),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_output_volume),
                                        -50, 0, .5, 5,
@@ -3440,7 +3471,7 @@ if (!Profile->get_mixbus()) {
 
        /* 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
@@ -3453,7 +3484,7 @@ if (!Profile->get_mixbus()) {
 
        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
@@ -3465,11 +3496,11 @@ if (!Profile->get_mixbus()) {
                );
 
        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"),
@@ -3477,7 +3508,7 @@ if (!Profile->get_mixbus()) {
                     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"),
@@ -3495,9 +3526,9 @@ if (!Profile->get_mixbus()) {
                        _("<b>When enabled</b> clock displays are updated every Timecode Frame (fps).\n\n"
                                "<b>When disabled</b> 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"),
@@ -3508,41 +3539,10 @@ if (!Profile->get_mixbus()) {
 
 #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)"),
@@ -3550,7 +3550,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
                     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"),
@@ -3558,19 +3558,19 @@ if (!ARDOUR::Profile->get_mixbus()) {
                        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"),
-            new BoolOption (
-                    "show-waveforms",
-                    _("Show waveforms in regions"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms)
-                    ));
-}  // !mixbus
+       if (!Profile->get_mixbus()) {
+               add_option (_("Appearance/Editor"),
+                               new BoolOption (
+                                       "show-waveforms",
+                                       _("Show waveforms in regions"),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms)
+                                       ));
+       }  // !mixbus
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "show-waveforms-while-recording",
                     _("Show waveforms while recording"),
@@ -3578,7 +3578,7 @@ if (!Profile->get_mixbus()) {
                     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"),
@@ -3586,7 +3586,7 @@ if (!Profile->get_mixbus()) {
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
                        ));
 
-       add_option (_("GUI/Editor"), new ClipLevelOptions ());
+       add_option (_("Appearance/Editor"), new ClipLevelOptions ());
 
        ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
                "waveform-scale",
@@ -3598,7 +3598,7 @@ if (!Profile->get_mixbus()) {
        wfs->add (Linear, _("linear"));
        wfs->add (Logarithmic, _("logarithmic"));
 
-       add_option (_("GUI/Editor"), wfs);
+       add_option (_("Appearance/Editor"), wfs);
 
        ComboOption<WaveformShape>* wfsh = new ComboOption<WaveformShape> (
                "waveform-shape",
@@ -3610,11 +3610,11 @@ if (!Profile->get_mixbus()) {
        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"),
@@ -3622,7 +3622,7 @@ if (!Profile->get_mixbus()) {
                     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"),
@@ -3630,7 +3630,25 @@ if (!Profile->get_mixbus()) {
                     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.
@@ -3643,7 +3661,7 @@ if (!Profile->get_mixbus()) {
        _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,
@@ -3652,7 +3670,7 @@ if (!Profile->get_mixbus()) {
                        )
                );
 
-       add_option (_("GUI/Mixer"),
+       add_option (_("Appearance/Mixer"),
             new BoolOption (
                     "default-narrow_ms",
                     _("Use narrow strips in the mixer by default"),
@@ -3660,11 +3678,11 @@ if (!Profile->get_mixbus()) {
                     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-selclock",
                     _("Display Selection Clock"),
@@ -3673,7 +3691,7 @@ if (!Profile->get_mixbus()) {
                     ));
 
        if (!ARDOUR::Profile->get_small_screen()) {
-               add_option (_("GUI/Toolbar"),
+               add_option (_("Appearance/Toolbar"),
                                new BoolOption (
                                        "show-secondary-clock",
                                        _("Display Secondary Clock"),
@@ -3682,7 +3700,7 @@ if (!Profile->get_mixbus()) {
                                        ));
        }
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-mini-timeline",
                     _("Display Navigation Timeline"),
@@ -3690,7 +3708,7 @@ if (!Profile->get_mixbus()) {
                     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"),
@@ -3698,32 +3716,36 @@ if (!Profile->get_mixbus()) {
                     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));
+       quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary\n\
+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));
 
        /* 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),
@@ -3739,7 +3761,7 @@ if (!Profile->get_mixbus()) {
                        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",
@@ -3749,7 +3771,7 @@ if (!Profile->get_mixbus()) {
                        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<string> icon_sets = ::get_icon_sets ();
        if (icon_sets.size() > 1) {
@@ -3761,24 +3783,26 @@ if (!Profile->get_mixbus()) {
                for (vector<string>::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);
+       add_option (_("Appearance/Quirks"), quirks_head);
 
-       add_option (_("GUI/Quirks"),
-            new BoolOption (
+       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 (
@@ -3789,7 +3813,7 @@ if (!Profile->get_mixbus()) {
                        );
        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",
@@ -3799,7 +3823,7 @@ if (!Profile->get_mixbus()) {
                        );
        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()) {
@@ -3811,10 +3835,10 @@ if (!Profile->get_mixbus()) {
                                );
                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")));
@@ -3967,6 +3991,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;