Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-10 00:51:13 +02:00
Code Issues Releases Wiki Activity

Bug 1053 - [Scrub Phase I] Status Bar messages incomplete for scrub started with menu or shortcut.

Browse Source
This commit is contained in:
James Crook 2016-08-10 21:57:29 +01:00
parent 48ad701e57
commit 5939fe66e8
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TrackPanel.cpp
View File

@ -1730,7 +1730,9 @@ void TrackPanel::HandleCursor(const wxMouseEvent & event)
// practice (on a P500).
int tool = DetermineToolToUse( ttb, event );
tip = ttb->GetMessageForTool(tool);
tip = GetProject()->GetScrubber().StatusMessageForWave();
if( tip.IsEmpty() )
tip = ttb->GetMessageForTool(tool);
if( tool != selectTool )
{

14
src/tracks/ui/Scrubbing.cpp
View File

@ -948,6 +948,20 @@ const wxString &Scrubber::GetUntranslatedStateString() const
return empty;
}
const wxString & Scrubber::StatusMessageForWave() const
{
static wxString result;
result = "";
if( Seeks() )
result = _("Move mouse pointer to Seek");
else if( Scrubs() )
result = _("Move mouse pointer to Scrub");
return result;
}
std::vector<wxString> Scrubber::GetAllUntranslatedStatusStrings()
{
using namespace std;

1
src/tracks/ui/Scrubbing.h
View File

@ -129,6 +129,7 @@ public:
// A string to put in the leftmost part of the status bar
// when scrub or seek is in progress, or else empty.
const wxString &GetUntranslatedStateString() const;
const wxString &StatusMessageForWave() const;
// All possible status strings.
static std::vector<wxString> GetAllUntranslatedStatusStrings();