1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00

Define table for Extra global commands...

... Is it important to preserve the old sequence of registration?  It does at
least make some difference in what you see in the Keyboard preferences dialog.
This commit is contained in:
Paul Licameli 2018-10-20 17:43:17 -04:00
parent 5d4a7a76ad
commit 237bf4d9a3

View File

@ -548,6 +548,7 @@ MenuTable::BaseItemPtr ExtraPlayAtSpeedMenu( AudacityProject & );
MenuTable::BaseItemPtr ExtraSeekMenu( AudacityProject & ); MenuTable::BaseItemPtr ExtraSeekMenu( AudacityProject & );
MenuTable::BaseItemPtr ExtraDeviceMenu( AudacityProject & ); MenuTable::BaseItemPtr ExtraDeviceMenu( AudacityProject & );
MenuTable::BaseItemPtr ExtraSelectionMenu( AudacityProject & ); MenuTable::BaseItemPtr ExtraSelectionMenu( AudacityProject & );
MenuTable::BaseItemPtr ExtraGlobalCommands( AudacityProject & );
} }
// Tables of menu factories. // Tables of menu factories.
@ -561,6 +562,10 @@ static const std::shared_ptr<MenuTable::BaseItem> extraItems = MenuTable::Items(
, ExtraSeekMenu , ExtraSeekMenu
, ExtraDeviceMenu , ExtraDeviceMenu
, ExtraSelectionMenu , ExtraSelectionMenu
, MenuTable::Separator()
, ExtraGlobalCommands
); );
static const auto menuTree = MenuTable::Items( static const auto menuTree = MenuTable::Items(
@ -1935,6 +1940,21 @@ MenuTable::BaseItemPtr ExtraSelectionMenu( AudacityProject & )
); );
} }
MenuTable::BaseItemPtr ExtraGlobalCommands( AudacityProject & )
{
// Ceci n'est pas un menu
using namespace MenuTable;
using Options = CommandManager::Options;
return Items(
Command( wxT("PrevWindow"), XXO("Move Backward Through Active Windows"),
FN(OnPrevWindow), AlwaysEnabledFlag,
Options{ wxT("Alt+Shift+F6") }.IsGlobal() ),
Command( wxT("NextWindow"), XXO("Move Forward Through Active Windows"),
FN(OnNextWindow), AlwaysEnabledFlag,
Options{ wxT("Alt+F6") }.IsGlobal() )
);
}
} }
void MenuCreator::CreateMenusAndCommands(AudacityProject &project) void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
@ -1967,16 +1987,6 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
// i18n-hint: Extra is a menu with extra commands // i18n-hint: Extra is a menu with extra commands
c->BeginMenu( _("Ext&ra_") ); c->BeginMenu( _("Ext&ra_") );
c->AddSeparator();
// Global commands
c->AddItem( wxT("PrevWindow"), XXO("Move Backward Through Active Windows"),
FN(OnPrevWindow), AlwaysEnabledFlag,
Options{ wxT("Alt+Shift+F6") }.IsGlobal() );
c->AddItem( wxT("NextWindow"), XXO("Move Forward Through Active Windows"),
FN(OnNextWindow), AlwaysEnabledFlag,
Options{ wxT("Alt+F6") }.IsGlobal() );
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
c->BeginMenu( _("F&ocus") ); c->BeginMenu( _("F&ocus") );