Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-20 01:21:16 +02:00
Code Issues Releases Wiki Activity

Move menu handling functions out of class AudacityProject

Browse Source
This commit is contained in:
Paul Licameli
2017-08-20 00:16:22 -04:00
parent 3ed43a9f12
commit 9481587fa8
30 changed files with 2949 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/MultiDialog.cpp
View File

@@ -153,7 +153,7 @@ void MultiDialog::OnOK(wxCommandEvent & WXUNUSED(event))
void MultiDialog::OnShowLog(wxCommandEvent & WXUNUSED(event))
{
auto project = GetActiveProject();
project->OnShowLog(*project);
GetMenuCommandHandler(*project).OnShowLog(*project);
}

14
src/widgets/Ruler.cpp
View File

@@ -2881,7 +2881,7 @@ auto AdornedRulerPanel::QPHandle::Click
if(scrubber.HasMark()) {
// We can't stop scrubbing yet (see comments in Bug 1391),
// but we can pause it.
pProject->OnPause( *pProject );
GetMenuCommandHandler(*pProject).OnPause(*pProject);
}
// Store the initial play region state
@@ -2905,7 +2905,7 @@ void AdornedRulerPanel::HandleQPClick(wxMouseEvent &evt, wxCoord mousePosX)
// Temporarily unlock locked play region
if (mPlayRegionLock && evt.LeftDown()) {
//mPlayRegionLock = true;
mProject->OnUnlockPlayRegion(*mProject);
GetMenuCommandHandler(*mProject).OnUnlockPlayRegion(*mProject);
}
mLeftDownClickUnsnapped = mQuickPlayPosUnsnapped;
@@ -3155,7 +3155,7 @@ void AdornedRulerPanel::HandleQPRelease(wxMouseEvent &evt)
if (mPlayRegionLock) {
// Restore Locked Play region
SetPlayRegion(mOldPlayRegionStart, mOldPlayRegionEnd);
mProject->OnLockPlayRegion(*mProject);
GetMenuCommandHandler(*mProject).OnLockPlayRegion(*mProject);
// and release local lock
mPlayRegionLock = false;
}
@@ -3177,7 +3177,7 @@ auto AdornedRulerPanel::QPHandle::Cancel
mParent->mOldPlayRegionStart, mParent->mOldPlayRegionEnd);
if (mParent->mPlayRegionLock) {
// Restore Locked Play region
pProject->OnLockPlayRegion(*pProject);
GetMenuCommandHandler(*pProject).OnLockPlayRegion(*pProject);
// and release local lock
mParent->mPlayRegionLock = false;
}
@@ -3313,7 +3313,7 @@ void AdornedRulerPanel::UpdateButtonStates()
void AdornedRulerPanel::OnTogglePinnedState(wxCommandEvent & /*event*/)
{
mProject->OnTogglePinnedHead(*mProject);
GetMenuCommandHandler(*mProject).OnTogglePinnedHead(*mProject);
UpdateButtonStates();
}
@@ -3451,9 +3451,9 @@ void AdornedRulerPanel::OnAutoScroll(wxCommandEvent&)
void AdornedRulerPanel::OnLockPlayRegion(wxCommandEvent&)
{
if (mProject->IsPlayRegionLocked())
mProject->OnUnlockPlayRegion(*mProject);
GetMenuCommandHandler(*mProject).OnUnlockPlayRegion(*mProject);
else
mProject->OnLockPlayRegion(*mProject);
GetMenuCommandHandler(*mProject).OnLockPlayRegion(*mProject);
}