Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-28 14:18:41 +02:00
Code Issues Releases Wiki Activity

Only one public CommandManager fn to begin a menu and one to end...

Browse Source 
... It knows the nesting, so it decides for itself whether to manage the menu
as main or sub-.
This commit is contained in:
Paul Licameli 2018-10-18 08:52:37 -04:00
parent 32efcd43c4
commit 7f5e6d12b1
4 changed files with 144 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
src/Menus.cpp
View File

@ -426,7 +426,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddSeparator(); c->AddSeparator();
c->BeginSubMenu( _("&Save Project") ); c->BeginMenu( _("&Save Project") );
c->AddItem( wxT("Save"), XXO("&Save Project"), FN(OnSave), c->AddItem( wxT("Save"), XXO("&Save Project"), FN(OnSave),
AudioIONotBusyFlag | UnsavedChangesFlag, wxT("Ctrl+S") ); AudioIONotBusyFlag | UnsavedChangesFlag, wxT("Ctrl+S") );
c->AddItem( wxT("SaveAs"), XXO("Save Project &As..."), FN(OnSaveAs), c->AddItem( wxT("SaveAs"), XXO("Save Project &As..."), FN(OnSaveAs),
@ -438,10 +438,10 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("SaveCompressed"), XXO("&Save Compressed Copy of Project..."), c->AddItem( wxT("SaveCompressed"), XXO("&Save Compressed Copy of Project..."),
FN(OnSaveCompressed), AudioIONotBusyFlag ); FN(OnSaveCompressed), AudioIONotBusyFlag );
#endif #endif
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
c->BeginSubMenu( _("&Export") ); c->BeginMenu( _("&Export") );
// Enable Export audio commands only when there are audio tracks. // Enable Export audio commands only when there are audio tracks.
c->AddItem( wxT("ExportMp3"), XXO("Export as MP&3"), FN(OnExportMp3), c->AddItem( wxT("ExportMp3"), XXO("Export as MP&3"), FN(OnExportMp3),
@ -469,9 +469,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("ExportMIDI"), XXO("Export MI&DI..."), FN(OnExportMIDI), c->AddItem( wxT("ExportMIDI"), XXO("Export MI&DI..."), FN(OnExportMIDI),
AudioIONotBusyFlag | NoteTracksExistFlag ); AudioIONotBusyFlag | NoteTracksExistFlag );
#endif #endif
c->EndSubMenu(); c->EndMenu();
c->BeginSubMenu(_("&Import")); c->BeginMenu( _("&Import") );
c->AddItem( wxT("ImportAudio"), XXO("&Audio..."), FN(OnImport), c->AddItem( wxT("ImportAudio"), XXO("&Audio..."), FN(OnImport),
AudioIONotBusyFlag, wxT("Ctrl+Shift+I") ); AudioIONotBusyFlag, wxT("Ctrl+Shift+I") );
@ -484,7 +484,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("ImportRaw"), XXO("&Raw Data..."), FN(OnImportRaw), c->AddItem( wxT("ImportRaw"), XXO("&Raw Data..."), FN(OnImportRaw),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -554,7 +554,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddSeparator(); c->AddSeparator();
c->BeginSubMenu(_("R&emove Special")); c->BeginMenu( _("R&emove Special") );
/* i18n-hint: (verb) Do a special kind of cut*/ /* i18n-hint: (verb) Do a special kind of cut*/
c->AddItem( wxT("SplitCut"), XXO("Spl&it Cut"), FN(OnSplitCut), c->AddItem( wxT("SplitCut"), XXO("Spl&it Cut"), FN(OnSplitCut),
NotBusyTimeAndTracksFlags, wxT("Ctrl+Alt+X") ); NotBusyTimeAndTracksFlags, wxT("Ctrl+Alt+X") );
@ -570,13 +570,13 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/* i18n-hint: (verb)*/ /* i18n-hint: (verb)*/
c->AddItem( wxT("Trim"), XXO("Tri&m Audio"), FN(OnTrim), c->AddItem( wxT("Trim"), XXO("Tri&m Audio"), FN(OnTrim),
AudioIONotBusyFlag | TimeSelectedFlag | AudioTracksSelectedFlag, wxT("Ctrl+T") ); AudioIONotBusyFlag | TimeSelectedFlag | AudioTracksSelectedFlag, wxT("Ctrl+T") );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Clip B&oundaries")); c->BeginMenu( _("Clip B&oundaries") );
/* i18n-hint: (verb) It's an item on a menu. */ /* i18n-hint: (verb) It's an item on a menu. */
c->AddItem( wxT("Split"), XXO("Sp&lit"), FN(OnSplit), c->AddItem( wxT("Split"), XXO("Sp&lit"), FN(OnSplit),
AudioIONotBusyFlag | WaveTracksSelectedFlag, wxT("Ctrl+I") ); AudioIONotBusyFlag | WaveTracksSelectedFlag, wxT("Ctrl+I") );
@ -588,11 +588,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
NotBusyTimeAndTracksFlags, wxT("Ctrl+J") ); NotBusyTimeAndTracksFlags, wxT("Ctrl+J") );
c->AddItem( wxT("Disjoin"), XXO("Detac&h at Silences"), FN(OnDisjoin), c->AddItem( wxT("Disjoin"), XXO("Detac&h at Silences"), FN(OnDisjoin),
NotBusyTimeAndTracksFlags, wxT("Ctrl+Alt+J") ); NotBusyTimeAndTracksFlags, wxT("Ctrl+Alt+J") );
c->EndSubMenu(); c->EndMenu();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Labels")); c->BeginMenu( _("&Labels") );
c->AddItem( wxT("EditLabels"), XXO("&Edit Labels..."), FN(OnEditLabels), c->AddItem( wxT("EditLabels"), XXO("&Edit Labels..."), FN(OnEditLabels),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
@ -618,11 +618,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("TypeToCreateLabel"), XXO("&Type to Create a Label (on/off)"), c->AddItem( wxT("TypeToCreateLabel"), XXO("&Type to Create a Label (on/off)"),
FN(OnToggleTypeToCreateLabel), AlwaysEnabledFlag, checkOff ); FN(OnToggleTypeToCreateLabel), AlwaysEnabledFlag, checkOff );
c->EndSubMenu(); c->EndMenu();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("La&beled Audio")); c->BeginMenu( _("La&beled Audio") );
constexpr auto NotBusyLabelsAndWaveFlags = constexpr auto NotBusyLabelsAndWaveFlags =
AudioIONotBusyFlag | AudioIONotBusyFlag |
@ -670,7 +670,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("DisjoinLabels"), XXO("Detac&h at Silences"), c->AddItem( wxT("DisjoinLabels"), XXO("Detac&h at Silences"),
FN(OnDisjoinLabels), NotBusyLabelsAndWaveFlags, wxT("Alt+Shift+J") ); FN(OnDisjoinLabels), NotBusyLabelsAndWaveFlags, wxT("Alt+Shift+J") );
c->EndSubMenu(); c->EndMenu();
c->AddItem( wxT("EditMetaData"), XXO("&Metadata..."), FN(OnEditMetadata), c->AddItem( wxT("EditMetaData"), XXO("&Metadata..."), FN(OnEditMetadata),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
@ -710,7 +710,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Tracks")); c->BeginMenu( _("&Tracks") );
c->AddItem( wxT("SelAllTracks"), XXO("In All &Tracks"), FN(OnSelectAllTracks), c->AddItem( wxT("SelAllTracks"), XXO("In All &Tracks"), FN(OnSelectAllTracks),
TracksExistFlag, TracksExistFlag,
wxT("Ctrl+Shift+K") ); wxT("Ctrl+Shift+K") );
@ -722,11 +722,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
Options{ wxT("Ctrl+Shift+Y"), _("Select Sync-Locked") } ); Options{ wxT("Ctrl+Shift+Y"), _("Select Sync-Locked") } );
#endif #endif
c->EndSubMenu(); c->EndMenu();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("R&egion")); c->BeginMenu( _("R&egion") );
c->AddItem( wxT("SetLeftSelection"), XXO("&Left at Playback Position"), c->AddItem( wxT("SetLeftSelection"), XXO("&Left at Playback Position"),
FN(OnSetLeftSelection), TracksExistFlag, FN(OnSetLeftSelection), TracksExistFlag,
@ -751,12 +751,12 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("SelRestore"), XXO("Retrieve Selectio&n"), FN(OnSelectionRestore), c->AddItem( wxT("SelRestore"), XXO("Retrieve Selectio&n"), FN(OnSelectionRestore),
TracksExistFlag ); TracksExistFlag );
c->EndSubMenu(); c->EndMenu();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef EXPERIMENTAL_SPECTRAL_EDITING #ifdef EXPERIMENTAL_SPECTRAL_EDITING
c->BeginSubMenu(_("S&pectral")); c->BeginMenu( _("S&pectral") );
c->AddItem( wxT("ToggleSpectralSelection"), c->AddItem( wxT("ToggleSpectralSelection"),
XXO("To&ggle Spectral Selection"), FN(OnToggleSpectralSelection), XXO("To&ggle Spectral Selection"), FN(OnToggleSpectralSelection),
TracksExistFlag, wxT("Q") ); TracksExistFlag, wxT("Q") );
@ -766,12 +766,12 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("NextLowerPeakFrequency"), c->AddItem( wxT("NextLowerPeakFrequency"),
XXO("Next &Lower Peak Frequency"), FN(OnNextLowerPeakFrequency), XXO("Next &Lower Peak Frequency"), FN(OnNextLowerPeakFrequency),
TracksExistFlag ); TracksExistFlag );
c->EndSubMenu(); c->EndMenu();
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Clip B&oundaries")); c->BeginMenu( _("Clip B&oundaries") );
c->AddItem( wxT("SelPrevClipBoundaryToCursor"), XXO("Pre&vious Clip Boundary to Cursor"), c->AddItem( wxT("SelPrevClipBoundaryToCursor"), XXO("Pre&vious Clip Boundary to Cursor"),
FN(OnSelectPrevClipBoundaryToCursor), FN(OnSelectPrevClipBoundaryToCursor),
WaveTracksExistFlag ); WaveTracksExistFlag );
@ -785,7 +785,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
WaveTracksExistFlag, WaveTracksExistFlag,
Options{ wxT("Alt+."), _("Select Next Clip") } ); Options{ wxT("Alt+."), _("Select Next Clip") } );
c->EndSubMenu(); c->EndMenu();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->AddSeparator(); c->AddSeparator();
@ -812,7 +812,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginMenu( _("&View") ); c->BeginMenu( _("&View") );
c->BeginSubMenu(_("&Zoom")); c->BeginMenu( _("&Zoom") );
c->AddItem( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn), c->AddItem( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn),
ZoomInAvailableFlag, wxT("Ctrl+1") ); ZoomInAvailableFlag, wxT("Ctrl+1") );
@ -824,9 +824,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
TimeSelectedFlag, wxT("Ctrl+E") ); TimeSelectedFlag, wxT("Ctrl+E") );
c->AddItem( wxT("ZoomToggle"), XXO("Zoom &Toggle"), FN(OnZoomToggle), c->AddItem( wxT("ZoomToggle"), XXO("Zoom &Toggle"), FN(OnZoomToggle),
TracksExistFlag, wxT("Shift+Z") ); TracksExistFlag, wxT("Shift+Z") );
c->EndSubMenu(); c->EndMenu();
c->BeginSubMenu(_("T&rack Size")); c->BeginMenu( _("T&rack Size") );
c->AddItem( wxT("FitInWindow"), XXO("&Fit to Width"), FN(OnZoomFit), c->AddItem( wxT("FitInWindow"), XXO("&Fit to Width"), FN(OnZoomFit),
TracksExistFlag, wxT("Ctrl+F") ); TracksExistFlag, wxT("Ctrl+F") );
c->AddItem( wxT("FitV"), XXO("Fit to &Height"), FN(OnZoomFitV), c->AddItem( wxT("FitV"), XXO("Fit to &Height"), FN(OnZoomFitV),
@ -835,16 +835,16 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnCollapseAllTracks), TracksExistFlag, wxT("Ctrl+Shift+C") ); FN(OnCollapseAllTracks), TracksExistFlag, wxT("Ctrl+Shift+C") );
c->AddItem( wxT("ExpandAllTracks"), XXO("E&xpand Collapsed Tracks"), c->AddItem( wxT("ExpandAllTracks"), XXO("E&xpand Collapsed Tracks"),
FN(OnExpandAllTracks), TracksExistFlag, wxT("Ctrl+Shift+X") ); FN(OnExpandAllTracks), TracksExistFlag, wxT("Ctrl+Shift+X") );
c->EndSubMenu(); c->EndMenu();
c->BeginSubMenu(_("Sk&ip to")); c->BeginMenu( _("Sk&ip to") );
c->AddItem( wxT("SkipSelStart"), XXO("Selection Sta&rt"), FN(OnGoSelStart), c->AddItem( wxT("SkipSelStart"), XXO("Selection Sta&rt"), FN(OnGoSelStart),
TimeSelectedFlag, TimeSelectedFlag,
Options{ wxT("Ctrl+["), _("Skip to Selection Start") } ); Options{ wxT("Ctrl+["), _("Skip to Selection Start") } );
c->AddItem( wxT("SkipSelEnd"), XXO("Selection En&d"), FN(OnGoSelEnd), c->AddItem( wxT("SkipSelEnd"), XXO("Selection En&d"), FN(OnGoSelEnd),
TimeSelectedFlag, TimeSelectedFlag,
Options{ wxT("Ctrl+]"), _("Skip to Selection End") } ); Options{ wxT("Ctrl+]"), _("Skip to Selection End") } );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
@ -881,7 +881,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Toolbars")); c->BeginMenu( _("&Toolbars") );
/* i18n-hint: (verb)*/ /* i18n-hint: (verb)*/
c->AddItem( wxT("ResetToolbars"), XXO("Reset Toolb&ars"), FN(OnResetToolBars), AlwaysEnabledFlag ); c->AddItem( wxT("ResetToolbars"), XXO("Reset Toolb&ars"), FN(OnResetToolBars), AlwaysEnabledFlag );
@ -916,7 +916,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("ShowSpectralSelectionTB"), XXO("Spe&ctral Selection Toolbar"), FN(OnShowSpectralSelectionToolBar), AlwaysEnabledFlag, checkOff ); c->AddItem( wxT("ShowSpectralSelectionTB"), XXO("Spe&ctral Selection Toolbar"), FN(OnShowSpectralSelectionToolBar), AlwaysEnabledFlag, checkOff );
#endif #endif
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
@ -940,7 +940,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/*i18n-hint: 'Transport' is the name given to the set of controls that /*i18n-hint: 'Transport' is the name given to the set of controls that
play, record, pause etc. */ play, record, pause etc. */
c->BeginMenu( _("Tra&nsport") ); c->BeginMenu( _("Tra&nsport") );
c->BeginSubMenu(_("Pl&aying")); c->BeginMenu( _("Pl&aying") );
/* i18n-hint: (verb) Start or Stop audio playback*/ /* i18n-hint: (verb) Start or Stop audio playback*/
c->AddItem( wxT("PlayStop"), XXO("Pl&ay/Stop"), FN(OnPlayStop), c->AddItem( wxT("PlayStop"), XXO("Pl&ay/Stop"), FN(OnPlayStop),
CanStopAudioStreamFlag, wxT("Space") ); CanStopAudioStreamFlag, wxT("Space") );
@ -950,9 +950,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
CanStopAudioStreamFlag, wxT("Shift+Space") ); CanStopAudioStreamFlag, wxT("Shift+Space") );
c->AddItem( wxT("Pause"), XXO("&Pause"), FN(OnPause), c->AddItem( wxT("Pause"), XXO("&Pause"), FN(OnPause),
CanStopAudioStreamFlag, wxT("P") ); CanStopAudioStreamFlag, wxT("P") );
c->EndSubMenu(); c->EndMenu();
c->BeginSubMenu( _("&Recording")); c->BeginMenu( _("&Recording") );
constexpr auto CanStopFlags = AudioIONotBusyFlag | CanStopAudioStreamFlag; constexpr auto CanStopFlags = AudioIONotBusyFlag | CanStopAudioStreamFlag;
/* i18n-hint: (verb)*/ /* i18n-hint: (verb)*/
c->AddItem( wxT("Record1stChoice"), XXO("&Record"), FN(OnRecord), c->AddItem( wxT("Record1stChoice"), XXO("&Record"), FN(OnRecord),
@ -984,7 +984,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// in fact will use the same flags as in the previous registration. // in fact will use the same flags as in the previous registration.
c->AddItem( wxT("Pause"), XXO("&Pause"), FN(OnPause), CanStopFlags, c->AddItem( wxT("Pause"), XXO("&Pause"), FN(OnPause), CanStopFlags,
wxT("P") ); wxT("P") );
c->EndSubMenu(); c->EndMenu();
// Scrubbing sub-menu // Scrubbing sub-menu
project.GetScrubber().AddMenuItems(); project.GetScrubber().AddMenuItems();
@ -992,7 +992,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// JKC: ANSWER-ME: How is 'cursor to' different to 'Skip To' and how is it useful? // JKC: ANSWER-ME: How is 'cursor to' different to 'Skip To' and how is it useful?
// GA: 'Skip to' moves the viewpoint to center of the track and preserves the // GA: 'Skip to' moves the viewpoint to center of the track and preserves the
// selection. 'Cursor to' does neither. 'Center at' might describe it better than 'Skip'. // selection. 'Cursor to' does neither. 'Center at' might describe it better than 'Skip'.
c->BeginSubMenu(_("&Cursor to")); c->BeginMenu( _("&Cursor to") );
c->AddItem( wxT("CursSelStart"), XXO("Selection Star&t"), FN(OnCursorSelStart), c->AddItem( wxT("CursSelStart"), XXO("Selection Star&t"), FN(OnCursorSelStart),
TimeSelectedFlag, TimeSelectedFlag,
@ -1022,27 +1022,27 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
CanStopFlags, CanStopFlags,
Options{ wxT("End"), _("Cursor to Project End") } ); Options{ wxT("End"), _("Cursor to Project End") } );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Pla&y Region")); c->BeginMenu( _("Pla&y Region") );
c->AddItem( wxT("LockPlayRegion"), XXO("&Lock"), FN(OnLockPlayRegion), c->AddItem( wxT("LockPlayRegion"), XXO("&Lock"), FN(OnLockPlayRegion),
PlayRegionNotLockedFlag ); PlayRegionNotLockedFlag );
c->AddItem( wxT("UnlockPlayRegion"), XXO("&Unlock"), FN(OnUnlockPlayRegion), c->AddItem( wxT("UnlockPlayRegion"), XXO("&Unlock"), FN(OnUnlockPlayRegion),
PlayRegionLockedFlag ); PlayRegionLockedFlag );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
c->AddItem( wxT("RescanDevices"), XXO("R&escan Audio Devices"), FN(OnRescanDevices), c->AddItem( wxT("RescanDevices"), XXO("R&escan Audio Devices"), FN(OnRescanDevices),
AudioIONotBusyFlag | CanStopAudioStreamFlag ); AudioIONotBusyFlag | CanStopAudioStreamFlag );
c->BeginSubMenu(_("Transport &Options")); c->BeginMenu( _("Transport &Options") );
// Sound Activated recording options // Sound Activated recording options
c->AddItem( wxT("SoundActivationLevel"), XXO("Sound Activation Le&vel..."), FN(OnSoundActivated), c->AddItem( wxT("SoundActivationLevel"), XXO("Sound Activation Le&vel..."), FN(OnSoundActivated),
AudioIONotBusyFlag | CanStopAudioStreamFlag ); AudioIONotBusyFlag | CanStopAudioStreamFlag );
@ -1065,7 +1065,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("AutomatedInputLevelAdjustmentOnOff"), XXO("A&utomated Recording Level Adjustment (on/off)"), FN(OnToggleAutomatedInputLevelAdjustment), c->AddItem( wxT("AutomatedInputLevelAdjustmentOnOff"), XXO("A&utomated Recording Level Adjustment (on/off)"), FN(OnToggleAutomatedInputLevelAdjustment),
AudioIONotBusyFlag | CanStopAudioStreamFlag, checkOff ); AudioIONotBusyFlag | CanStopAudioStreamFlag, checkOff );
#endif #endif
c->EndSubMenu(); c->EndMenu();
c->EndMenu(); c->EndMenu();
@ -1077,7 +1077,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Add &New")); c->BeginMenu( _("Add &New") );
c->AddItem( wxT("NewMonoTrack"), XXO("&Mono Track"), FN(OnNewWaveTrack), c->AddItem( wxT("NewMonoTrack"), XXO("&Mono Track"), FN(OnNewWaveTrack),
AudioIONotBusyFlag, wxT("Ctrl+Shift+N") ); AudioIONotBusyFlag, wxT("Ctrl+Shift+N") );
@ -1088,13 +1088,13 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("NewTimeTrack"), XXO("&Time Track"), c->AddItem( wxT("NewTimeTrack"), XXO("&Time Track"),
FN(OnNewTimeTrack), AudioIONotBusyFlag ); FN(OnNewTimeTrack), AudioIONotBusyFlag );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->AddSeparator(); c->AddSeparator();
c->BeginSubMenu(_("Mi&x") ); c->BeginMenu( _("Mi&x") );
{ {
// Stereo to Mono is an oddball command that is also subject to control by the // Stereo to Mono is an oddball command that is also subject to control by the
// plug-in manager, as if an effect. Decide whether to show or hide it. // plug-in manager, as if an effect. Decide whether to show or hide it.
@ -1108,7 +1108,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag | WaveTracksSelectedFlag ); AudioIONotBusyFlag | WaveTracksSelectedFlag );
c->AddItem( wxT("MixAndRenderToNewTrack"), XXO("Mix and Render to Ne&w Track"), FN(OnMixAndRenderToNewTrack), c->AddItem( wxT("MixAndRenderToNewTrack"), XXO("Mix and Render to Ne&w Track"), FN(OnMixAndRenderToNewTrack),
AudioIONotBusyFlag | WaveTracksSelectedFlag, wxT("Ctrl+Shift+M") ); AudioIONotBusyFlag | WaveTracksSelectedFlag, wxT("Ctrl+Shift+M") );
c->EndSubMenu(); c->EndMenu();
c->AddItem( wxT("Resample"), XXO("&Resample..."), FN(OnResample), c->AddItem( wxT("Resample"), XXO("&Resample..."), FN(OnResample),
AudioIONotBusyFlag | WaveTracksSelectedFlag ); AudioIONotBusyFlag | WaveTracksSelectedFlag );
@ -1120,14 +1120,14 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddSeparator(); c->AddSeparator();
c->BeginSubMenu(_("M&ute/Unmute")); c->BeginMenu( _("M&ute/Unmute") );
c->AddItem( wxT("MuteAllTracks"), XXO("&Mute All Tracks"), c->AddItem( wxT("MuteAllTracks"), XXO("&Mute All Tracks"),
FN(OnMuteAllTracks), AudioIONotBusyFlag, wxT("Ctrl+U") ); FN(OnMuteAllTracks), AudioIONotBusyFlag, wxT("Ctrl+U") );
c->AddItem( wxT("UnmuteAllTracks"), XXO("&Unmute All Tracks"), c->AddItem( wxT("UnmuteAllTracks"), XXO("&Unmute All Tracks"),
FN(OnUnmuteAllTracks), AudioIONotBusyFlag, wxT("Ctrl+Shift+U") ); FN(OnUnmuteAllTracks), AudioIONotBusyFlag, wxT("Ctrl+Shift+U") );
c->EndSubMenu(); c->EndMenu();
c->BeginSubMenu(_("&Pan")); c->BeginMenu( _("&Pan") );
// As Pan changes are not saved on Undo stack, pan settings for all tracks // As Pan changes are not saved on Undo stack, pan settings for all tracks
// in the project could very easily be lost unless we require the tracks to be selcted. // in the project could very easily be lost unless we require the tracks to be selcted.
c->AddItem( wxT("PanLeft"), XXO("&Left"), FN(OnPanLeft), c->AddItem( wxT("PanLeft"), XXO("&Left"), FN(OnPanLeft),
@ -1139,7 +1139,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("PanCenter"), XXO("&Center"), FN(OnPanCenter), c->AddItem( wxT("PanCenter"), XXO("&Center"), FN(OnPanCenter),
TracksSelectedFlag, TracksSelectedFlag,
Options{}.LongName( _("Pan Center") ) ); Options{}.LongName( _("Pan Center") ) );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
@ -1165,9 +1165,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
"incorrect count" "incorrect count"
); );
c->BeginSubMenu(_("&Align Tracks")); c->BeginMenu( _("&Align Tracks") );
//c->BeginSubMenu(_("Just Move Tracks")); //c->BeginMenu( _("Just Move Tracks") );
c->AddItemList(wxT("Align"), alignLabelsNoSync, 2u, FN(OnAlignNoSync), c->AddItemList(wxT("Align"), alignLabelsNoSync, 2u, FN(OnAlignNoSync),
AudioIONotBusyFlag | TracksSelectedFlag); AudioIONotBusyFlag | TracksSelectedFlag);
c->AddSeparator(); c->AddSeparator();
@ -1178,18 +1178,18 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnMoveSelectionWithTracks), FN(OnMoveSelectionWithTracks),
AlwaysEnabledFlag, AlwaysEnabledFlag,
Options{}.CheckState( gPrefs->Read(wxT("/GUI/MoveSelectionWithTracks"), 0L ) ) ); Options{}.CheckState( gPrefs->Read(wxT("/GUI/MoveSelectionWithTracks"), 0L ) ) );
c->EndSubMenu(); c->EndMenu();
#if 0 #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->BeginMenu( _("Move Sele&ction and Tracks") );
c->AddItemList(wxT("AlignMove"), alignLabels, kAlignLabelsCount, FN(OnAlignMoveSel)); c->AddItemList(wxT("AlignMove"), alignLabels, kAlignLabelsCount, FN(OnAlignMoveSel));
c->SetCommandFlags(wxT("AlignMove"), c->SetCommandFlags(wxT("AlignMove"),
AudioIONotBusyFlag | TracksSelectedFlag, AudioIONotBusyFlag | TracksSelectedFlag,
AudioIONotBusyFlag | TracksSelectedFlag); AudioIONotBusyFlag | TracksSelectedFlag);
c->EndSubMenu(); c->EndMenu();
#endif #endif
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -1201,7 +1201,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("S&ort Tracks")); c->BeginMenu( _("S&ort Tracks") );
c->AddItem( wxT("SortByTime"), XXO("By &Start Time"), FN(OnSortTime), c->AddItem( wxT("SortByTime"), XXO("By &Start Time"), FN(OnSortTime),
TracksExistFlag, TracksExistFlag,
@ -1210,7 +1210,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
TracksExistFlag, TracksExistFlag,
Options{}.LongName( _("Sort by Name") ) ); Options{}.LongName( _("Sort by Name") ) );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -1321,13 +1321,13 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("ManageMacros"), XXO("&Macros..."), c->AddItem( wxT("ManageMacros"), XXO("&Macros..."),
FN(OnManageMacros), AudioIONotBusyFlag ); FN(OnManageMacros), AudioIONotBusyFlag );
c->BeginSubMenu(_("&Apply Macro")); c->BeginMenu( _("&Apply Macro") );
// Palette has no access key to ensure first letter navigation of sub menu // Palette has no access key to ensure first letter navigation of sub menu
c->AddItem( wxT("ApplyMacrosPalette"), XXO("Palette..."), c->AddItem( wxT("ApplyMacrosPalette"), XXO("Palette..."),
FN(OnApplyMacrosPalette), AudioIONotBusyFlag ); FN(OnApplyMacrosPalette), AudioIONotBusyFlag );
c->AddSeparator(); c->AddSeparator();
PopulateMacrosMenu( c, AudioIONotBusyFlag ); PopulateMacrosMenu( c, AudioIONotBusyFlag );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
c->AddItem( wxT("FancyScreenshot"), XXO("&Screenshot..."), c->AddItem( wxT("FancyScreenshot"), XXO("&Screenshot..."),
@ -1410,7 +1410,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("T&ransport")); c->BeginMenu( _("T&ransport") );
// PlayStop is already in the menus. // PlayStop is already in the menus.
/* i18n-hint: (verb) Start playing audio*/ /* i18n-hint: (verb) Start playing audio*/
@ -1446,11 +1446,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
wxT("Ctrl+Shift+F7") ); wxT("Ctrl+Shift+F7") );
c->AddItem( wxT("PlayCutPreview"), XXO("Play C&ut Preview"), FN(OnPlayCutPreview), c->AddItem( wxT("PlayCutPreview"), XXO("Play C&ut Preview"), FN(OnPlayCutPreview),
CaptureNotBusyFlag, wxT("C") ); CaptureNotBusyFlag, wxT("C") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("T&ools")); c->BeginMenu( _("T&ools") );
c->AddItem( wxT("SelectTool"), XXO("&Selection Tool"), FN(OnSelectTool), c->AddItem( wxT("SelectTool"), XXO("&Selection Tool"), FN(OnSelectTool),
AlwaysEnabledFlag, wxT("F1") ); AlwaysEnabledFlag, wxT("F1") );
@ -1469,11 +1469,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AlwaysEnabledFlag, wxT("A") ); AlwaysEnabledFlag, wxT("A") );
c->AddItem( wxT("NextTool"), XXO("&Next Tool"), FN(OnNextTool), c->AddItem( wxT("NextTool"), XXO("&Next Tool"), FN(OnNextTool),
AlwaysEnabledFlag, wxT("D") ); AlwaysEnabledFlag, wxT("D") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Mi&xer")); c->BeginMenu( _("Mi&xer") );
c->AddItem( wxT("OutputGain"), XXO("Ad&just Playback Volume..."), c->AddItem( wxT("OutputGain"), XXO("Ad&just Playback Volume..."),
FN(OnOutputGain), AlwaysEnabledFlag ); FN(OnOutputGain), AlwaysEnabledFlag );
@ -1487,11 +1487,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnInputGainInc), AlwaysEnabledFlag ); FN(OnInputGainInc), AlwaysEnabledFlag );
c->AddItem( wxT("InputGainDec"), XXO("D&ecrease Recording Volume"), c->AddItem( wxT("InputGainDec"), XXO("D&ecrease Recording Volume"),
FN(OnInputGainDec), AlwaysEnabledFlag ); FN(OnInputGainDec), AlwaysEnabledFlag );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Edit")); c->BeginMenu( _("&Edit") );
c->AddItem( wxT("DeleteKey"), XXO("&Delete Key"), FN(OnDelete), c->AddItem( wxT("DeleteKey"), XXO("&Delete Key"), FN(OnDelete),
AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect, AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect,
@ -1502,11 +1502,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect, AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect,
Options{ wxT("Delete") } Options{ wxT("Delete") }
.Mask( AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag ) ); .Mask( AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag ) );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Play-at-Speed")); c->BeginMenu( _("&Play-at-Speed") );
/* i18n-hint: 'Normal Play-at-Speed' doesn't loop or cut preview. */ /* i18n-hint: 'Normal Play-at-Speed' doesn't loop or cut preview. */
c->AddItem( wxT("PlayAtSpeed"), XXO("Normal Pl&ay-at-Speed"), c->AddItem( wxT("PlayAtSpeed"), XXO("Normal Pl&ay-at-Speed"),
@ -1528,11 +1528,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
CaptureNotBusyFlag | TrackPanelHasFocus, wxT("Alt+Left") ); CaptureNotBusyFlag | TrackPanelHasFocus, wxT("Alt+Left") );
c->AddItem( wxT("MoveToNextLabel"), XXO("Move to &Next Label"), FN(OnMoveToNextLabel), c->AddItem( wxT("MoveToNextLabel"), XXO("Move to &Next Label"), FN(OnMoveToNextLabel),
CaptureNotBusyFlag | TrackPanelHasFocus, wxT("Alt+Right") ); CaptureNotBusyFlag | TrackPanelHasFocus, wxT("Alt+Right") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("See&k")); c->BeginMenu( _("See&k") );
c->AddItem( wxT("SeekLeftShort"), XXO("Short Seek &Left During Playback"), c->AddItem( wxT("SeekLeftShort"), XXO("Short Seek &Left During Playback"),
FN(OnSeekLeftShort), AudioIOBusyFlag, wxT("Left\tallowDup") ); FN(OnSeekLeftShort), AudioIOBusyFlag, wxT("Left\tallowDup") );
@ -1543,11 +1543,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnSeekLeftLong), AudioIOBusyFlag, wxT("Shift+Left\tallowDup") ); FN(OnSeekLeftLong), AudioIOBusyFlag, wxT("Shift+Left\tallowDup") );
c->AddItem( wxT("SeekRightLong"), XXO("Long Seek Rig&ht During Playback"), c->AddItem( wxT("SeekRightLong"), XXO("Long Seek Rig&ht During Playback"),
FN(OnSeekRightLong), AudioIOBusyFlag, wxT("Shift+Right\tallowDup") ); FN(OnSeekRightLong), AudioIOBusyFlag, wxT("Shift+Right\tallowDup") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("De&vice")); c->BeginMenu( _("De&vice") );
c->AddItem( wxT("InputDevice"), XXO("Change &Recording Device..."), FN(OnInputDevice), c->AddItem( wxT("InputDevice"), XXO("Change &Recording Device..."), FN(OnInputDevice),
AudioIONotBusyFlag, wxT("Shift+I") ); AudioIONotBusyFlag, wxT("Shift+I") );
@ -1557,11 +1557,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag, wxT("Shift+H") ); AudioIONotBusyFlag, wxT("Shift+H") );
c->AddItem( wxT("InputChannels"), XXO("Change Recording Cha&nnels..."), FN(OnInputChannels), c->AddItem( wxT("InputChannels"), XXO("Change Recording Cha&nnels..."), FN(OnInputChannels),
AudioIONotBusyFlag, wxT("Shift+N") ); AudioIONotBusyFlag, wxT("Shift+N") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Selection")); c->BeginMenu( _("&Selection") );
c->AddItem( wxT("SnapToOff"), XXO("Snap-To &Off"), FN(OnSnapToOff), c->AddItem( wxT("SnapToOff"), XXO("Snap-To &Off"), FN(OnSnapToOff),
AlwaysEnabledFlag ); AlwaysEnabledFlag );
@ -1589,7 +1589,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("SelCntrRight"), XXO("Selection Contract R&ight"), FN(OnSelContractRight), c->AddItem( wxT("SelCntrRight"), XXO("Selection Contract R&ight"), FN(OnSelContractRight),
TracksExistFlag | TrackPanelHasFocus, wxT("Ctrl+Shift+Left\twantKeyup") ); TracksExistFlag | TrackPanelHasFocus, wxT("Ctrl+Shift+Left\twantKeyup") );
c->EndSubMenu(); c->EndMenu();
c->AddSeparator(); c->AddSeparator();
@ -1599,7 +1599,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("F&ocus")); c->BeginMenu( _("F&ocus") );
c->AddItem( wxT("PrevFrame"), c->AddItem( wxT("PrevFrame"),
XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame), XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame),
@ -1627,11 +1627,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FocusedTracksFlags, wxT("Return") ); FocusedTracksFlags, wxT("Return") );
c->AddItem( wxT("ToggleAlt"), XXO("Toggle Focuse&d Track"), FN(OnToggle), c->AddItem( wxT("ToggleAlt"), XXO("Toggle Focuse&d Track"), FN(OnToggle),
FocusedTracksFlags, wxT("NUMPAD_ENTER") ); FocusedTracksFlags, wxT("NUMPAD_ENTER") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Cursor")); c->BeginMenu( _("&Cursor") );
c->AddItem( wxT("CursorLeft"), XXO("Cursor &Left"), FN(OnCursorLeft), c->AddItem( wxT("CursorLeft"), XXO("Cursor &Left"), FN(OnCursorLeft),
TracksExistFlag | TrackPanelHasFocus, wxT("Left\twantKeyup\tallowDup") ); TracksExistFlag | TrackPanelHasFocus, wxT("Left\twantKeyup\tallowDup") );
@ -1650,11 +1650,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
TracksExistFlag | TrackPanelHasFocus, wxT("\twantKeyup") ); TracksExistFlag | TrackPanelHasFocus, wxT("\twantKeyup") );
c->AddItem( wxT("ClipRight"), XXO("Clip Rig&ht"), FN(OnClipRight), c->AddItem( wxT("ClipRight"), XXO("Clip Rig&ht"), FN(OnClipRight),
TracksExistFlag | TrackPanelHasFocus, wxT("\twantKeyup") ); TracksExistFlag | TrackPanelHasFocus, wxT("\twantKeyup") );
c->EndSubMenu(); c->EndMenu();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Track")); c->BeginMenu( _("&Track") );
c->AddItem( wxT("TrackPan"), XXO("Change P&an on Focused Track..."), FN(OnTrackPan), c->AddItem( wxT("TrackPan"), XXO("Change P&an on Focused Track..."), FN(OnTrackPan),
TrackPanelHasFocus | TracksExistFlag, wxT("Shift+P") ); TrackPanelHasFocus | TracksExistFlag, wxT("Shift+P") );
@ -1684,11 +1684,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag | TrackPanelHasFocus | TracksExistFlag ); AudioIONotBusyFlag | TrackPanelHasFocus | TracksExistFlag );
c->AddItem( wxT("TrackMoveBottom"), XXO("Move Focused Track to &Bottom"), FN(OnTrackMoveBottom), c->AddItem( wxT("TrackMoveBottom"), XXO("Move Focused Track to &Bottom"), FN(OnTrackMoveBottom),
AudioIONotBusyFlag | TrackPanelHasFocus | TracksExistFlag ); AudioIONotBusyFlag | TrackPanelHasFocus | TracksExistFlag );
c->EndSubMenu(); c->EndMenu();
// These are the more useful to VI user Scriptables. // These are the more useful to VI user Scriptables.
// i18n-hint: Scriptables are commands normally used from Python, Perl etc. // i18n-hint: Scriptables are commands normally used from Python, Perl etc.
c->BeginSubMenu(_("Script&ables I")); c->BeginMenu( _("Script&ables I") );
// Note that the PLUGIN_SYMBOL must have a space between words, // Note that the PLUGIN_SYMBOL must have a space between words,
// whereas the short-form used here must not. // whereas the short-form used here must not.
@ -1723,9 +1723,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("SetProject"), XXO("Set Project..."), FN(OnAudacityCommand), c->AddItem( wxT("SetProject"), XXO("Set Project..."), FN(OnAudacityCommand),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
c->EndSubMenu(); c->EndMenu();
// Less useful to VI users. // Less useful to VI users.
c->BeginSubMenu(_("Scripta&bles II")); c->BeginMenu( _("Scripta&bles II") );
c->AddItem( wxT("Select"), XXO("Select..."), FN(OnAudacityCommand), c->AddItem( wxT("Select"), XXO("Select..."), FN(OnAudacityCommand),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
@ -1756,7 +1756,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag ); AudioIONotBusyFlag );
c->EndSubMenu(); c->EndMenu();
// Accel key is not bindable. // Accel key is not bindable.
@ -1818,7 +1818,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
#endif #endif
c->AddSeparator(); c->AddSeparator();
c->BeginSubMenu(_("&Diagnostics")); c->BeginMenu( _("&Diagnostics") );
c->AddItem( wxT("DeviceInfo"), XXO("Au&dio Device Info..."), FN(OnAudioDeviceInfo), c->AddItem( wxT("DeviceInfo"), XXO("Au&dio Device Info..."), FN(OnAudioDeviceInfo),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
@ -1835,7 +1835,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
#endif #endif
c->AddItem( wxT("CheckDeps"), XXO("Chec&k Dependencies..."), FN(OnCheckDependencies), c->AddItem( wxT("CheckDeps"), XXO("Chec&k Dependencies..."), FN(OnCheckDependencies),
AudioIONotBusyFlag ); AudioIONotBusyFlag );
c->EndSubMenu(); c->EndMenu();
#ifndef __WXMAC__ #ifndef __WXMAC__
c->AddSeparator(); c->AddSeparator();
@ -2011,13 +2011,13 @@ void AddEffectMenuItems(CommandManager *c,
{ {
bool bInSubmenu = !last.IsEmpty() && (groupNames.Count() > 1); bool bInSubmenu = !last.IsEmpty() && (groupNames.Count() > 1);
if( bInSubmenu) if( bInSubmenu)
c->BeginSubMenu(last); c->BeginMenu( last );
AddEffectMenuItemGroup(c, groupNames, vHasDialog, AddEffectMenuItemGroup(c, groupNames, vHasDialog,
groupPlugs, groupFlags, isDefault); groupPlugs, groupFlags, isDefault);
if (bInSubmenu) if (bInSubmenu)
c->EndSubMenu(); c->EndMenu();
groupNames.Clear(); groupNames.Clear();
vHasDialog.clear(); vHasDialog.clear();
@ -2036,12 +2036,12 @@ void AddEffectMenuItems(CommandManager *c,
{ {
bool bInSubmenu = groupNames.Count() > 1; bool bInSubmenu = groupNames.Count() > 1;
if (bInSubmenu) if (bInSubmenu)
c->BeginSubMenu(current); c->BeginMenu( current );
AddEffectMenuItemGroup(c, groupNames, vHasDialog, groupPlugs, groupFlags, isDefault); AddEffectMenuItemGroup(c, groupNames, vHasDialog, groupPlugs, groupFlags, isDefault);
if (bInSubmenu) if (bInSubmenu)
c->EndSubMenu(); c->EndMenu();
} }
} }
else else
@ -2144,7 +2144,7 @@ void AddEffectMenuItemGroup(CommandManager *c,
{ {
end = groupCnt; end = groupCnt;
} }
c->BeginSubMenu(wxString::Format(_("Plug-in %d to %d"), c->BeginMenu( wxString::Format(_("Plug-in %d to %d"),
groupNdx + 1, groupNdx + 1,
end) ); end) );
} }
@ -2152,7 +2152,7 @@ void AddEffectMenuItemGroup(CommandManager *c,
if (i + 1 < namesCnt && names[i].IsSameAs(names[i + 1])) if (i + 1 < namesCnt && names[i].IsSameAs(names[i + 1]))
{ {
wxString name = names[i]; wxString name = names[i];
c->BeginSubMenu(name); c->BeginMenu( name );
while (i < namesCnt && names[i].IsSameAs(name)) while (i < namesCnt && names[i].IsSameAs(name))
{ {
const PluginDescriptor *plug = PluginManager::Get().GetPlugin(plugs[i]); const PluginDescriptor *plug = PluginManager::Get().GetPlugin(plugs[i]);
@ -2168,7 +2168,7 @@ void AddEffectMenuItemGroup(CommandManager *c,
i++; i++;
} }
c->EndSubMenu(); c->EndMenu();
i--; i--;
} }
else else
@ -2190,7 +2190,7 @@ void AddEffectMenuItemGroup(CommandManager *c,
items--; items--;
if (items == 0 || i + 1 == namesCnt) if (items == 0 || i + 1 == namesCnt)
{ {
c->EndSubMenu(); c->EndMenu();
items = max; items = max;
} }
} }
@ -2205,7 +2205,7 @@ void CreateRecentFilesMenu(CommandManager *c)
{ {
// Recent Files and Recent Projects menus // Recent Files and Recent Projects menus
wxWeakRef<wxMenu> recentFilesMenu = c->BeginSubMenu( wxWeakRef<wxMenu> recentFilesMenu = c->BeginMenu(
#ifdef __WXMAC__ #ifdef __WXMAC__
/* i18n-hint: This is the name of the menu item on Mac OS X only */ /* i18n-hint: This is the name of the menu item on Mac OS X only */
@ -2220,7 +2220,7 @@ void CreateRecentFilesMenu(CommandManager *c)
wxGetApp().GetRecentFiles()->UseMenu(recentFilesMenu); wxGetApp().GetRecentFiles()->UseMenu(recentFilesMenu);
wxGetApp().GetRecentFiles()->AddFilesToMenu(recentFilesMenu); wxGetApp().GetRecentFiles()->AddFilesToMenu(recentFilesMenu);
c->EndSubMenu(); c->EndMenu();
wxTheApp->CallAfter( [=] { wxTheApp->CallAfter( [=] {
// Bug 143 workaround. // Bug 143 workaround.

30
src/commands/CommandManager.cpp
View File

@ -614,18 +614,44 @@ void CommandManager::SwapMenuBars()
/// ///
/// This starts a NEW menu /// This starts a NEW menu
/// ///
void CommandManager::BeginMenu(const wxString & tName) wxMenu *CommandManager::BeginMenu(const wxString & tName)
{
if ( mCurrentMenu )
return BeginSubMenu( tName );
else
return BeginMainMenu( tName );
}
///
/// This attaches a menu, if it's main, to the menubar
// and in all cases ends the menu
///
void CommandManager::EndMenu()
{
if ( mSubMenuList.empty() )
EndMainMenu();
else
EndSubMenu();
}
///
/// This starts a NEW menu
///
wxMenu *CommandManager::BeginMainMenu(const wxString & tName)
{ {
uCurrentMenu = std::make_unique<wxMenu>(); uCurrentMenu = std::make_unique<wxMenu>();
mCurrentMenu = uCurrentMenu.get(); mCurrentMenu = uCurrentMenu.get();
mCurrentMenuName = tName; mCurrentMenuName = tName;
return mCurrentMenu;
} }
/// ///
/// This attaches a menu to the menubar and ends the menu /// This attaches a menu to the menubar and ends the menu
/// ///
void CommandManager::EndMenu() void CommandManager::EndMainMenu()
{ {
// Add the menu to the menubar after all menu items have been // Add the menu to the menubar after all menu items have been
// added to the menu to allow OSX to rearrange special menu // added to the menu to allow OSX to rearrange special menu

9
src/commands/CommandManager.h
View File

@ -140,12 +140,9 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
// You may either called SetCurrentMenu later followed by ClearCurrentMenu, // You may either called SetCurrentMenu later followed by ClearCurrentMenu,
// or else BeginMenu followed by EndMenu. Don't mix them. // or else BeginMenu followed by EndMenu. Don't mix them.
void BeginMenu(const wxString & tName); wxMenu *BeginMenu(const wxString & tName);
void EndMenu(); void EndMenu();
wxMenu* BeginSubMenu(const wxString & tName);
void EndSubMenu();
// For specifying unusual arguments in AddItem // For specifying unusual arguments in AddItem
struct Options struct Options
{ {
@ -349,6 +346,10 @@ protected:
// //
void Enable(CommandListEntry *entry, bool enabled); void Enable(CommandListEntry *entry, bool enabled);
wxMenu *BeginMainMenu(const wxString & tName);
void EndMainMenu();
wxMenu* BeginSubMenu(const wxString & tName);
void EndSubMenu();
// //
// Accessing // Accessing

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

@ -1161,7 +1161,7 @@ void Scrubber::AddMenuItems()
auto cm = mProject->GetCommandManager(); auto cm = mProject->GetCommandManager();
using Options = CommandManager::Options; using Options = CommandManager::Options;
cm->BeginSubMenu(_("Scru&bbing")); cm->BeginMenu( _("Scru&bbing") );
for (const auto &item : menuItems) { for (const auto &item : menuItems) {
cm->AddItem( item.name, wxGetTranslation(item.label), cm->AddItem( item.name, wxGetTranslation(item.label),
// No menu items yet have dialogs // No menu items yet have dialogs
@ -1174,7 +1174,7 @@ void Scrubber::AddMenuItems()
: // not a checkmark item : // not a checkmark item
Options{} ); Options{} );
} }
cm->EndSubMenu(); cm->EndMenu();
} }
void Scrubber::PopulatePopupMenu(wxMenu &menu) void Scrubber::PopulatePopupMenu(wxMenu &menu)