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:
@@ -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{
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user