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

Remove Sync-Lock Button

Browse Source 
Feature is still available from Tracks menus.
This commit is contained in:
James Crook 2017-04-07 21:34:33 +01:00
parent 5d75b79f15
commit ae95bc6cce
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/toolbars/EditToolBar.cpp
View File

@ -148,14 +148,11 @@ void EditToolBar::Populate()
AddSeparator();
#ifdef EXPERIMENTAL_SYNC_LOCK
// DA: No Sync Lock edit button.
#ifndef EXPERIMENTAL_DA
#ifdef OPTION_SYNC_LOCK_BUTTON
AddButton(bmpSyncLockTracksUp, bmpSyncLockTracksDown, bmpSyncLockTracksUp, ETBSyncLockID,
_("Sync-Lock Tracks"), true);
AddSeparator();
#endif
#endif
AddButton(bmpZoomIn, bmpZoomIn, bmpZoomInDisabled, ETBZoomInID,
@ -175,12 +172,9 @@ void EditToolBar::Populate()
mButtons[ETBZoomFitID]->SetEnabled(false);
mButtons[ETBPasteID]->SetEnabled(false);
#ifdef EXPERIMENTAL_SYNC_LOCK
// DA: Has no sync Lock Button
#ifndef EXPERIMENTAL_DA
#ifdef OPTION_SYNC_LOCK_BUTTON
mButtons[ETBSyncLockID]->PushDown();
#endif
#endif
#if defined(EXPERIMENTAL_EFFECTS_RACK)
AddSeparator();
@ -218,11 +212,8 @@ void EditToolBar::RegenerateTooltips()
{ ETBUndoID, wxT("Undo"), XO("Undo") },
{ ETBRedoID, wxT("Redo"), XO("Redo") },
#ifdef EXPERIMENTAL_SYNC_LOCK
// DA: No Sync Lock edit button
#ifndef EXPERIMENTAL_DA
#ifdef OPTION_SYNC_LOCK_BUTTON
{ ETBSyncLockID, wxT("SyncLock"), XO("Sync-Lock Tracks") },
#endif
#endif
{ ETBZoomInID, wxT("ZoomIn"), XO("Zoom In") },
@ -258,7 +249,7 @@ void EditToolBar::OnButton(wxCommandEvent &event)
// Except, Sync Lock button is a toggle...
auto cleanup = finally( [&] {
bool bIsToggle = false;
#ifndef EXPERIMENTAL_DA
#ifdef OPTION_SYNC_LOCK_BUTTON
bIsToggle = bIsToggle || ( id != ETBSyncLockID );
#endif
if( bIsToggle )
@ -292,13 +283,10 @@ void EditToolBar::OnButton(wxCommandEvent &event)
case ETBRedoID:
p->OnRedo();
break;
#ifdef EXPERIMENTAL_SYNC_LOCK
// DA: Has no sync Lock Button
#ifndef EXPERIMENTAL_DA
#ifdef OPTION_SYNC_LOCK_BUTTON
case ETBSyncLockID:
p->OnSyncLock();
break;
#endif
#endif
case ETBZoomInID:
p->OnZoomIn();
@ -354,9 +342,7 @@ void EditToolBar::EnableDisableButtons()
mButtons[ETBPasteID]->SetEnabled(cm->GetEnabled("Paste"));
#ifdef EXPERIMENTAL_SYNC_LOCK
// DA: Does not have Sync-Lock Button.
#ifndef EXPERIMENTAL_DA
#ifdef OPTION_SYNC_LOCK_BUTTON
bool bSyncLockTracks;
gPrefs->Read(wxT("/GUI/SyncLockTracks"), &bSyncLockTracks, false);
@ -365,5 +351,4 @@ void EditToolBar::EnableDisableButtons()
else
mButtons[ETBSyncLockID]->PopUp();
#endif
#endif
}

8
src/toolbars/EditToolBar.h
View File

@ -38,10 +38,12 @@ enum {
ETBRedoID,
#ifdef EXPERIMENTAL_SYNC_LOCK
// DA: No Sync Lock edit button
#ifndef EXPERIMENTAL_DA
ETBSyncLockID,
//Undefined, so no sync-lock on/off button.
//#define OPTION_SYNC_LOCK_BUTTON
#endif
#ifdef OPTION_SYNC_LOCK_BUTTON
ETBSyncLockID,
#endif
ETBZoomInID,