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

Consolidate multiple names for the same feature: sticky/linked/sync/synchro/grouped -> sync-lock.

Browse Source
This commit is contained in:
v.audacity 2010-08-15 00:05:55 +00:00
parent 5e38992c46
commit be8347d482
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AudacityApp.h
View File

@ -81,8 +81,8 @@ enum
NoteTracksExistFlag = 0x00800000, //gsw NoteTracksExistFlag = 0x00800000, //gsw
NoteTracksSelectedFlag = 0x01000000, //gsw NoteTracksSelectedFlag = 0x01000000, //gsw
HaveRecentFiles = 0x02000000, HaveRecentFiles = 0x02000000,
LinkingDisabledFlag = 0x04000000, //awd IsNotSyncLockedFlag = 0x04000000, //awd
LinkingEnabledFlag = 0x08000000, //awd IsSyncLockedFlag = 0x08000000, //awd
NoFlagsSpecifed = 0xffffffff NoFlagsSpecifed = 0xffffffff
}; };

16
src/Menus.cpp
View File

@ -400,16 +400,16 @@ void AudacityProject::CreateMenusAndCommands()
AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag); AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag);
c->AddItem(wxT("CutLabels"), _("&Cut"), FN(OnCutLabels), wxT("Alt+X"), c->AddItem(wxT("CutLabels"), _("&Cut"), FN(OnCutLabels), wxT("Alt+X"),
AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | LinkingDisabledFlag, AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | IsNotSyncLockedFlag,
AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | LinkingDisabledFlag); AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | IsNotSyncLockedFlag);
c->AddItem(wxT("SplitCutLabels"), _("&Split Cut"), FN(OnSplitCutLabels), wxT("Shift+Alt+X")); c->AddItem(wxT("SplitCutLabels"), _("&Split Cut"), FN(OnSplitCutLabels), wxT("Shift+Alt+X"));
c->AddItem(wxT("CopyLabels"), _("Co&py"), FN(OnCopyLabels), wxT("Shift+Alt+C")); c->AddItem(wxT("CopyLabels"), _("Co&py"), FN(OnCopyLabels), wxT("Shift+Alt+C"));
c->AddSeparator(); c->AddSeparator();
c->AddItem(wxT("DeleteLabels"), _("&Delete"), FN(OnDeleteLabels), wxT("Alt+K"), c->AddItem(wxT("DeleteLabels"), _("&Delete"), FN(OnDeleteLabels), wxT("Alt+K"),
AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | LinkingDisabledFlag, AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | IsNotSyncLockedFlag,
AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | LinkingDisabledFlag); AudioIONotBusyFlag | LabelsSelectedFlag | TimeSelectedFlag | IsNotSyncLockedFlag);
c->AddItem(wxT("SplitDeleteLabels"), _("Sp&lit Delete"), FN(OnSplitDeleteLabels), wxT("Shift+Alt+K")); c->AddItem(wxT("SplitDeleteLabels"), _("Sp&lit Delete"), FN(OnSplitDeleteLabels), wxT("Shift+Alt+K"));
c->AddItem(wxT("SilenceLabels"), _("Silence &Audio"), FN(OnSilenceLabels), wxT("Alt+L")); c->AddItem(wxT("SilenceLabels"), _("Silence &Audio"), FN(OnSilenceLabels), wxT("Alt+L"));
@ -448,8 +448,8 @@ void AudacityProject::CreateMenusAndCommands()
#ifdef EXPERIMENTAL_LINKING #ifdef EXPERIMENTAL_LINKING
c->AddItem(wxT("SelSyncLockTracks"), _("In All S&ync-Locked Tracks"), c->AddItem(wxT("SelSyncLockTracks"), _("In All S&ync-Locked Tracks"),
FN(OnSelectSyncLockSel), wxT("Ctrl+Shift+Y"), FN(OnSelectSyncLockSel), wxT("Ctrl+Shift+Y"),
TracksSelectedFlag | LinkingEnabledFlag, TracksSelectedFlag | IsSyncLockedFlag,
TracksSelectedFlag | LinkingEnabledFlag); TracksSelectedFlag | IsSyncLockedFlag);
#endif #endif
c->EndSubMenu(); c->EndSubMenu();
@ -1457,9 +1457,9 @@ wxUint32 AudacityProject::GetUpdateFlags()
flags |= HaveRecentFiles; flags |= HaveRecentFiles;
if (IsSyncLocked()) if (IsSyncLocked())
flags |= LinkingEnabledFlag; flags |= IsSyncLockedFlag;
else else
flags |= LinkingDisabledFlag; flags |= IsNotSyncLockedFlag;
return flags; return flags;
} }