Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-28 06:08:40 +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

218
src/Menus.cpp
View File

@ -396,7 +396,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// File menu
/////////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("&File"));
c->BeginMenu( _("&File") );
/*i18n-hint: "New" is an action (verb) to create a NEW project*/
c->AddItem( wxT("New"), XXO("&New"), FN(OnNew),
@ -426,7 +426,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddSeparator();
c->BeginSubMenu( _("&Save Project") );
c->BeginMenu( _("&Save Project") );
c->AddItem( wxT("Save"), XXO("&Save Project"), FN(OnSave),
AudioIONotBusyFlag | UnsavedChangesFlag, wxT("Ctrl+S") );
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..."),
FN(OnSaveCompressed), AudioIONotBusyFlag );
#endif
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
c->BeginSubMenu( _("&Export") );
c->BeginMenu( _("&Export") );
// Enable Export audio commands only when there are audio tracks.
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),
AudioIONotBusyFlag | NoteTracksExistFlag );
#endif
c->EndSubMenu();
c->EndMenu();
c->BeginSubMenu(_("&Import"));
c->BeginMenu( _("&Import") );
c->AddItem( wxT("ImportAudio"), XXO("&Audio..."), FN(OnImport),
AudioIONotBusyFlag, wxT("Ctrl+Shift+I") );
@ -484,7 +484,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("ImportRaw"), XXO("&Raw Data..."), FN(OnImportRaw),
AudioIONotBusyFlag );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
/////////////////////////////////////////////////////////////////////////////
@ -509,7 +509,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// Edit Menu
/////////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("&Edit"));
c->BeginMenu( _("&Edit") );
constexpr auto NotBusyTimeAndTracksFlags =
AudioIONotBusyFlag | TimeSelectedFlag | TracksSelectedFlag;
@ -554,7 +554,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddSeparator();
c->BeginSubMenu(_("R&emove Special"));
c->BeginMenu( _("R&emove Special") );
/* i18n-hint: (verb) Do a special kind of cut*/
c->AddItem( wxT("SplitCut"), XXO("Spl&it Cut"), FN(OnSplitCut),
NotBusyTimeAndTracksFlags, wxT("Ctrl+Alt+X") );
@ -570,13 +570,13 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/* i18n-hint: (verb)*/
c->AddItem( wxT("Trim"), XXO("Tri&m Audio"), FN(OnTrim),
AudioIONotBusyFlag | TimeSelectedFlag | AudioTracksSelectedFlag, wxT("Ctrl+T") );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Clip B&oundaries"));
c->BeginMenu( _("Clip B&oundaries") );
/* i18n-hint: (verb) It's an item on a menu. */
c->AddItem( wxT("Split"), XXO("Sp&lit"), FN(OnSplit),
AudioIONotBusyFlag | WaveTracksSelectedFlag, wxT("Ctrl+I") );
@ -588,11 +588,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
NotBusyTimeAndTracksFlags, wxT("Ctrl+J") );
c->AddItem( wxT("Disjoin"), XXO("Detac&h at Silences"), FN(OnDisjoin),
NotBusyTimeAndTracksFlags, wxT("Ctrl+Alt+J") );
c->EndSubMenu();
c->EndMenu();
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Labels"));
c->BeginMenu( _("&Labels") );
c->AddItem( wxT("EditLabels"), XXO("&Edit Labels..."), FN(OnEditLabels),
AudioIONotBusyFlag );
@ -618,11 +618,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("TypeToCreateLabel"), XXO("&Type to Create a Label (on/off)"),
FN(OnToggleTypeToCreateLabel), AlwaysEnabledFlag, checkOff );
c->EndSubMenu();
c->EndMenu();
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("La&beled Audio"));
c->BeginMenu( _("La&beled Audio") );
constexpr auto NotBusyLabelsAndWaveFlags =
AudioIONotBusyFlag |
@ -670,7 +670,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("DisjoinLabels"), XXO("Detac&h at Silences"),
FN(OnDisjoinLabels), NotBusyLabelsAndWaveFlags, wxT("Alt+Shift+J") );
c->EndSubMenu();
c->EndMenu();
c->AddItem( wxT("EditMetaData"), XXO("&Metadata..."), FN(OnEditMetadata),
AudioIONotBusyFlag );
@ -699,7 +699,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/////////////////////////////////////////////////////////////////////////////
/* i18n-hint: (verb) It's an item on a menu. */
c->BeginMenu(_("&Select"));
c->BeginMenu( _("&Select") );
c->AddItem( wxT("SelectAll"), XXO("&All"), FN(OnSelectAll),
TracksExistFlag,
@ -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),
TracksExistFlag,
wxT("Ctrl+Shift+K") );
@ -722,11 +722,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
Options{ wxT("Ctrl+Shift+Y"), _("Select Sync-Locked") } );
#endif
c->EndSubMenu();
c->EndMenu();
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("R&egion"));
c->BeginMenu( _("R&egion") );
c->AddItem( wxT("SetLeftSelection"), XXO("&Left at Playback Position"),
FN(OnSetLeftSelection), TracksExistFlag,
@ -751,12 +751,12 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("SelRestore"), XXO("Retrieve Selectio&n"), FN(OnSelectionRestore),
TracksExistFlag );
c->EndSubMenu();
c->EndMenu();
/////////////////////////////////////////////////////////////////////////////
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
c->BeginSubMenu(_("S&pectral"));
c->BeginMenu( _("S&pectral") );
c->AddItem( wxT("ToggleSpectralSelection"),
XXO("To&ggle Spectral Selection"), FN(OnToggleSpectralSelection),
TracksExistFlag, wxT("Q") );
@ -766,12 +766,12 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("NextLowerPeakFrequency"),
XXO("Next &Lower Peak Frequency"), FN(OnNextLowerPeakFrequency),
TracksExistFlag );
c->EndSubMenu();
c->EndMenu();
#endif
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Clip B&oundaries"));
c->BeginMenu( _("Clip B&oundaries") );
c->AddItem( wxT("SelPrevClipBoundaryToCursor"), XXO("Pre&vious Clip Boundary to Cursor"),
FN(OnSelectPrevClipBoundaryToCursor),
WaveTracksExistFlag );
@ -785,7 +785,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
WaveTracksExistFlag,
Options{ wxT("Alt+."), _("Select Next Clip") } );
c->EndSubMenu();
c->EndMenu();
/////////////////////////////////////////////////////////////////////////////
c->AddSeparator();
@ -811,8 +811,8 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// View Menu
/////////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("&View"));
c->BeginSubMenu(_("&Zoom"));
c->BeginMenu( _("&View") );
c->BeginMenu( _("&Zoom") );
c->AddItem( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn),
ZoomInAvailableFlag, wxT("Ctrl+1") );
@ -824,9 +824,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
TimeSelectedFlag, wxT("Ctrl+E") );
c->AddItem( wxT("ZoomToggle"), XXO("Zoom &Toggle"), FN(OnZoomToggle),
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),
TracksExistFlag, wxT("Ctrl+F") );
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") );
c->AddItem( wxT("ExpandAllTracks"), XXO("E&xpand Collapsed Tracks"),
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),
TimeSelectedFlag,
Options{ wxT("Ctrl+["), _("Skip to Selection Start") } );
c->AddItem( wxT("SkipSelEnd"), XXO("Selection En&d"), FN(OnGoSelEnd),
TimeSelectedFlag,
Options{ wxT("Ctrl+]"), _("Skip to Selection End") } );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
@ -881,7 +881,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Toolbars"));
c->BeginMenu( _("&Toolbars") );
/* i18n-hint: (verb)*/
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 );
#endif
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
@ -939,8 +939,8 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/*i18n-hint: 'Transport' is the name given to the set of controls that
play, record, pause etc. */
c->BeginMenu(_("Tra&nsport"));
c->BeginSubMenu(_("Pl&aying"));
c->BeginMenu( _("Tra&nsport") );
c->BeginMenu( _("Pl&aying") );
/* i18n-hint: (verb) Start or Stop audio playback*/
c->AddItem( wxT("PlayStop"), XXO("Pl&ay/Stop"), FN(OnPlayStop),
CanStopAudioStreamFlag, wxT("Space") );
@ -950,9 +950,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
CanStopAudioStreamFlag, wxT("Shift+Space") );
c->AddItem( wxT("Pause"), XXO("&Pause"), FN(OnPause),
CanStopAudioStreamFlag, wxT("P") );
c->EndSubMenu();
c->EndMenu();
c->BeginSubMenu( _("&Recording"));
c->BeginMenu( _("&Recording") );
constexpr auto CanStopFlags = AudioIONotBusyFlag | CanStopAudioStreamFlag;
/* i18n-hint: (verb)*/
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.
c->AddItem( wxT("Pause"), XXO("&Pause"), FN(OnPause), CanStopFlags,
wxT("P") );
c->EndSubMenu();
c->EndMenu();
// Scrubbing sub-menu
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?
// 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'.
c->BeginSubMenu(_("&Cursor to"));
c->BeginMenu( _("&Cursor to") );
c->AddItem( wxT("CursSelStart"), XXO("Selection Star&t"), FN(OnCursorSelStart),
TimeSelectedFlag,
@ -1022,27 +1022,27 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
CanStopFlags,
Options{ wxT("End"), _("Cursor to Project End") } );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
/////////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Pla&y Region"));
c->BeginMenu( _("Pla&y Region") );
c->AddItem( wxT("LockPlayRegion"), XXO("&Lock"), FN(OnLockPlayRegion),
PlayRegionNotLockedFlag );
c->AddItem( wxT("UnlockPlayRegion"), XXO("&Unlock"), FN(OnUnlockPlayRegion),
PlayRegionLockedFlag );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
c->AddItem( wxT("RescanDevices"), XXO("R&escan Audio Devices"), FN(OnRescanDevices),
AudioIONotBusyFlag | CanStopAudioStreamFlag );
c->BeginSubMenu(_("Transport &Options"));
c->BeginMenu( _("Transport &Options") );
// Sound Activated recording options
c->AddItem( wxT("SoundActivationLevel"), XXO("Sound Activation Le&vel..."), FN(OnSoundActivated),
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),
AudioIONotBusyFlag | CanStopAudioStreamFlag, checkOff );
#endif
c->EndSubMenu();
c->EndMenu();
c->EndMenu();
@ -1073,11 +1073,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// Tracks Menu (formerly Project Menu)
//////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("&Tracks"));
c->BeginMenu( _("&Tracks") );
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Add &New"));
c->BeginMenu( _("Add &New") );
c->AddItem( wxT("NewMonoTrack"), XXO("&Mono Track"), FN(OnNewWaveTrack),
AudioIONotBusyFlag, wxT("Ctrl+Shift+N") );
@ -1088,13 +1088,13 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("NewTimeTrack"), XXO("&Time Track"),
FN(OnNewTimeTrack), AudioIONotBusyFlag );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
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
// 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 );
c->AddItem( wxT("MixAndRenderToNewTrack"), XXO("Mix and Render to Ne&w Track"), FN(OnMixAndRenderToNewTrack),
AudioIONotBusyFlag | WaveTracksSelectedFlag, wxT("Ctrl+Shift+M") );
c->EndSubMenu();
c->EndMenu();
c->AddItem( wxT("Resample"), XXO("&Resample..."), FN(OnResample),
AudioIONotBusyFlag | WaveTracksSelectedFlag );
@ -1120,14 +1120,14 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddSeparator();
c->BeginSubMenu(_("M&ute/Unmute"));
c->BeginMenu( _("M&ute/Unmute") );
c->AddItem( wxT("MuteAllTracks"), XXO("&Mute All Tracks"),
FN(OnMuteAllTracks), AudioIONotBusyFlag, wxT("Ctrl+U") );
c->AddItem( wxT("UnmuteAllTracks"), XXO("&Unmute All Tracks"),
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
// in the project could very easily be lost unless we require the tracks to be selcted.
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),
TracksSelectedFlag,
Options{}.LongName( _("Pan Center") ) );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
@ -1165,9 +1165,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
"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),
AudioIONotBusyFlag | TracksSelectedFlag);
c->AddSeparator();
@ -1178,18 +1178,18 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnMoveSelectionWithTracks),
AlwaysEnabledFlag,
Options{}.CheckState( gPrefs->Read(wxT("/GUI/MoveSelectionWithTracks"), 0L ) ) );
c->EndSubMenu();
c->EndMenu();
#if 0
// 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->SetCommandFlags(wxT("AlignMove"),
AudioIONotBusyFlag | TracksSelectedFlag,
AudioIONotBusyFlag | TracksSelectedFlag);
c->EndSubMenu();
c->EndMenu();
#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),
TracksExistFlag,
@ -1210,7 +1210,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
TracksExistFlag,
Options{}.LongName( _("Sort by Name") ) );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
@ -1233,7 +1233,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// Generate Menu
//////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("&Generate"));
c->BeginMenu( _("&Generate") );
#ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
c->AddItem( wxT("ManageGenerators"), XXO("Add / Remove Plug-ins..."),
@ -1253,7 +1253,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// Effect Menu
/////////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("Effe&ct"));
c->BeginMenu( _("Effe&ct") );
wxString buildMenuLabel;
if (!mLastEffect.IsEmpty()) {
@ -1285,7 +1285,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// Analyze Menu
//////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("&Analyze"));
c->BeginMenu( _("&Analyze") );
#ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
c->AddItem( wxT("ManageAnalyzers"), XXO("Add / Remove Plug-ins..."),
@ -1310,7 +1310,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// Tools Menu
//////////////////////////////////////////////////////////////////////////
c->BeginMenu(_("T&ools"));
c->BeginMenu( _("T&ools") );
#ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
c->AddItem( wxT("ManageTools"), XXO("Add / Remove Plug-ins..."),
@ -1321,13 +1321,13 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("ManageMacros"), XXO("&Macros..."),
FN(OnManageMacros), AudioIONotBusyFlag );
c->BeginSubMenu(_("&Apply Macro"));
c->BeginMenu( _("&Apply Macro") );
// Palette has no access key to ensure first letter navigation of sub menu
c->AddItem( wxT("ApplyMacrosPalette"), XXO("Palette..."),
FN(OnApplyMacrosPalette), AudioIONotBusyFlag );
c->AddSeparator();
PopulateMacrosMenu( c, AudioIONotBusyFlag );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
c->AddItem( wxT("FancyScreenshot"), XXO("&Screenshot..."),
@ -1372,7 +1372,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/////////////////////////////////////////////////////////////////////////////
{
c->BeginMenu(_("&Window"));
c->BeginMenu( _("&Window") );
/* i18n-hint: Standard Macintosh Window menu item: Make (the current
* window) shrink to an icon on the dock */
c->AddItem( wxT("MacMinimize"), XXO("&Minimize"), FN(OnMacMinimize), NotMinimizedFlag,
@ -1406,11 +1406,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
/////////////////////////////////////////////////////////////////////////////
// i18n-hint: Extra is a menu with extra commands
c->BeginMenu(_("Ext&ra"));
c->BeginMenu( _("Ext&ra") );
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("T&ransport"));
c->BeginMenu( _("T&ransport") );
// PlayStop is already in the menus.
/* i18n-hint: (verb) Start playing audio*/
@ -1446,11 +1446,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
wxT("Ctrl+Shift+F7") );
c->AddItem( wxT("PlayCutPreview"), XXO("Play C&ut Preview"), FN(OnPlayCutPreview),
CaptureNotBusyFlag, wxT("C") );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("T&ools"));
c->BeginMenu( _("T&ools") );
c->AddItem( wxT("SelectTool"), XXO("&Selection Tool"), FN(OnSelectTool),
AlwaysEnabledFlag, wxT("F1") );
@ -1469,11 +1469,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AlwaysEnabledFlag, wxT("A") );
c->AddItem( wxT("NextTool"), XXO("&Next Tool"), FN(OnNextTool),
AlwaysEnabledFlag, wxT("D") );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("Mi&xer"));
c->BeginMenu( _("Mi&xer") );
c->AddItem( wxT("OutputGain"), XXO("Ad&just Playback Volume..."),
FN(OnOutputGain), AlwaysEnabledFlag );
@ -1487,11 +1487,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnInputGainInc), AlwaysEnabledFlag );
c->AddItem( wxT("InputGainDec"), XXO("D&ecrease Recording Volume"),
FN(OnInputGainDec), AlwaysEnabledFlag );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Edit"));
c->BeginMenu( _("&Edit") );
c->AddItem( wxT("DeleteKey"), XXO("&Delete Key"), FN(OnDelete),
AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect,
@ -1502,11 +1502,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag | TracksSelectedFlag | TimeSelectedFlag | NoAutoSelect,
Options{ wxT("Delete") }
.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. */
c->AddItem( wxT("PlayAtSpeed"), XXO("Normal Pl&ay-at-Speed"),
@ -1528,11 +1528,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
CaptureNotBusyFlag | TrackPanelHasFocus, wxT("Alt+Left") );
c->AddItem( wxT("MoveToNextLabel"), XXO("Move to &Next Label"), FN(OnMoveToNextLabel),
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"),
FN(OnSeekLeftShort), AudioIOBusyFlag, wxT("Left\tallowDup") );
@ -1543,11 +1543,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FN(OnSeekLeftLong), AudioIOBusyFlag, wxT("Shift+Left\tallowDup") );
c->AddItem( wxT("SeekRightLong"), XXO("Long Seek Rig&ht During Playback"),
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),
AudioIONotBusyFlag, wxT("Shift+I") );
@ -1557,11 +1557,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag, wxT("Shift+H") );
c->AddItem( wxT("InputChannels"), XXO("Change Recording Cha&nnels..."), FN(OnInputChannels),
AudioIONotBusyFlag, wxT("Shift+N") );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Selection"));
c->BeginMenu( _("&Selection") );
c->AddItem( wxT("SnapToOff"), XXO("Snap-To &Off"), FN(OnSnapToOff),
AlwaysEnabledFlag );
@ -1589,7 +1589,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
c->AddItem( wxT("SelCntrRight"), XXO("Selection Contract R&ight"), FN(OnSelContractRight),
TracksExistFlag | TrackPanelHasFocus, wxT("Ctrl+Shift+Left\twantKeyup") );
c->EndSubMenu();
c->EndMenu();
c->AddSeparator();
@ -1599,7 +1599,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("F&ocus"));
c->BeginMenu( _("F&ocus") );
c->AddItem( wxT("PrevFrame"),
XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame),
@ -1627,11 +1627,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
FocusedTracksFlags, wxT("Return") );
c->AddItem( wxT("ToggleAlt"), XXO("Toggle Focuse&d Track"), FN(OnToggle),
FocusedTracksFlags, wxT("NUMPAD_ENTER") );
c->EndSubMenu();
c->EndMenu();
//////////////////////////////////////////////////////////////////////////
c->BeginSubMenu(_("&Cursor"));
c->BeginMenu( _("&Cursor") );
c->AddItem( wxT("CursorLeft"), XXO("Cursor &Left"), FN(OnCursorLeft),
TracksExistFlag | TrackPanelHasFocus, wxT("Left\twantKeyup\tallowDup") );
@ -1650,11 +1650,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
TracksExistFlag | TrackPanelHasFocus, wxT("\twantKeyup") );
c->AddItem( wxT("ClipRight"), XXO("Clip Rig&ht"), FN(OnClipRight),
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),
TrackPanelHasFocus | TracksExistFlag, wxT("Shift+P") );
@ -1684,11 +1684,11 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag | TrackPanelHasFocus | TracksExistFlag );
c->AddItem( wxT("TrackMoveBottom"), XXO("Move Focused Track to &Bottom"), FN(OnTrackMoveBottom),
AudioIONotBusyFlag | TrackPanelHasFocus | TracksExistFlag );
c->EndSubMenu();
c->EndMenu();
// These are the more useful to VI user Scriptables.
// 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,
// 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),
AudioIONotBusyFlag );
c->EndSubMenu();
c->EndMenu();
// Less useful to VI users.
c->BeginSubMenu(_("Scripta&bles II"));
c->BeginMenu( _("Scripta&bles II") );
c->AddItem( wxT("Select"), XXO("Select..."), FN(OnAudacityCommand),
AudioIONotBusyFlag );
@ -1756,7 +1756,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
AudioIONotBusyFlag );
c->EndSubMenu();
c->EndMenu();
// Accel key is not bindable.
@ -1798,7 +1798,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
wxGetApp().s_macHelpMenuTitleName = _("&Help");
#endif
c->BeginMenu(_("&Help"));
c->BeginMenu( _("&Help") );
c->AddItem( wxT("QuickFix"), XXO("&Quick Fix..."), FN(OnQuickFix),
AlwaysEnabledFlag );
@ -1818,7 +1818,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
#endif
c->AddSeparator();
c->BeginSubMenu(_("&Diagnostics"));
c->BeginMenu( _("&Diagnostics") );
c->AddItem( wxT("DeviceInfo"), XXO("Au&dio Device Info..."), FN(OnAudioDeviceInfo),
AudioIONotBusyFlag );
#ifdef EXPERIMENTAL_MIDI_OUT
@ -1835,7 +1835,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
#endif
c->AddItem( wxT("CheckDeps"), XXO("Chec&k Dependencies..."), FN(OnCheckDependencies),
AudioIONotBusyFlag );
c->EndSubMenu();
c->EndMenu();
#ifndef __WXMAC__
c->AddSeparator();
@ -2011,13 +2011,13 @@ void AddEffectMenuItems(CommandManager *c,
{
bool bInSubmenu = !last.IsEmpty() && (groupNames.Count() > 1);
if( bInSubmenu)
c->BeginSubMenu(last);
c->BeginMenu( last );
AddEffectMenuItemGroup(c, groupNames, vHasDialog,
groupPlugs, groupFlags, isDefault);
if (bInSubmenu)
c->EndSubMenu();
c->EndMenu();
groupNames.Clear();
vHasDialog.clear();
@ -2036,12 +2036,12 @@ void AddEffectMenuItems(CommandManager *c,
{
bool bInSubmenu = groupNames.Count() > 1;
if (bInSubmenu)
c->BeginSubMenu(current);
c->BeginMenu( current );
AddEffectMenuItemGroup(c, groupNames, vHasDialog, groupPlugs, groupFlags, isDefault);
if (bInSubmenu)
c->EndSubMenu();
c->EndMenu();
}
}
else
@ -2144,15 +2144,15 @@ void AddEffectMenuItemGroup(CommandManager *c,
{
end = groupCnt;
}
c->BeginSubMenu(wxString::Format(_("Plug-in %d to %d"),
c->BeginMenu( wxString::Format(_("Plug-in %d to %d"),
groupNdx + 1,
end));
end) );
}
if (i + 1 < namesCnt && names[i].IsSameAs(names[i + 1]))
{
wxString name = names[i];
c->BeginSubMenu(name);
c->BeginMenu( name );
while (i < namesCnt && names[i].IsSameAs(name))
{
const PluginDescriptor *plug = PluginManager::Get().GetPlugin(plugs[i]);
@ -2168,7 +2168,7 @@ void AddEffectMenuItemGroup(CommandManager *c,
i++;
}
c->EndSubMenu();
c->EndMenu();
i--;
}
else
@ -2190,7 +2190,7 @@ void AddEffectMenuItemGroup(CommandManager *c,
items--;
if (items == 0 || i + 1 == namesCnt)
{
c->EndSubMenu();
c->EndMenu();
items = max;
}
}
@ -2205,7 +2205,7 @@ void CreateRecentFilesMenu(CommandManager *c)
{
// Recent Files and Recent Projects menus
wxWeakRef<wxMenu> recentFilesMenu = c->BeginSubMenu(
wxWeakRef<wxMenu> recentFilesMenu = c->BeginMenu(
#ifdef __WXMAC__
/* 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()->AddFilesToMenu(recentFilesMenu);
c->EndSubMenu();
c->EndMenu();
wxTheApp->CallAfter( [=] {
// Bug 143 workaround.

30
src/commands/CommandManager.cpp
View File

@ -614,18 +614,44 @@ void CommandManager::SwapMenuBars()
///
/// 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>();
mCurrentMenu = uCurrentMenu.get();
mCurrentMenuName = tName;
return mCurrentMenu;
}
///
/// 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
// 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,
// or else BeginMenu followed by EndMenu. Don't mix them.
void BeginMenu(const wxString & tName);
wxMenu *BeginMenu(const wxString & tName);
void EndMenu();
wxMenu* BeginSubMenu(const wxString & tName);
void EndSubMenu();
// For specifying unusual arguments in AddItem
struct Options
{
@ -349,6 +346,10 @@ protected:
//
void Enable(CommandListEntry *entry, bool enabled);
wxMenu *BeginMainMenu(const wxString & tName);
void EndMainMenu();
wxMenu* BeginSubMenu(const wxString & tName);
void EndSubMenu();
//
// Accessing

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

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