diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp index 0956c7df0..7e05ad92c 100644 --- a/src/menus/EditMenus.cpp +++ b/src/menus/EditMenus.cpp @@ -1055,7 +1055,7 @@ MenuTable::BaseItemSharedPtr EditMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("Edit"), XO("&Edit"), - Section( "", + Section( "UndoRedo", Command( wxT("Undo"), XXO("&Undo"), FN(OnUndo), AudioIONotBusyFlag() | UndoAvailableFlag(), wxT("Ctrl+Z") ), @@ -1069,7 +1069,7 @@ MenuTable::BaseItemSharedPtr EditMenu() }) ), - Section( "", + Section( "Basic", // Basic Edit commands /* i18n-hint: (verb)*/ Command( wxT("Cut"), XXO("Cu&t"), FN(OnCut), @@ -1086,36 +1086,37 @@ MenuTable::BaseItemSharedPtr EditMenu() AudioIONotBusyFlag(), wxT("Ctrl+V") ), /* i18n-hint: (verb)*/ Command( wxT("Duplicate"), XXO("Duplic&ate"), FN(OnDuplicate), - NotBusyTimeAndTracksFlags, wxT("Ctrl+D") ) - ), + NotBusyTimeAndTracksFlags, wxT("Ctrl+D") ), - Section( "", - Menu( wxT("RemoveSpecial"), XO("R&emove Special"), - Section( "", - /* i18n-hint: (verb) Do a special kind of cut*/ - Command( wxT("SplitCut"), XXO("Spl&it Cut"), FN(OnSplitCut), - NotBusyTimeAndTracksFlags, - Options{ wxT("Ctrl+Alt+X") }.UseStrictFlags() ), - /* i18n-hint: (verb) Do a special kind of DELETE*/ - Command( wxT("SplitDelete"), XXO("Split D&elete"), FN(OnSplitDelete), - NotBusyTimeAndTracksFlags, - Options{ wxT("Ctrl+Alt+K") }.UseStrictFlags() ) - ), + Section( "", + Menu( wxT("RemoveSpecial"), XO("R&emove Special"), + Section( "", + /* i18n-hint: (verb) Do a special kind of cut*/ + Command( wxT("SplitCut"), XXO("Spl&it Cut"), FN(OnSplitCut), + NotBusyTimeAndTracksFlags, + Options{ wxT("Ctrl+Alt+X") }.UseStrictFlags() ), + /* i18n-hint: (verb) Do a special kind of DELETE*/ + Command( wxT("SplitDelete"), XXO("Split D&elete"), FN(OnSplitDelete), + NotBusyTimeAndTracksFlags, + Options{ wxT("Ctrl+Alt+K") }.UseStrictFlags() ) + ), - Section( "", - /* i18n-hint: (verb)*/ - Command( wxT("Silence"), XXO("Silence Audi&o"), FN(OnSilence), - AudioIONotBusyFlag() | TimeSelectedFlag() | WaveTracksSelectedFlag(), - wxT("Ctrl+L") ), - /* i18n-hint: (verb)*/ - Command( wxT("Trim"), XXO("Tri&m Audio"), FN(OnTrim), - AudioIONotBusyFlag() | TimeSelectedFlag() | WaveTracksSelectedFlag(), - Options{ wxT("Ctrl+T") }.UseStrictFlags() ) + Section( "", + /* i18n-hint: (verb)*/ + Command( wxT("Silence"), XXO("Silence Audi&o"), FN(OnSilence), + AudioIONotBusyFlag() | TimeSelectedFlag() | WaveTracksSelectedFlag(), + wxT("Ctrl+L") ), + /* i18n-hint: (verb)*/ + Command( wxT("Trim"), XXO("Tri&m Audio"), FN(OnTrim), + AudioIONotBusyFlag() | TimeSelectedFlag() | WaveTracksSelectedFlag(), + Options{ wxT("Ctrl+T") }.UseStrictFlags() ) + ) ) ) ), + - Section( "", + Section( "Other", ////////////////////////////////////////////////////////////////////////// Menu( wxT("Clip"), XO("Clip B&oundaries"), @@ -1150,7 +1151,7 @@ MenuTable::BaseItemSharedPtr EditMenu() #ifndef __WXMAC__ ), - Section( "", + Section( "Preferences", #else , #endif diff --git a/src/menus/ExtraMenus.cpp b/src/menus/ExtraMenus.cpp index 5a4795f31..8c151c763 100644 --- a/src/menus/ExtraMenus.cpp +++ b/src/menus/ExtraMenus.cpp @@ -163,7 +163,7 @@ MenuTable::BaseItemSharedPtr ExtraMenu() // Table of menu factories. // TODO: devise a registration system instead. static BaseItemSharedPtr extraItems{ Items( wxEmptyString, - Section( "", + Section( "Part1", ExtraTransportMenu() , ExtraToolsMenu() , ExtraMixerMenu() @@ -174,7 +174,7 @@ MenuTable::BaseItemSharedPtr ExtraMenu() , ExtraSelectionMenu() ), - Section( "", + Section( "Part2", ExtraGlobalCommands() , ExtraFocusMenu() , ExtraCursorMenu() diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index df712124e..c60ceeb14 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -560,7 +560,7 @@ MenuTable::BaseItemSharedPtr FileMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("File"), XO("&File"), - Section( "", + Section( "Basic", /*i18n-hint: "New" is an action (verb) to create a NEW project*/ Command( wxT("New"), XXO("&New"), FN(OnNew), AudioIONotBusyFlag(), wxT("Ctrl+N") ), @@ -618,7 +618,7 @@ MenuTable::BaseItemSharedPtr FileMenu() AudioIONotBusyFlag(), wxT("Ctrl+W") ) ), - Section( "", + Section( "Save", Menu( wxT("Save"), XO("&Save Project"), Command( wxT("Save"), XXO("&Save Project"), FN(OnSave), AudioIONotBusyFlag() | UnsavedChangesFlag(), wxT("Ctrl+S") ), @@ -636,7 +636,7 @@ MenuTable::BaseItemSharedPtr FileMenu() ) ), - Section( "", + Section( "Import-Export", Menu( wxT("Export"), XO("&Export"), // Enable Export audio commands only when there are audio tracks. Command( wxT("ExportMp3"), XXO("Export as MP&3"), FN(OnExportMp3), @@ -685,7 +685,7 @@ MenuTable::BaseItemSharedPtr FileMenu() ) ), - Section( "", + Section( "Print", Command( wxT("PageSetup"), XXO("Pa&ge Setup..."), FN(OnPageSetup), AudioIONotBusyFlag() | TracksExistFlag() ), /* i18n-hint: (verb) It's item on a menu. */ @@ -693,7 +693,7 @@ MenuTable::BaseItemSharedPtr FileMenu() AudioIONotBusyFlag() | TracksExistFlag() ) ), - Section( "", + Section( "Exit", // On the Mac, the Exit item doesn't actually go here...wxMac will // pull it out // and put it in the Audacity menu for us based on its ID. diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index afaa2996d..11c80e7a4 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -530,7 +530,7 @@ MenuTable::BaseItemSharedPtr HelpMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("Help"), XO("&Help"), - Section( "", + Section( "Basic", // QuickFix menu item not in Audacity 2.3.1 whilst we discuss further. #ifdef EXPERIMENTAL_DA // DA: Has QuickFix menu item. @@ -553,7 +553,7 @@ MenuTable::BaseItemSharedPtr HelpMenu() #else Section #endif - ( "", + ( "Other", Menu( wxT("Diagnostics"), XO("&Diagnostics"), Command( wxT("DeviceInfo"), XXO("Au&dio Device Info..."), FN(OnAudioDeviceInfo), diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp index a0b03a811..60473a51a 100644 --- a/src/menus/PluginMenus.cpp +++ b/src/menus/PluginMenus.cpp @@ -758,13 +758,13 @@ MenuTable::BaseItemSharedPtr GenerateMenu() ( FinderScope{ findCommandHandler }, Menu( wxT("Generate"), XO("&Generate"), #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT - Section( "", + Section( "Manage", Command( wxT("ManageGenerators"), XXO("Add / Remove Plug-ins..."), FN(OnManageGenerators), AudioIONotBusyFlag() ) ), #endif - Section( "", + Section( "Generators", // Delayed evaluation: [](AudacityProject &) { return Items( wxEmptyString, PopulateEffectsMenu( @@ -795,13 +795,13 @@ MenuTable::BaseItemSharedPtr EffectMenu() ( FinderScope{ findCommandHandler }, Menu( wxT("Effect"), XO("Effe&ct"), #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT - Section( "", + Section( "Manage", Command( wxT("ManageEffects"), XXO("Add / Remove Plug-ins..."), FN(OnManageEffects), AudioIONotBusyFlag() ) ), #endif - Section( "", + Section( "RepeatLast", // Delayed evaluation: [](AudacityProject &project) { @@ -821,7 +821,7 @@ MenuTable::BaseItemSharedPtr EffectMenu() } ), - Section( "", + Section( "Effects", // Delayed evaluation: [](AudacityProject &) { return Items( wxEmptyString, PopulateEffectsMenu( @@ -845,13 +845,13 @@ MenuTable::BaseItemSharedPtr AnalyzeMenu() ( FinderScope{ findCommandHandler }, Menu( wxT("Analyze"), XO("&Analyze"), #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT - Section( "", + Section( "Manage", Command( wxT("ManageAnalyzers"), XXO("Add / Remove Plug-ins..."), FN(OnManageAnalyzers), AudioIONotBusyFlag() ) ), #endif - Section( "", + Section( "Analyzers", Command( wxT("ContrastAnalyser"), XXO("Contrast..."), FN(OnContrast), AudioIONotBusyFlag() | WaveTracksSelectedFlag() | TimeSelectedFlag(), wxT("Ctrl+Shift+T") ), @@ -879,7 +879,7 @@ MenuTable::BaseItemSharedPtr ToolsMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("Tools"), XO("T&ools"), - Section( "", + Section( "Manage", #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT Command( wxT("ManageTools"), XXO("Add / Remove Plug-ins..."), FN(OnManageTools), AudioIONotBusyFlag() ), @@ -907,7 +907,7 @@ MenuTable::BaseItemSharedPtr ToolsMenu() ) ), - Section( "", + Section( "Other", Command( wxT("FancyScreenshot"), XXO("&Screenshot..."), FN(OnScreenshot), AudioIONotBusyFlag() ), @@ -921,7 +921,7 @@ MenuTable::BaseItemSharedPtr ToolsMenu() //#endif ), - Section( "", + Section( "Tools", // Delayed evaluation: [](AudacityProject&) { return Items( wxEmptyString, PopulateEffectsMenu( diff --git a/src/menus/SelectMenus.cpp b/src/menus/SelectMenus.cpp index 533411b7b..f1005e8ba 100644 --- a/src/menus/SelectMenus.cpp +++ b/src/menus/SelectMenus.cpp @@ -1039,7 +1039,7 @@ MenuTable::BaseItemSharedPtr SelectMenu() ( FinderScope{ findCommandHandler }, /* i18n-hint: (verb) It's an item on a menu. */ Menu( wxT("Select"), XO("&Select"), - Section( "", + Section( "Basic", Command( wxT("SelectAll"), XXO("&All"), FN(OnSelectAll), TracksExistFlag(), Options{ wxT("Ctrl+A"), XO("Select All") } ), diff --git a/src/menus/ToolbarMenus.cpp b/src/menus/ToolbarMenus.cpp index 3b726932a..0ac0221f7 100644 --- a/src/menus/ToolbarMenus.cpp +++ b/src/menus/ToolbarMenus.cpp @@ -264,13 +264,13 @@ MenuTable::BaseItemSharedPtr ToolbarsMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("Toolbars"), XO("&Toolbars"), - Section( "", + Section( "Reset", /* i18n-hint: (verb)*/ Command( wxT("ResetToolbars"), XXO("Reset Toolb&ars"), FN(OnResetToolBars), AlwaysEnabledFlag ) ), - Section( "", + Section( "Other", /* i18n-hint: Clicking this menu item shows the toolbar with the big buttons on it (play record etc)*/ Command( wxT("ShowTransportTB"), XXO("&Transport Toolbar"), diff --git a/src/menus/TrackMenus.cpp b/src/menus/TrackMenus.cpp index 88e07a381..3da7cc54a 100644 --- a/src/menus/TrackMenus.cpp +++ b/src/menus/TrackMenus.cpp @@ -1287,7 +1287,7 @@ MenuTable::BaseItemSharedPtr TracksMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("Tracks"), XO("&Tracks"), - Section( "", + Section( "Add", Menu( wxT("Add"), XO("Add &New"), Command( wxT("NewMonoTrack"), XXO("&Mono Track"), FN(OnNewWaveTrack), AudioIONotBusyFlag(), wxT("Ctrl+Shift+N") ), diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index 75b8200c7..0d7e38303 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -986,7 +986,7 @@ MenuTable::BaseItemSharedPtr TransportMenu() /* i18n-hint: 'Transport' is the name given to the set of controls that play, record, pause etc. */ Menu( wxT("Transport"), XO("Tra&nsport"), - Section( "", + Section( "Basic", Menu( wxT("Play"), XO("Pl&aying"), /* i18n-hint: (verb) Start or Stop audio playback*/ Command( wxT("PlayStop"), XXO("Pl&ay/Stop"), FN(OnPlayStop), @@ -1044,16 +1044,16 @@ MenuTable::BaseItemSharedPtr TransportMenu() CursorMenu() ), - Section( "", - Menu( wxT("PlayRegion"), XO("Pla&y Region"), - Command( wxT("LockPlayRegion"), XXO("&Lock"), FN(OnLockPlayRegion), - PlayRegionNotLockedFlag() ), - Command( wxT("UnlockPlayRegion"), XXO("&Unlock"), - FN(OnUnlockPlayRegion), PlayRegionLockedFlag() ) - ) - ), + Section( "Other", + Section( "", + Menu( wxT("PlayRegion"), XO("Pla&y Region"), + Command( wxT("LockPlayRegion"), XXO("&Lock"), FN(OnLockPlayRegion), + PlayRegionNotLockedFlag() ), + Command( wxT("UnlockPlayRegion"), XXO("&Unlock"), + FN(OnUnlockPlayRegion), PlayRegionLockedFlag() ) + ) + ), - Section( "", Command( wxT("RescanDevices"), XXO("R&escan Audio Devices"), FN(OnRescanDevices), AudioIONotBusyFlag() | CanStopAudioStreamFlag() ), diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp index 2ee55d532..e8ab97110 100644 --- a/src/menus/ViewMenus.cpp +++ b/src/menus/ViewMenus.cpp @@ -445,7 +445,7 @@ MenuTable::BaseItemSharedPtr ViewMenu() static BaseItemSharedPtr menu{ ( FinderScope{ findCommandHandler }, Menu( wxT("View"), XO("&View"), - Section( "", + Section( "Basic", Menu( wxT("Zoom"), XO("&Zoom"), Section( "", Command( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn), @@ -487,7 +487,7 @@ MenuTable::BaseItemSharedPtr ViewMenu() ) ), - Section( "", + Section( "Windows", // History window should be available either for UndoAvailableFlag // or RedoAvailableFlag, // but we can't make the AddItem flags and mask have both, @@ -541,7 +541,7 @@ MenuTable::BaseItemSharedPtr ViewMenu() ToolbarsMenu() ), - Section( "", + Section( "Other", Command( wxT("ShowExtraMenus"), XXO("&Extra Menus (on/off)"), FN(OnShowExtraMenus), AlwaysEnabledFlag, Options{}.CheckTest( wxT("/GUI/ShowExtraMenus"), false ) ),