1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00

Pass untranslated command labels to CommandManager...

... and deduce whether to exclude from macros inside NewIdentifier, simplifying
argument lists further

Also fix the localization of "..." added to names by PluginMenus.cpp
This commit is contained in:
Paul Licameli
2019-01-05 19:16:13 -05:00
parent 5cbafc6086
commit 70ec69fa3d
21 changed files with 100 additions and 131 deletions

View File

@@ -822,7 +822,6 @@ static CommandHandlerObject &findCommandHandler(AudacityProject &) {
#define FN(X) findCommandHandler, \
static_cast<CommandFunctorPointer>(& ClipActions::Handler :: X)
#define XXO(X) _(X), wxString{X}.Contains("...")
MenuTable::BaseItemPtr ClipSelectMenu( AudacityProject& )
{
@@ -840,10 +839,10 @@ MenuTable::BaseItemPtr ClipSelectMenu( AudacityProject& )
WaveTracksExistFlag ),
Command( wxT("SelPrevClip"), XXO("Previo&us Clip"),
FN(OnSelectPrevClip), WaveTracksExistFlag,
Options{ wxT("Alt+,"), _("Select Previous Clip") } ),
Options{ wxT("Alt+,"), XO("Select Previous Clip") } ),
Command( wxT("SelNextClip"), XXO("N&ext Clip"), FN(OnSelectNextClip),
WaveTracksExistFlag,
Options{ wxT("Alt+."), _("Select Next Clip") } )
Options{ wxT("Alt+."), XO("Select Next Clip") } )
);
}
@@ -856,11 +855,11 @@ MenuTable::BaseItemPtr ClipCursorItems( AudacityProject & )
Command( wxT("CursPrevClipBoundary"), XXO("Pre&vious Clip Boundary"),
FN(OnCursorPrevClipBoundary),
WaveTracksExistFlag,
Options{}.LongName( _("Cursor to Prev Clip Boundary") ) ),
Options{}.LongName( XO("Cursor to Prev Clip Boundary") ) ),
Command( wxT("CursNextClipBoundary"), XXO("Ne&xt Clip Boundary"),
FN(OnCursorNextClipBoundary),
WaveTracksExistFlag,
Options{}.LongName( _("Cursor to Next Clip Boundary") ) )
Options{}.LongName( XO("Cursor to Next Clip Boundary") ) )
);
}
@@ -876,5 +875,4 @@ MenuTable::BaseItemPtr ExtraClipCursorItems( AudacityProject & )
);
}
#undef XXO
#undef FN