1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-22 00:47:13 +01:00

ViewMenus not link dependent on ToolbarMenus

This commit is contained in:
Paul Licameli
2020-01-29 14:45:49 -05:00
parent ffe101f9a2
commit 1061c98b9f
2 changed files with 76 additions and 79 deletions

View File

@@ -253,16 +253,17 @@ static CommandHandlerObject &findCommandHandler(AudacityProject &) {
#define FN(X) (& ToolbarActions::Handler :: X)
// Under /MenuBar/View
MenuTable::BaseItemSharedPtr ToolbarsMenu()
namespace{
using namespace MenuTable;
BaseItemSharedPtr ToolbarsMenu()
{
using namespace MenuTable;
using Options = CommandManager::Options;
static const auto checkOff = Options{}.CheckState( false );
static BaseItemSharedPtr menu{
( FinderScope{ findCommandHandler },
Section( wxT("Toolbars"),
Menu( wxT("Toolbars"), XO("&Toolbars"),
Section( "Reset",
/* i18n-hint: (verb)*/
@@ -334,12 +335,16 @@ MenuTable::BaseItemSharedPtr ToolbarsMenu()
FN(OnShowSpectralSelectionToolBar), AlwaysEnabledFlag, checkOff )
#endif
)
)
) ) };
return menu;
}
namespace {
using namespace MenuTable;
AttachedItem sAttachment1{
Placement{ wxT("View/Other"), { OrderingHint::Begin } },
Shared( ToolbarsMenu() )
};
BaseItemSharedPtr ExtraToolsMenu()
{
static BaseItemSharedPtr menu{

View File

@@ -382,8 +382,6 @@ static CommandHandlerObject &findCommandHandler(AudacityProject &project) {
#define FN(X) (& ViewActions::Handler :: X)
MenuTable::BaseItemSharedPtr ToolbarsMenu();
// Under /MenuBar
namespace {
using namespace MenuTable;
@@ -440,12 +438,6 @@ BaseItemSharedPtr ViewMenu()
Section( "Windows" ),
Section( "",
//////////////////////////////////////////////////////////////////////////
ToolbarsMenu()
),
Section( "Other",
Command( wxT("ShowExtraMenus"), XXO("&Extra Menus (on/off)"),
FN(OnShowExtraMenus), AlwaysEnabledFlag,