Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00
Code Issues Releases Wiki Activity

Remove link dependencies on ClipMenus.cpp, register its menu items

Browse Source
This commit is contained in:
Paul Licameli 2019-01-13 18:27:58 -05:00
parent 6225043ff3
commit 02c5557054
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/menus/ClipMenus.cpp
View File

@ -823,10 +823,13 @@ static CommandHandlerObject &findCommandHandler(AudacityProject &) {
#define FN(X) (& ClipActions::Handler :: X) #define FN(X) (& ClipActions::Handler :: X)
// Under /MenuBar/Select namespace {
MenuTable::BaseItemSharedPtr ClipSelectMenu() using namespace MenuTable;
// Register menu items
BaseItemSharedPtr ClipSelectMenu()
{ {
using namespace MenuTable;
using Options = CommandManager::Options; using Options = CommandManager::Options;
static BaseItemSharedPtr menu { static BaseItemSharedPtr menu {
@ -850,10 +853,13 @@ MenuTable::BaseItemSharedPtr ClipSelectMenu()
return menu; return menu;
} }
// Under /MenuBar/Transport/Cursor AttachedItem sAttachment1{
MenuTable::BaseItemSharedPtr ClipCursorItems() wxT("Select/Basic"),
Shared( ClipSelectMenu() )
};
BaseItemSharedPtr ClipCursorItems()
{ {
using namespace MenuTable;
using Options = CommandManager::Options; using Options = CommandManager::Options;
static BaseItemSharedPtr items{ static BaseItemSharedPtr items{
@ -871,11 +877,14 @@ MenuTable::BaseItemSharedPtr ClipCursorItems()
return items; return items;
} }
// Under /MenuBar/Optional/Extra/Part2/Cursor AttachedItem sAttachment2{
MenuTable::BaseItemSharedPtr ExtraClipCursorItems() { wxT("Transport/Basic/Cursor"),
{ { OrderingHint::Before, wxT("CursProjectStart") } },
using namespace MenuTable; Shared( ClipCursorItems() )
};
BaseItemSharedPtr ExtraClipCursorItems()
{
static BaseItemSharedPtr items{ static BaseItemSharedPtr items{
( FinderScope{ findCommandHandler }, ( FinderScope{ findCommandHandler },
Items( wxT("Clip"), Items( wxT("Clip"),
@ -887,4 +896,11 @@ MenuTable::BaseItemSharedPtr ExtraClipCursorItems()
return items; return items;
} }
AttachedItem sAttachment3{
{ wxT("Optional/Extra/Part2/Cursor"), { OrderingHint::End, {} } },
Shared( ExtraClipCursorItems() )
};
}
#undef FN #undef FN

20
src/menus/SelectMenus.cpp
View File

@ -1028,8 +1028,6 @@ static CommandHandlerObject &findCommandHandler(AudacityProject &project) {
#define FN(X) (& SelectActions::Handler :: X) #define FN(X) (& SelectActions::Handler :: X)
MenuTable::BaseItemSharedPtr ClipSelectMenu();
namespace { namespace {
using namespace MenuTable; using namespace MenuTable;
BaseItemSharedPtr SelectMenu() BaseItemSharedPtr SelectMenu()
@ -1112,14 +1110,8 @@ BaseItemSharedPtr SelectMenu()
Command( wxT("NextLowerPeakFrequency"), Command( wxT("NextLowerPeakFrequency"),
XXO("Next &Lower Peak Frequency"), FN(OnNextLowerPeakFrequency), XXO("Next &Lower Peak Frequency"), FN(OnNextLowerPeakFrequency),
TracksExistFlag() ) TracksExistFlag() )
), )
#endif #endif
//////////////////////////////////////////////////////////////////////////
ClipSelectMenu()
//////////////////////////////////////////////////////////////////////////
), ),
Section( "", Section( "",
@ -1196,8 +1188,6 @@ AttachedItem sAttachment2{
}; };
} }
MenuTable::BaseItemSharedPtr ClipCursorItems();
// Under /MenuBar/Transport // Under /MenuBar/Transport
MenuTable::BaseItemSharedPtr CursorMenu() MenuTable::BaseItemSharedPtr CursorMenu()
{ {
@ -1230,8 +1220,6 @@ MenuTable::BaseItemSharedPtr CursorMenu()
TracksSelectedFlag(), TracksSelectedFlag(),
Options{ wxT("K"), XO("Cursor to Track End") } ), Options{ wxT("K"), XO("Cursor to Track End") } ),
ClipCursorItems(),
Command( wxT("CursProjectStart"), XXO("&Project Start"), Command( wxT("CursProjectStart"), XXO("&Project Start"),
FN(OnSkipStart), FN(OnSkipStart),
CanStopFlags, CanStopFlags,
@ -1243,8 +1231,6 @@ MenuTable::BaseItemSharedPtr CursorMenu()
return menu; return menu;
} }
MenuTable::BaseItemSharedPtr ExtraClipCursorItems();
namespace { namespace {
BaseItemSharedPtr ExtraCursorMenu() BaseItemSharedPtr ExtraCursorMenu()
{ {
@ -1268,9 +1254,7 @@ BaseItemSharedPtr ExtraCursorMenu()
TracksExistFlag() | TrackPanelHasFocus(), wxT("Shift+,") ), TracksExistFlag() | TrackPanelHasFocus(), wxT("Shift+,") ),
Command( wxT("CursorLongJumpRight"), XXO("Cursor Long Ju&mp Right"), Command( wxT("CursorLongJumpRight"), XXO("Cursor Long Ju&mp Right"),
FN(OnCursorLongJumpRight), FN(OnCursorLongJumpRight),
TracksExistFlag() | TrackPanelHasFocus(), wxT("Shift+.") ), TracksExistFlag() | TrackPanelHasFocus(), wxT("Shift+.") )
ExtraClipCursorItems()
) ) }; ) ) };
return menu; return menu;
} }