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

Change ScrubBar to ScrubRuler

Browse Source 
This also makes it clearer in the code when we are dealing with a Toolbar ID (for the scrubbing toolbar) and when we are dealing with a button ID (for enabling/disabling the scrub ruler).
This commit is contained in:
James Crook
2016-08-22 12:25:36 +01:00
parent 314648e1f1
commit f9d269bcee
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,9 +242,9 @@ namespace {
&Scrubber::OnSeek, true, &Scrubber::Seeks,
},
{ wxT("ToggleScrubBar"), XO("Scrub Bar"), XO(""),
{ wxT("ToggleScrubRuler"), XO("Scrub Ruler"), XO(""),
AlwaysEnabledFlag,
&Scrubber::OnToggleScrubBar, true, &Scrubber::ShowsBar,
&Scrubber::OnToggleScrubRuler, true, &Scrubber::ShowsBar,
},
};
@@ -556,7 +556,7 @@ void Scrubber::StopScrubbing()
bool Scrubber::ShowsBar() const
{
return mProject->GetRulerPanel()->ShowingScrubBar();
return mProject->GetRulerPanel()->ShowingScrubRuler();
}
bool Scrubber::IsScrubbing() const
@@ -915,9 +915,9 @@ void Scrubber::OnSeek(wxCommandEvent&)
CheckMenuItems();
}
void Scrubber::OnToggleScrubBar(wxCommandEvent&)
void Scrubber::OnToggleScrubRuler(wxCommandEvent&)
{
mProject->GetRulerPanel()->OnToggleScrubBar();
mProject->GetRulerPanel()->OnToggleScrubRuler();
const auto toolbar = mProject->GetToolManager()->GetToolBar(ScrubbingBarID);
toolbar->EnableDisableButtons();
CheckMenuItems();
@@ -928,7 +928,7 @@ enum { CMD_ID = 8000 };
BEGIN_EVENT_TABLE(Scrubber, wxEvtHandler)
EVT_MENU(CMD_ID, Scrubber::OnScrub)
EVT_MENU(CMD_ID + 1, Scrubber::OnSeek)
EVT_MENU(CMD_ID + 2, Scrubber::OnToggleScrubBar)
EVT_MENU(CMD_ID + 2, Scrubber::OnToggleScrubRuler)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(Scrubber::Forwarder, wxEvtHandler)

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

@@ -124,7 +124,7 @@ public:
void OnScrubOrSeek(bool seek);
void OnScrub(wxCommandEvent&);
void OnSeek(wxCommandEvent&);
void OnToggleScrubBar(wxCommandEvent&);
void OnToggleScrubRuler(wxCommandEvent&);
// A string to put in the leftmost part of the status bar
// when scrub or seek is in progress, or else empty.