new logic for enabling translation in bundled releases of ardour
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 6aea36168f9c64c939eecb993ceb090facaac3af..859eedb822989a9a8145f7d5577daef255b558e9 100644 (file)
@@ -26,6 +26,7 @@
 #include <gtkmm/scale.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/slider_controller.h>
+#include <gtkmm2ext/gtk_ui.h>
 
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
@@ -65,22 +66,20 @@ public:
                Table* t = manage (new Table (2, 3));
                t->set_spacings (4);
 
-               Label* l = manage (new Label (_("Click audio file:")));
-               l->set_alignment (0, 0.5);
+               Label* l = manage (left_aligned_label (_("Click audio file:")));
                t->attach (*l, 0, 1, 0, 1, FILL);
                t->attach (_click_path_entry, 1, 2, 0, 1, FILL);
                Button* b = manage (new Button (_("Browse...")));
                b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
                t->attach (*b, 2, 3, 0, 1, FILL);
 
-               l = manage (new Label (_("Click emphasis audio file:")));
-               l->set_alignment (0, 0.5);
+               l = manage (left_aligned_label (_("Click emphasis audio file:")));
                t->attach (*l, 0, 1, 1, 2, FILL);
                t->attach (_click_emphasis_path_entry, 1, 2, 1, 2, FILL);
                b = manage (new Button (_("Browse...")));
                b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
                t->attach (*b, 2, 3, 1, 2, FILL);
-
+               
                _box->pack_start (*t, false, false);
 
                _click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));      
@@ -106,10 +105,7 @@ private:
 
        void click_browse_clicked ()
        {
-               SoundFileChooser sfdb (*_parent, _("Choose Click"));
-
-               sfdb.show_all ();
-               sfdb.present ();
+               SoundFileChooser sfdb (_("Choose Click"));
 
                if (sfdb.run () == RESPONSE_OK) {
                        click_chosen (sfdb.get_filename());
@@ -129,7 +125,7 @@ private:
        
        void click_emphasis_browse_clicked ()
        {
-               SoundFileChooser sfdb (*_parent, _("Choose Click Emphasis"));
+               SoundFileChooser sfdb (_("Choose Click Emphasis"));
 
                sfdb.show_all ();
                sfdb.present ();
@@ -171,16 +167,14 @@ public:
                _limit_undo_spin.set_range (0, 512);
                _limit_undo_spin.set_increments (1, 10);
                t->attach (_limit_undo_spin, 1, 2, 0, 1, FILL | EXPAND);
-               Label* l = manage (new Label (_("commands")));
-               l->set_alignment (0, 0.5);
+               Label* l = manage (left_aligned_label (_("commands")));
                t->attach (*l, 2, 3, 0, 1);
 
                t->attach (_save_undo_button, 0, 1, 1, 2, FILL);
                _save_undo_spin.set_range (0, 512);
                _save_undo_spin.set_increments (1, 10);
                t->attach (_save_undo_spin, 1, 2, 1, 2, FILL | EXPAND);
-               l = manage (new Label (_("commands")));
-               l->set_alignment (0, 0.5);
+               l = manage (left_aligned_label (_("commands")));
                t->attach (*l, 2, 3, 1, 2);
 
                _box->pack_start (*t);
@@ -302,7 +296,7 @@ public:
 
                vector<string> dumb;
                for (int i = 0; modifiers[i].name; ++i) {
-                       dumb.push_back (_(modifiers[i].name));
+                       dumb.push_back (S_(modifiers[i].name));
                }
 
                set_popdown_strings (_edit_modifier_combo, dumb);
@@ -310,9 +304,7 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
-                               string lookup_str = "key|";
-                               lookup_str += modifiers[x].name;
-                               _edit_modifier_combo.set_active_text (S_(lookup_str.c_str()));
+                               _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
@@ -320,9 +312,8 @@ public:
                Table* t = manage (new Table (4, 4));
                t->set_spacings (4);
 
-               Label* l = manage (new Label (_("Edit using:")));
+               Label* l = manage (left_aligned_label (_("Edit using:")));
                l->set_name ("OptionsLabel");
-               l->set_alignment (0, 0.5);
 
                t->attach (*l, 0, 1, 0, 1, FILL | EXPAND, FILL);
                t->attach (_edit_modifier_combo, 1, 2, 0, 1, FILL | EXPAND, FILL);
@@ -342,14 +333,13 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
-                               _delete_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
 
-               l = manage (new Label (_("Delete using:")));
+               l = manage (left_aligned_label (_("Delete using:")));
                l->set_name ("OptionsLabel");
-               l->set_alignment (0, 0.5);
 
                t->attach (*l, 0, 1, 1, 2, FILL | EXPAND, FILL);
                t->attach (_delete_modifier_combo, 1, 2, 1, 2, FILL | EXPAND, FILL);
@@ -370,14 +360,13 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
-                               _insert_note_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
 
-               l = manage (new Label (_("Insert note using:")));
+               l = manage (left_aligned_label (_("Insert note using:")));
                l->set_name ("OptionsLabel");
-               l->set_alignment (0, 0.5);
 
                t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL);
                t->attach (_insert_note_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL);
@@ -398,14 +387,13 @@ public:
 
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
-                               _snap_modifier_combo.set_active_text (_(modifiers[x].name));
+                               _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
                                break;
                        }
                }
 
-               l = manage (new Label (_("Toggle snap using:")));
+               l = manage (left_aligned_label (_("Ignore snap using:")));
                l->set_name ("OptionsLabel");
-               l->set_alignment (0, 0.5);
 
                t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
                t->attach (_snap_modifier_combo, 1, 2, 3, 4, FILL | EXPAND, FILL);
@@ -420,9 +408,8 @@ public:
                _keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
                _keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed));
 
-               l = manage (new Label (_("Keyboard layout:")));
+               l = manage (left_aligned_label (_("Keyboard layout:")));
                l->set_name ("OptionsLabel");
-               l->set_alignment (0, 0.5);
 
                t->attach (*l, 0, 1, 4, 5, FILL | EXPAND, FILL);
                t->attach (_keyboard_layout_selector, 1, 2, 4, 5, FILL | EXPAND, FILL);
@@ -542,7 +529,7 @@ public:
                _dpi_adjustment (50, 50, 250, 1, 10),
                _dpi_slider (_dpi_adjustment)
        {
-               _dpi_adjustment.set_value (_rc_config->get_font_scale () / 1024);
+               _dpi_adjustment.set_value (floor (_rc_config->get_font_scale () / 1024));
 
                Label* l = manage (new Label (_("Font scaling:")));
                l->set_name ("OptionsLabel");
@@ -561,7 +548,7 @@ public:
        void parameter_changed (string const & p)
        {
                if (p == "font-scale") {
-                       _dpi_adjustment.set_value (_rc_config->get_font_scale() / 1024);
+                       _dpi_adjustment.set_value (floor (_rc_config->get_font_scale() / 1024));
                }
        }
 
@@ -680,7 +667,11 @@ public:
                _box->pack_start (*label, false, false);
                label->show ();
 
-               _store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::model_changed));
+               ControlProtocolManager& m = ControlProtocolManager::instance ();
+               m.ProtocolStatusChange.connect (protocol_status_connection, MISSING_INVALIDATOR,
+                                               boost::bind (&ControlSurfacesOptions::protocol_status_changed, this, _1), gui_context());
+
+               _store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::view_changed));
                _view.signal_button_press_event().connect_notify (sigc::mem_fun(*this, &ControlSurfacesOptions::edit_clicked));
        }
 
@@ -708,7 +699,18 @@ public:
 
 private:
 
-       void model_changed (TreeModel::Path const &, TreeModel::iterator const & i)
+        void protocol_status_changed (ControlProtocolInfo* cpi) {
+               /* find the row */
+               TreeModel::Children rows = _store->children();
+               for (TreeModel::Children::iterator x = rows.begin(); x != rows.end(); ++x) {
+                       if ((*x)[_model.protocol_info] == cpi) {
+                               (*x)[_model.enabled] = (cpi->protocol || cpi->requested);
+                               break;
+                       }
+               }
+       }
+
+       void view_changed (TreeModel::Path const &, TreeModel::iterator const & i)
        {
                TreeModel::Row r = *i;
 
@@ -724,7 +726,18 @@ private:
                        if (!was_enabled) {
                                ControlProtocolManager::instance().instantiate (*cpi);
                        } else {
+                               Gtk::Window* win = r[_model.editor];
+                               if (win) {
+                                       win->hide ();
+                               }
+
                                ControlProtocolManager::instance().teardown (*cpi);
+                                       
+                               if (win) {
+                                       delete win;
+                               }
+                               r[_model.editor] = 0;
+                               cpi->requested = false;
                        }
                }
 
@@ -759,6 +772,7 @@ private:
                                if (box) {
                                        string title = row[_model.name];
                                        ArdourWindow* win = new ArdourWindow (_parent, title);
+                                       win->set_title ("Control Protocol Options");
                                        win->add (*box);
                                        box->show ();
                                        win->present ();
@@ -792,6 +806,7 @@ private:
        ControlSurfacesModelColumns _model;
        TreeView _view;
         Gtk::Window& _parent;
+        PBD::ScopedConnection protocol_status_connection;
 };
 
 /** A class which allows control of visibility of some editor components usign
@@ -836,6 +851,8 @@ public:
                add_widget_to_page (p, _visibility_group->list_view ());
        }
 
+        Gtk::Widget& tip_widget() { return *_visibility_group->list_view (); }
+
 private:
        void changed ()
        {
@@ -861,6 +878,7 @@ RCOptionEditor::RCOptionEditor ()
        /* MISC */
 
         uint32_t hwcpus = hardware_concurrency ();
+       BoolOption* bo;
 
         if (hwcpus > 1) {
                 add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization")));
@@ -879,6 +897,8 @@ RCOptionEditor::RCOptionEditor ()
                         procs->add (i, string_compose (_("%1 processors"), i));
                 }
 
+               procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME));
+
                 add_option (_("Misc"), procs);
         }
 
@@ -902,7 +922,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
                     ));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Misc")));
+       add_option (_("Misc"), new OptionEditorHeading (_("Session Management")));
 
        add_option (_("Misc"),
             new BoolOption (
@@ -919,83 +939,230 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
                            ));
 
+       add_option (_("Misc"),
+            new SpinOption<uint32_t> (
+                    "max-recent-sessions",
+                    _("Maximum number of recent sessions"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions),
+                    0, 1000, 1, 20
+                    ));
+
        add_option (_("Misc"), new OptionEditorHeading (_("Click")));
 
        add_option (_("Misc"), new ClickOptions (_rc_config, this));
 
+       add_option (_("Misc"),
+            new FaderOption (
+                    "click-gain",
+                    _("Click gain level"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
+                    ));
+
+       add_option (_("Misc"), new OptionEditorHeading (_("Automation")));
+
+       add_option (_("Misc"),
+            new SpinOption<double> (
+                    "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 (_("Misc"),
+            new SpinOption<double> (
+                    "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
+                    ));
+
        /* TRANSPORT */
 
-       add_option (_("Transport"),
-            new BoolOption (
+       BoolOption* tsf;
+
+       tsf = 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)
-                    ));
+                    );
+       // Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _(""));
+       add_option (_("Transport"), tsf);
 
-       add_option (_("Transport"),
-            new BoolOption (
+       tsf = 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(), _("<b>When enabled</b> Ardour will stop recording if an over- or underrun is detected by the audio engine"));
+       add_option (_("Transport"), tsf);
 
-       add_option (_("Transport"),
-            new BoolOption (
+       tsf = 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)
-                    ));
+                    );
+       // Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _(""));
+       add_option (_("Transport"), tsf);
 
-       add_option (_("Transport"),
-            new BoolOption (
+       tsf = 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(), _("<b>When enabled</b> if Ardour is <b>not recording</b>, it will stop the transport "
+                                                  "when it reaches the current session end marker\n\n"
+                                                  "<b>When disabled</b> Ardour will continue to roll past the session end marker at all times"));
+       add_option (_("Transport"), tsf);
 
-       add_option (_("Transport"),
-            new BoolOption (
+       tsf = new BoolOption (
                     "seamless-loop",
                     _("Do seamless looping (not possible when slaved to MTC, JACK etc)"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
-                    ));
-
-       add_option (_("Transport"),
-            new BoolOption (
-                    "primary-clock-delta-edit-cursor",
-                    _("Primary clock delta to edit cursor"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_primary_clock_delta_edit_cursor),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_primary_clock_delta_edit_cursor)
-                    ));
-
-       add_option (_("Transport"),
-            new BoolOption (
-                    "secondary-clock-delta-edit-cursor",
-                    _("Secondary clock delta to edit cursor"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_secondary_clock_delta_edit_cursor),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_secondary_clock_delta_edit_cursor)
-                    ));
-
-       add_option (_("Transport"),
-            new BoolOption (
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<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 Ardour reaches the end "
+                                                  "which will often cause a small click or delay"));
+       add_option (_("Transport"), tsf);
+
+       tsf = 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);
 
-       add_option (_("Transport"),
-            new BoolOption (
+       tsf = 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(), _("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"), new OptionEditorHeading (S_("Sync/Slave")));
+
+       _sync_source = new ComboOption<SyncSource> (
+               "sync-source",
+               _("External timecode source"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_source),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source)
+               );
+
+       populate_sync_options ();
+       add_option (_("Transport"), _sync_source);
+
+       _sync_framerate = new BoolOption (
+                    "timecode-sync-frame-rate",
+                    _("Match session video frame rate to external timecode"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip 
+               (_sync_framerate->tip_widget(),
+                _("This option controls the value of the video frame rate <i>while chasing</i> an external timecode source.\n\n"
+                  "<b>When enabled</b> the session video frame rate will be changed to match that of the selected external timecode source.\n\n"
+                  "<b>When disabled</b> the session video frame rate will not be changed to match that of the selected external timecode source."
+                  "Instead the frame rate indication in the main clock will flash red and Ardour will convert between the external "
+                  "timecode standard and the session standard."));
+
+       add_option (_("Transport"), _sync_framerate);
+
+       _sync_genlock = new BoolOption (
+               "timecode-source-is-synced",
+               _("External timecode is sync locked"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
+               );
+       Gtkmm2ext::UI::instance()->set_tip 
+               (_sync_genlock->tip_widget(), 
+                _("<b>When enabled</b> indicates that the selected external timecode source shares sync (Black &amp; Burst, Wordclock, etc) with the audio interface."));
+
+
+       add_option (_("Transport"), _sync_genlock);
+
+       _sync_source_2997 = new BoolOption (
+               "timecode-source-2997",
+               _("Lock to 29.9700 fps instead of 30000/1001"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_2997),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_2997)
+               );
+       Gtkmm2ext::UI::instance()->set_tip
+               (_sync_source_2997->tip_widget(),
+                _("<b>When enabled</b> the external timecode source is assumed to use 29.97 fps instead of 30000/1001.\n"
+                        "SMPTE 12M-1999 specifies 29.97df as 30000/1001. The spec further mentions that "
+                        "drop-frame timecode has an accumulated error of -86ms over a 24-hour period.\n"
+                        "Drop-frame timecode would compensate exactly for a NTSC color frame rate of 30 * 0.9990 (ie 29.970000). "
+                        "That is not the actual rate. However, some vendors use that rate - despite it being against the specs - "
+                        "because the variant of using exactly 29.97 fps has zero timecode drift.\n"
+                        ));
+
+       add_option (_("Transport"), _sync_source_2997);
+
+       add_option (_("Transport"), new OptionEditorHeading (S_("LTC Reader")));
+
+       _ltc_port = new ComboStringOption (
+               "ltc-source-port",
+               _("LTC incoming port"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_source_port),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_source_port)
+               );
+
+       vector<string> physical_inputs;
+       physical_inputs.push_back (_("None"));
+       AudioEngine::instance()->get_physical_inputs (DataType::AUDIO, physical_inputs);
+       _ltc_port->set_popdown_strings (physical_inputs);
+
+       add_option (_("Transport"), _ltc_port);
+
+       // TODO; rather disable this button than not compile it..
+       add_option (_("Transport"), new OptionEditorHeading (S_("LTC Generator")));
+
+       add_option (_("Transport"),
+                   new BoolOption (
+                           "send-ltc",
+                           _("Enable LTC generator"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_send_ltc),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_ltc)
+                           ));
+
+       _ltc_send_continuously = new BoolOption (
+                           "ltc-send-continuously",
+                           _("send LTC while stopped"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_send_continuously),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_send_continuously)
+                           );
+       Gtkmm2ext::UI::instance()->set_tip
+               (_ltc_send_continuously->tip_widget(),
+                _("<b>When enabled</b> Ardour will continue to send LTC information even when the transport (playhead) is not moving"));
+       add_option (_("Transport"), _ltc_send_continuously);
+
+  _ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5);
+       _ltc_volume_adjustment->set_value (20 * log10(_rc_config->get_ltc_output_volume()));
+       _ltc_volume_adjustment->signal_value_changed().connect (sigc::mem_fun (*this, &RCOptionEditor::ltc_generator_volume_changed));
+       _ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level"), *_ltc_volume_adjustment);
+
+       Gtkmm2ext::UI::instance()->set_tip
+               (_ltc_volume_slider->tip_widget(),
+                _("Specify the Peak Volume of the generated LTC signal in dbFS. A good value is  0dBu ^= -18dbFS in an EBU calibrated system"));
+
+       add_option (_("Transport"), _ltc_volume_slider);
+       parameter_changed ("send-ltc");
+
+       parameter_changed ("sync-source");
 
        /* EDITOR */
 
@@ -1023,13 +1190,19 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters)
                     ));
 
-       add_option (_("Editor"),
-            new BoolOption (
+       bo = new BoolOption (
                     "use-overlap-equivalency",
                     _("Use overlap equivalency for regions"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency)
-                    ));
+                    );
+
+       add_option (_("Editor"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), 
+                                           string_compose (_("When extending region selection across a group, %1 must decide which regions are equivalent"
+                                                             "\n\nIf enabled, regions are considered \"equivalent\" if they overlap on the timeline."
+                                                             "\n\nIf disabled, regions are considered \"equivalent\" only if have the same start time, length and position"),
+                                                           PROGRAM_NAME));
 
        add_option (_("Editor"),
             new BoolOption (
@@ -1047,6 +1220,16 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms)
                     ));
 
+       add_option (_("Editor"),
+            new BoolComboOption (
+                    "show-region-gain-envelopes",
+                    _("Show gain envelopes in audio regions"),
+                    _("in all modes"),
+                    _("only in region gain mode"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_region_gain),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_region_gain)
+                    ));
+
        ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
                "waveform-scale",
                _("Waveform scale"),
@@ -1119,13 +1302,24 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_editor_and_mixer_selection)
                     ));
 
-       add_option (_("Editor"),
-            new BoolOption (
+       bo = new BoolOption (
                     "name-new-markers",
                     _("Name new markers"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
-                    ));
+               );
+       
+       add_option (_("Editor"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("If enabled, popup a dialog when a new marker is created to allow its name to be set as it is created."
+                                                               "\n\nYou can always rename markers by right-clicking on them"));
+
+       add_option (_("Editor"),
+           new BoolOption (
+                   "autoscroll-editor",
+                   _("Auto-scroll editor window when dragging near its edges"),
+                   sigc::mem_fun (*_rc_config, &RCConfiguration::get_autoscroll_editor),
+                   sigc::mem_fun (*_rc_config, &RCConfiguration::set_autoscroll_editor)
+                   ));
 
        /* AUDIO */
 
@@ -1244,19 +1438,11 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Audio"),
             new BoolOption (
                     "plugins-stop-with-transport",
-                    _("Stop plugins when the transport is stopped"),
+                    _("Silence plugins when the transport is stopped"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
                     ));
 
-       add_option (_("Audio"),
-            new BoolOption (
-                    "do-not-record-plugins",
-                    _("Disable plugins during recording"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_do_not_record_plugins),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_do_not_record_plugins)
-                    ));
-
        add_option (_("Audio"),
             new BoolOption (
                     "new-plugins-active",
@@ -1488,8 +1674,27 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_never_display_periodic_midi)
                     ));
 
+       add_option (_("MIDI"),
+            new BoolOption (
+                    "sound-midi-notes",
+                    _("Sound MIDI notes as they are selected"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_sound_midi_notes),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_sound_midi_notes)
+                    ));
+
        /* USER INTERACTION */
 
+       if (getenv ("ARDOUR_BUNDLED")) {
+               add_option (_("User interaction"), 
+                           new BoolOption (
+                                   "enable-translation",
+                                   string_compose (_("Use translations of %1 messages\n"
+                                                     "   <i>(requires a restart of %1 to take effect)</i>\n"
+                                                     "   <i>(if available for your language preferences)</i>"), PROGRAM_NAME),
+                                   sigc::ptr_fun (ARDOUR::translations_are_enabled),
+                                   sigc::ptr_fun (ARDOUR::set_translations_enabled)));
+       }
+
        add_option (_("User interaction"), new OptionEditorHeading (_("Keyboard")));
 
        add_option (_("User interaction"), new KeyboardOptions);
@@ -1513,18 +1718,33 @@ RCOptionEditor::RCOptionEditor ()
 
        /* INTERFACE */
 
-       add_option (S_("Visual|Interface"),
+       add_option (S_("GUI"),
             new BoolOption (
-                    "widget_prelight",
+                    "widget-prelight",
                     _("Graphically indicate mouse pointer hovering over various widgets"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_widget_prelight),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
                     ));
 
+       add_option (S_("GUI"),
+            new BoolOption (
+                    "use-tooltips",
+                    _("Show tooltips if mouse hovers over a control"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_tooltips),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_tooltips)
+                    ));
+
 #ifndef GTKOSX
        /* font scaling does nothing with GDK/Quartz */
-       add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config));
+       add_option (S_("GUI"), new FontScalingOptions (_rc_config));
 #endif
+       add_option (S_("GUI"),
+                   new BoolOption (
+                           "use-own-plugin-gui",
+                           _("Use plugins' own interfaces instead of Ardour's"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
+                           ));
 
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
@@ -1533,11 +1753,10 @@ RCOptionEditor::RCOptionEditor ()
        _mixer_strip_visibility.add (0, X_("SoloSafe"), _("Solo Safe"));
        _mixer_strip_visibility.add (0, X_("SoloIsolated"), _("Solo Isolated"));
        _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
-       _mixer_strip_visibility.add (0, X_("Group"), _("Group"));
        _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
        
        add_option (
-               S_("Visual|Interface"),
+               S_("GUI"),
                new VisibilityOption (
                        _("Mixer Strip"),
                        &_mixer_strip_visibility,
@@ -1546,15 +1765,15 @@ RCOptionEditor::RCOptionEditor ()
                        )
                );
 
-       add_option (S_("Visual|Interface"),
+       add_option (S_("GUI"),
             new BoolOption (
                     "default-narrow_ms",
-                    _("Use narrow mixer strips by default"),
+                    _("Use narrow strips in the mixer by default"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
                     ));
 
-       add_option (S_("Visual|Interface"), new OptionEditorHeading (_("Metering")));
+       add_option (S_("GUI"), new OptionEditorHeading (_("Metering")));
 
        ComboOption<float>* mht = new ComboOption<float> (
                "meter-hold",
@@ -1568,7 +1787,7 @@ RCOptionEditor::RCOptionEditor ()
        mht->add (MeterHoldMedium, _("medium"));
        mht->add (MeterHoldLong, _("long"));
 
-       add_option (S_("Visual|Interface"), mht);
+       add_option (S_("GUI"), mht);
 
        ComboOption<float>* mfo = new ComboOption<float> (
                "meter-falloff",
@@ -1585,7 +1804,7 @@ RCOptionEditor::RCOptionEditor ()
        mfo->add (METER_FALLOFF_FASTER, _("faster"));
        mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
 
-       add_option (S_("Visual|Interface"), mfo);
+       add_option (S_("GUI"), mfo);
 }
 
 void
@@ -1601,5 +1820,43 @@ RCOptionEditor::parameter_changed (string const & p)
                }
                _solo_control_is_listen_control->set_sensitive (s);
                _listen_position->set_sensitive (s);
+       } else if (p == "sync-source") {
+               _sync_source->set_sensitive (true);
+               if (_session) {
+                       _sync_source->set_sensitive (!_session->config.get_external_sync());
+               }
+               switch(Config->get_sync_source()) {
+               case ARDOUR::MTC:
+               case ARDOUR::LTC:
+                       _sync_genlock->set_sensitive (true);
+                       _sync_framerate->set_sensitive (true);
+                       _sync_source_2997->set_sensitive (true);
+                       break;
+               default:
+                       _sync_genlock->set_sensitive (false);
+                       _sync_framerate->set_sensitive (false);
+                       _sync_source_2997->set_sensitive (false);
+                       break;
+               }
+       } else if (p == "send-ltc") {
+               bool const s = Config->get_send_ltc ();
+               _ltc_send_continuously->set_sensitive (s);
+               _ltc_volume_slider->set_sensitive (s);
+       }
+}
+
+void RCOptionEditor::ltc_generator_volume_changed () {
+       _rc_config->set_ltc_output_volume (pow(10, _ltc_volume_adjustment->get_value() / 20));
+}
+
+void
+RCOptionEditor::populate_sync_options ()
+{
+       vector<SyncSource> sync_opts = ARDOUR::get_available_sync_options ();
+
+       _sync_source->clear ();
+
+       for (vector<SyncSource>::iterator i = sync_opts.begin(); i != sync_opts.end(); ++i) {
+               _sync_source->add (*i, sync_source_to_string (*i));
        }
 }