make knob respond to X & Y axis drags

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 84bdcf84fbcbdb4b3218c919b3608c3b735c29d3..2e42e0bad5a7efa9735610e548371abf3a2a5820 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -541,7 +541,7 @@ public:
        {
                _dpi_adjustment.set_value (_ui_config->get_font_scale() / 1024.);
 
-               Label* l = manage (new Label (_("Font scaling:")));
+               Label* l = manage (new Label (_("GUI and Font scaling:")));
                l->set_name ("OptionsLabel");
 
                 const Glib::ustring dflt = _("Default");
@@ -570,7 +570,7 @@ public:
 
                _box->pack_start (*h, false, false);
 
-               set_note (_("Major font-scale changes require an application restart to re-layout."));
+               set_note (_("Adjusting the scale require an application restart to re-layout."));
 
                _dpi_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &FontScalingOptions::dpi_changed));
        }
@@ -1523,7 +1523,7 @@ RCOptionEditor::RCOptionEditor ()
 
        _sync_genlock = new BoolOption (
                "timecode-source-is-synced",
-               _("Sync lock timecode to clock - Disable drift compensation."),
+               _("Sync-lock timecode to clock (disable drift compensation)"),
                sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
                );
@@ -1532,8 +1532,8 @@ RCOptionEditor::RCOptionEditor ()
                 string_compose (_("<b>When enabled</b> %1 will never varispeed when slaved to external timecode. "
                                   "Sync Lock indicates that the selected external timecode source shares clock-sync "
                                   "(Black &amp; Burst, Wordclock, etc) with the audio interface. "
-                                  "This option disables drift compensation. The transport speed is fixed at 1.0."
-                                  "Varispeed LTC will be ignored and cause drift."
+                                  "This option disables drift compensation. The transport speed is fixed at 1.0. "
+                                  "Vari-speed LTC will be ignored and cause drift."
                                   "\n\n"
                                   "<b>When disabled</b> %1 will compensate for potential drift, regardless if the "
                                   "timecode sources shares clock sync."
@@ -1754,14 +1754,6 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_ui_config, &UIConfiguration::set_update_editor_during_summary_drag)
                            ));
 
-       add_option (_("Editor"),
-            new BoolOption (
-                    "link-editor-and-mixer-selection",
-                    _("Synchronise editor and mixer selection"),
-                    sigc::mem_fun (*_ui_config, &UIConfiguration::get_link_editor_and_mixer_selection),
-                    sigc::mem_fun (*_ui_config, &UIConfiguration::set_link_editor_and_mixer_selection)
-                    ));
-
        bo = new BoolOption (
                     "name-new-markers",
                     _("Name new markers"),