Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-04 08:04:06 +01:00
Code Issues Releases Wiki Activity

Merge: Bug968 status bar and mouse preference messages updated for new scrub UI...

Browse Source
This commit is contained in:
Paul Licameli
2015-05-24 18:00:08 -04:00
parent 4ba7a82ec9 0d86890657
commit 9c7c4186f6
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/prefs/MousePrefs.cpp
View File

@@ -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"));

16
src/toolbars/ToolsToolBar.cpp
View File

@@ -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__ )