From 0d86890657f48032cfd09a9a906bbf1ffc23ff5e Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Sun, 24 May 2015 17:57:51 -0400
Subject: [PATCH] Bug968 status bar and mouse preference messages updated for
 new scrub UI...

... Note too that the mouse preference message for old ctrl-click behavior
is now removed
---
 src/prefs/MousePrefs.cpp      | 15 +++------------
 src/toolbars/ToolsToolBar.cpp | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp
index 9f25fb011..00b1a5443 100644
--- a/src/prefs/MousePrefs.cpp
+++ b/src/prefs/MousePrefs.cpp
@@ -104,13 +104,12 @@ void MousePrefs::CreateList()
    AddItem(_("Left-Drag"),         _("Select"),   _("Set Selection Range"));
    AddItem(_("Shift-Left-Click"),  _("Select"),   _("Extend Selection Range"));
    AddItem(_("Left-Double-Click"), _("Select"),   _("Select Clip or Entire Track"));
-   AddItem(_("Ctrl-Left-Click"),   _("Select"),   _("Set Selection Point and Play"));
 #ifdef EXPERIMENTAL_SCRUBBING_BASIC
-   AddItem(_("Middle-Drag"),              _("Select"), _("Scrub"));
-   AddItem(_("Shift-Middle-Drag"),        _("Select"), _("Seek"));
+   AddItem(_("Ctrl-Left-Click"),   _("Select"), _("Scrub"));
+   AddItem(_("Shift-Ctrl-Left-Click"), _("Select"), _("Seek"));
 #endif
 #ifdef EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL
-   AddItem(_("Middle-Double-Click-Drag"), _("Select"), _("Smooth Scrolling Scrub"));
+   AddItem(_("Shift-Left-Double-Click"), _("Select"), _("Smooth Scrolling Scrub"));
    AddItem(_("Wheel-Rotate"),      _("Select"),   _("Change maximum scrub speed"));
 #endif
 
@@ -144,14 +143,6 @@ void MousePrefs::CreateList()
 
    AddItem(_("Left-Click"),       _("Multi"),     _("Set Selection Point"), _("same as select tool"));
    AddItem(_("Left-Drag"),        _("Multi"),     _("Set Selection Range"), _("same as select tool"));
-#ifdef EXPERIMENTAL_SCRUBBING_BASIC
-   AddItem(_("Middle-Drag"),                    _("Select"), _("Scrub"), _("same as select tool"));
-   AddItem(_("Shift-Middle-Drag"),              _("Select"), _("Seek"), _("same as select tool"));
-#endif
-#ifdef EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL
-   AddItem(_("Middle-Double-Click-Drag"), _("Select"), _("Smooth Scrolling Scrub"), _("same as select tool"));
-   AddItem(_("Wheel-Rotate"),      _("Select"),   _("Change maximum scrub speed"), _("same as select tool"));
-#endif
    AddItem(_("Right-Click"),      _("Multi"),     _("Zoom out one step"),   _("same as zoom tool"));
    AddItem(_("Right-Drag"),       _("Multi"),     _("Zoom in on a Range"),  _("same as zoom tool"));
 
diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp
index 2ce2757ba..8a48f8a45 100644
--- a/src/toolbars/ToolsToolBar.cpp
+++ b/src/toolbars/ToolsToolBar.cpp
@@ -80,12 +80,22 @@ ToolsToolBar::ToolsToolBar()
    wxASSERT( drawTool     == drawTool     - firstTool );
    wxASSERT( multiTool    == multiTool    - firstTool );
 
+   {
 #ifdef EXPERIMENTAL_SCRUBBING_BASIC
-   mMessageOfTool[selectTool] =
-      _("Click and drag to select audio, Middle-Click and drag to scrub, Shift-Middle-Click and drag to seek");
+
+      mMessageOfTool[selectTool] =
+#if defined(__WXMAC__)
+         _("Click and drag to select audio, Command-Click and drag to scrub, Shift-Command-Click and drag to seek")
 #else
-   mMessageOfTool[selectTool] = _("Click and drag to select audio");
+         _("Click and drag to select audio, Ctrl-Click and drag to scrub, Shift-Ctrl-Click and drag to seek")
 #endif
+         ;
+
+#else
+      mMessageOfTool[selectTool] = _("Click and drag to select audio");
+#endif
+   }
+
    mMessageOfTool[envelopeTool] = _("Click and drag to edit the amplitude envelope");
    mMessageOfTool[drawTool] = _("Click and drag to edit the samples");
 #if defined( __WXMAC__ )