Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-23 15:41:09 +02:00
Code Issues Releases Wiki Activity

Bug 1628 - Tracks > Align items two submenus deep

Browse Source 
Fixed by adding a new on/off option, "Move  Selection With Tracks".
This commit is contained in:
James Crook 2017-04-08 11:54:25 +01:00
parent 5f9e8ef615
commit 221b0271ca
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Menus.cpp
View File

@ -994,12 +994,18 @@ void AudacityProject::CreateMenusAndCommands()
c->BeginSubMenu(_("&Align Tracks")); c->BeginSubMenu(_("&Align Tracks"));
c->BeginSubMenu(_("Just Move Tracks")); //c->BeginSubMenu(_("Just Move Tracks"));
c->AddItemList(wxT("Align"), alignLabelsNoSync, FN(OnAlignNoSync)); c->AddItemList(wxT("Align"), alignLabelsNoSync, FN(OnAlignNoSync));
c->AddSeparator(); c->AddSeparator();
c->AddItemList(wxT("Align"), alignLabels, FN(OnAlign)); c->AddItemList(wxT("Align"), alignLabels, FN(OnAlign));
c->AddSeparator();
c->AddCheck(wxT("MoveSelectionWithTracks"), _("Move Selection with Tracks (on/off)"),
FN(OnMoveSelectionWithTracks),
gPrefs->Read(wxT("/GUI/MoveSelectionWithTracks"), 1L),
AlwaysEnabledFlag, AlwaysEnabledFlag);
c->EndSubMenu(); c->EndSubMenu();
#if 0
// TODO: Can these labels be made clearer? Do we need this sub-menu at all? // TODO: Can these labels be made clearer? Do we need this sub-menu at all?
c->BeginSubMenu(_("Move Sele&ction and Tracks")); c->BeginSubMenu(_("Move Sele&ction and Tracks"));
@ -1009,8 +1015,7 @@ void AudacityProject::CreateMenusAndCommands()
AudioIONotBusyFlag | TracksSelectedFlag); AudioIONotBusyFlag | TracksSelectedFlag);
c->EndSubMenu(); c->EndSubMenu();
#endif
c->EndSubMenu();
c->SetDefaultFlags(AudioIONotBusyFlag, AudioIONotBusyFlag); c->SetDefaultFlags(AudioIONotBusyFlag, AudioIONotBusyFlag);
@ -1040,7 +1045,8 @@ void AudacityProject::CreateMenusAndCommands()
#ifdef EXPERIMENTAL_SYNC_LOCK #ifdef EXPERIMENTAL_SYNC_LOCK
c->AddSeparator(); c->AddSeparator();
c->AddCheck(wxT("SyncLock"), _("Sync-&Lock Tracks (on/off)"), FN(OnSyncLock), 0, c->AddCheck(wxT("SyncLock"), _("Sync-&Lock Tracks (on/off)"), FN(OnSyncLock),
gPrefs->Read(wxT("/GUI/SyncLockTracks"), 0L),
AlwaysEnabledFlag, AlwaysEnabledFlag); AlwaysEnabledFlag, AlwaysEnabledFlag);
#endif #endif
@ -6638,13 +6644,17 @@ void AudacityProject::OnAlignNoSync(int index)
void AudacityProject::OnAlign(int index) void AudacityProject::OnAlign(int index)
{ {
HandleAlign(index, false); bool bMoveWith;
gPrefs->Read(wxT("/GUI/MoveSelectionWithTracks"), &bMoveWith, true);
HandleAlign(index, bMoveWith);
} }
/*
// Now handled in OnAlign.
void AudacityProject::OnAlignMoveSel(int index) void AudacityProject::OnAlignMoveSel(int index)
{ {
HandleAlign(index, true); HandleAlign(index, true);
} }
*/
#ifdef EXPERIMENTAL_SCOREALIGN #ifdef EXPERIMENTAL_SCOREALIGN
// rough relative amount of time to compute one // rough relative amount of time to compute one
@ -7138,6 +7148,15 @@ int AudacityProject::DoAddLabel(const SelectedRegion &region, bool preserveFocus
return index; return index;
} }
void AudacityProject::OnMoveSelectionWithTracks()
{
bool bMoveWith;
gPrefs->Read(wxT("/GUI/MoveSelectionWithTracks"), &bMoveWith, true);
gPrefs->Write(wxT("/GUI/MoveSelectionWithTracks"), !bMoveWith);
gPrefs->Flush();
}
void AudacityProject::OnSyncLock() void AudacityProject::OnSyncLock()
{ {
bool bSyncLockTracks; bool bSyncLockTracks;
@ -7151,6 +7170,8 @@ void AudacityProject::OnSyncLock()
mTrackPanel->Refresh(false); mTrackPanel->Refresh(false);
} }
void AudacityProject::OnAddLabel() void AudacityProject::OnAddLabel()
{ {
DoAddLabel(mViewInfo.selectedRegion); DoAddLabel(mViewInfo.selectedRegion);

3
src/Menus.h
View File

@ -410,7 +410,7 @@ void OnCursorClipBoundary(bool next);
void OnAlignNoSync(int index); void OnAlignNoSync(int index);
void OnAlign(int index); void OnAlign(int index);
void OnAlignMoveSel(int index); //void OnAlignMoveSel(int index);
void HandleAlign(int index, bool moveSel); void HandleAlign(int index, bool moveSel);
size_t mAlignLabelsCount; size_t mAlignLabelsCount;
@ -425,6 +425,7 @@ void OnNewLabelTrack();
void OnNewTimeTrack(); void OnNewTimeTrack();
void OnTimerRecord(); void OnTimerRecord();
void OnRemoveTracks(); void OnRemoveTracks();
void OnMoveSelectionWithTracks();
void OnSyncLock(); void OnSyncLock();
void OnAddLabel(); void OnAddLabel();
void OnAddLabelPlaying(); void OnAddLabelPlaying();