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

Vary status string (leftmost in the status bar) for the four kinds of scrub.

Browse Source
This commit is contained in:
Paul Licameli
2016-04-24 15:13:03 -04:00
parent 0d5a409e9a
commit 6147705199
4 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,22 +139,43 @@ namespace {
const struct MenuItem {
wxString name;
wxString label;
wxString status;
void (Scrubber::*memFn)();
bool scroll;
bool seek;
const wxString &GetStatus() const { return status; }
} menuItems[] = {
/* i18n-hint: These commands assist the user in finding a sound by ear. ...
"Scrubbing" is variable-speed playback, ...
"Seeking" is normal speed playback but with skips, ...
"Scrolling" keeps the playback position at a fixed place on screen while the waveform moves
*/
{ wxT("Scrub"), XO("&Scrub"), &Scrubber::OnScrub, false, false },
{ wxT("ScrollScrub"), XO("Sc&rolling Scrub"), &Scrubber::OnScrollScrub, true, false },
{ wxT("Seek"), XO("See&k"), &Scrubber::OnSeek, false, true },
{ wxT("ScrollSeek"), XO("Scrollin&g Seek"), &Scrubber::OnScrollSeek, true, true },
{ wxT("Scrub"), XO("&Scrub"), XO("Scrubbing"),
&Scrubber::OnScrub, false, false },
{ wxT("ScrollScrub"), XO("Sc&rolling Scrub"), XO("Scrolling Scrub"),
&Scrubber::OnScrollScrub, true, false },
{ wxT("Seek"), XO("See&k"), XO("Seeking"),
&Scrubber::OnSeek, false, true },
{ wxT("ScrollSeek"), XO("Scrollin&g Seek"), XO("Scrolling Seek"),
&Scrubber::OnScrollSeek, true, true }
};
enum { nMenuItems = sizeof(menuItems) / sizeof(*menuItems) };
inline const MenuItem &FindMenuItem(bool scroll, bool seek)
{
return *std::find_if(menuItems, menuItems + nMenuItems,
[=](const MenuItem &item) {
return scroll == item.scroll &&
seek == item.seek;
}
);
}
}
void Scrubber::MarkScrubStart(
@@ -619,6 +640,24 @@ void Scrubber::OnScrollSeek()
DoScrub(true, true);
}
const wxString &Scrubber::GetUntranslatedStateString() const
{
if (HasStartedScrubbing()) {
auto item = FindMenuItem(mSmoothScrollingScrub, mAlwaysSeeking);
return item.status;
}
else return {};
}
std::vector<wxString> Scrubber::GetAllUntranslatedStatusStrings()
{
using namespace std;
vector<wxString> results;
transform(menuItems, menuItems + nMenuItems, back_inserter(results),
mem_fun_ref(&MenuItem::GetStatus));
return move(results);
}
void Scrubber::AddMenuItems()
{
auto cm = mProject->GetCommandManager();
@@ -644,13 +683,8 @@ void Scrubber::UncheckAllMenuItems()
void Scrubber::CheckMenuItem()
{
if(HasStartedScrubbing()) {
auto &item = *std::find_if(menuItems, menuItems + nMenuItems,
[=](const MenuItem &item) {
return mSmoothScrollingScrub == item.scroll &&
mAlwaysSeeking == item.seek;
}
);
auto cm = mProject->GetCommandManager();
auto item = FindMenuItem(mSmoothScrollingScrub, mAlwaysSeeking);
cm->Check(item.name, true);
}
}

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

@@ -11,6 +11,7 @@ Paul Licameli split from TrackPanel.cpp
#ifndef __AUDACITY_SCRUBBING__
#define __AUDACITY_SCRUBBING__
#include <vector>
#include <wx/event.h>
#include <wx/longlong.h>
@@ -68,6 +69,12 @@ public:
void OnSeek();
void OnScrollSeek();
// A string to put in the leftmost part of the status bar.
const wxString &GetUntranslatedStateString() const;
// All possible status strings.
static std::vector<wxString> GetAllUntranslatedStatusStrings();
private:
void DoScrub(bool scroll, bool seek);
void OnActivateOrDeactivateApp(wxActivateEvent & event);