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

Replace some macros for popup menus with function calls

Browse Source
This commit is contained in:
Paul Licameli 2020-02-08 15:34:23 -05:00
parent 30b26a0b99
commit e1e0869e26
10 changed files with 172 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tracks/labeltrack/ui/LabelTrackControls.cpp
View File

@ -72,9 +72,9 @@ enum
}; };
BEGIN_POPUP_MENU(LabelTrackMenuTable) BEGIN_POPUP_MENU(LabelTrackMenuTable)
BEGIN_POPUP_MENU_SECTION( "Basic" ) BeginSection( "Basic" );
POPUP_MENU_ITEM( "Font", OnSetFontID, XO("&Font..."), OnSetFont) AppendItem( "Font", OnSetFontID, XO("&Font..."), POPUP_MENU_FN( OnSetFont ) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()
void LabelTrackMenuTable::OnSetFont(wxCommandEvent &) void LabelTrackMenuTable::OnSetFont(wxCommandEvent &)

8
src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
View File

@ -131,10 +131,10 @@ void NoteTrackMenuTable::OnChangeOctave(wxCommandEvent &event)
} }
BEGIN_POPUP_MENU(NoteTrackMenuTable) BEGIN_POPUP_MENU(NoteTrackMenuTable)
BEGIN_POPUP_MENU_SECTION( "Basic" ) BeginSection( "Basic" );
POPUP_MENU_ITEM( "Up", OnUpOctaveID, XO("Up &Octave"), OnChangeOctave) AppendItem( "Up", OnUpOctaveID, XO("Up &Octave"), POPUP_MENU_FN( OnChangeOctave ) );
POPUP_MENU_ITEM( "Down", OnDownOctaveID, XO("Down Octa&ve"), OnChangeOctave) AppendItem( "Down", OnDownOctaveID, XO("Down Octa&ve"), POPUP_MENU_FN( OnChangeOctave ) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()
PopupMenuTable *NoteTrackControls::GetMenuExtension(Track *) PopupMenuTable *NoteTrackControls::GetMenuExtension(Track *)

32
src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
View File

@ -256,24 +256,24 @@ void NoteTrackVRulerMenuTable::OnZoom( int iZoomCode ){
BEGIN_POPUP_MENU(NoteTrackVRulerMenuTable) BEGIN_POPUP_MENU(NoteTrackVRulerMenuTable)
BEGIN_POPUP_MENU_SECTION( "Zoom" ) BeginSection( "Zoom" );
BEGIN_POPUP_MENU_SECTION( "Basic" ) BeginSection( "Basic" );
POPUP_MENU_ITEM( "Reset", OnZoomResetID, XO("Zoom Reset\tShift-Right-Click"), OnZoomReset) AppendItem( "Reset", OnZoomResetID, XO("Zoom Reset\tShift-Right-Click"), POPUP_MENU_FN( OnZoomReset ) );
POPUP_MENU_ITEM( "Max", OnZoomMaxID, XO("Max Zoom"), OnZoomMax) AppendItem( "Max", OnZoomMaxID, XO("Max Zoom"), POPUP_MENU_FN( OnZoomMax ) );
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "InOut" ) BeginSection( "InOut" );
POPUP_MENU_ITEM( "In", OnZoomInVerticalID, XO("Zoom In\tLeft-Click/Left-Drag"), OnZoomInVertical) AppendItem( "In", OnZoomInVerticalID, XO("Zoom In\tLeft-Click/Left-Drag"), POPUP_MENU_FN( OnZoomInVertical ) );
POPUP_MENU_ITEM( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"), OnZoomOutVertical) AppendItem( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"), POPUP_MENU_FN( OnZoomOutVertical ) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Pan" ) BeginSection( "Pan" );
BEGIN_POPUP_MENU_SECTION( "Octaves" ) BeginSection( "Octaves" );
POPUP_MENU_ITEM( "Up", OnUpOctaveID, XO("Up &Octave"), OnUpOctave) AppendItem( "Up", OnUpOctaveID, XO("Up &Octave"), POPUP_MENU_FN( OnUpOctave) );
POPUP_MENU_ITEM( "Down", OnDownOctaveID, XO("Down Octa&ve"), OnDownOctave) AppendItem( "Down", OnDownOctaveID, XO("Down Octa&ve"), POPUP_MENU_FN( OnDownOctave ) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()

24
src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
View File

@ -277,24 +277,28 @@ void SpectrumVRulerMenuTable::InitMenu(wxMenu *pMenu)
BEGIN_POPUP_MENU(SpectrumVRulerMenuTable) BEGIN_POPUP_MENU(SpectrumVRulerMenuTable)
BEGIN_POPUP_MENU_SECTION( "Scales" ) BeginSection( "Scales" );
{ {
const auto & names = SpectrogramSettings::GetScaleNames(); const auto & names = SpectrogramSettings::GetScaleNames();
for (int ii = 0, nn = names.size(); ii < nn; ++ii) { for (int ii = 0, nn = names.size(); ii < nn; ++ii) {
POPUP_MENU_RADIO_ITEM( names[ii].Internal(), AppendRadioItem( names[ii].Internal(),
OnFirstSpectrumScaleID + ii, names[ii].Msgid(), OnFirstSpectrumScaleID + ii, names[ii].Msgid(),
OnSpectrumScaleType); POPUP_MENU_FN( OnSpectrumScaleType ) );
} }
} }
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Zoom" ) BeginSection( "Zoom" );
POPUP_MENU_ITEM( "Reset", OnZoomResetID, XO("Zoom Reset"), OnZoomReset) AppendItem( "Reset", OnZoomResetID, XO("Zoom Reset"),
POPUP_MENU_ITEM( "Fit", OnZoomFitVerticalID, XO("Zoom to Fit\tShift-Right-Click"), OnZoomFitVertical) POPUP_MENU_FN( OnZoomReset ) );
POPUP_MENU_ITEM( "In", OnZoomInVerticalID, XO("Zoom In\tLeft-Click/Left-Drag"), OnZoomInVertical) AppendItem( "Fit", OnZoomFitVerticalID, XO("Zoom to Fit\tShift-Right-Click"),
POPUP_MENU_ITEM( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"), OnZoomOutVertical) POPUP_MENU_FN( OnZoomFitVertical ) );
END_POPUP_MENU_SECTION() AppendItem( "In", OnZoomInVerticalID, XO("Zoom In\tLeft-Click/Left-Drag"),
POPUP_MENU_FN( OnZoomInVertical ) );
AppendItem( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"),
POPUP_MENU_FN( OnZoomOutVertical ) );
EndSection();
END_POPUP_MENU() END_POPUP_MENU()

102
src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
View File

@ -206,14 +206,14 @@ const TranslatableString GetWaveColorStr(int colorIndex)
BEGIN_POPUP_MENU(WaveColorMenuTable) BEGIN_POPUP_MENU(WaveColorMenuTable)
POPUP_MENU_RADIO_ITEM( "Instrument1", OnInstrument1ID, AppendRadioItem( "Instrument1", OnInstrument1ID,
GetWaveColorStr(0), OnWaveColorChange) GetWaveColorStr(0), POPUP_MENU_FN( OnWaveColorChange ) );
POPUP_MENU_RADIO_ITEM( "Instrument2", OnInstrument2ID, AppendRadioItem( "Instrument2", OnInstrument2ID,
GetWaveColorStr(1), OnWaveColorChange) GetWaveColorStr(1), POPUP_MENU_FN( OnWaveColorChange ) );
POPUP_MENU_RADIO_ITEM( "Instrument3", OnInstrument3ID, AppendRadioItem( "Instrument3", OnInstrument3ID,
GetWaveColorStr(2), OnWaveColorChange) GetWaveColorStr(2), POPUP_MENU_FN( OnWaveColorChange ) );
POPUP_MENU_RADIO_ITEM( "Instrument4", OnInstrument4ID, AppendRadioItem( "Instrument4", OnInstrument4ID,
GetWaveColorStr(3), OnWaveColorChange) GetWaveColorStr(3), POPUP_MENU_FN( OnWaveColorChange ) );
END_POPUP_MENU() END_POPUP_MENU()
/// Converts a WaveColor enumeration to a wxWidgets menu item Id. /// Converts a WaveColor enumeration to a wxWidgets menu item Id.
@ -300,12 +300,12 @@ void FormatMenuTable::InitMenu(wxMenu *pMenu)
} }
BEGIN_POPUP_MENU(FormatMenuTable) BEGIN_POPUP_MENU(FormatMenuTable)
POPUP_MENU_RADIO_ITEM( "16Bit", On16BitID, AppendRadioItem( "16Bit", On16BitID,
GetSampleFormatStr(int16Sample), OnFormatChange) GetSampleFormatStr(int16Sample), POPUP_MENU_FN( OnFormatChange ) );
POPUP_MENU_RADIO_ITEM("24Bit", On24BitID, AppendRadioItem("24Bit", On24BitID,
GetSampleFormatStr( int24Sample), OnFormatChange) GetSampleFormatStr( int24Sample), POPUP_MENU_FN( OnFormatChange ) );
POPUP_MENU_RADIO_ITEM( "Float", OnFloatID, AppendRadioItem( "Float", OnFloatID,
GetSampleFormatStr(floatSample), OnFormatChange) GetSampleFormatStr(floatSample), POPUP_MENU_FN( OnFormatChange ) );
END_POPUP_MENU() END_POPUP_MENU()
/// Converts a format enumeration to a wxWidgets menu item Id. /// Converts a format enumeration to a wxWidgets menu item Id.
@ -424,23 +424,23 @@ void RateMenuTable::InitMenu(wxMenu *pMenu)
} }
} }
// Because of Bug 1780 we can't use POPUP_MENU_RADIO_ITEM // Because of Bug 1780 we can't use AppendRadioItem
// If we did, we'd get no message when clicking on Other... // If we did, we'd get no message when clicking on Other...
// when it is already selected. // when it is already selected.
BEGIN_POPUP_MENU(RateMenuTable) BEGIN_POPUP_MENU(RateMenuTable)
POPUP_MENU_CHECK_ITEM( "8000", OnRate8ID, XO("8000 Hz"), OnRateChange) AppendCheckItem( "8000", OnRate8ID, XO("8000 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "11025", OnRate11ID, XO("11025 Hz"), OnRateChange) AppendCheckItem( "11025", OnRate11ID, XO("11025 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "16000", OnRate16ID, XO("16000 Hz"), OnRateChange) AppendCheckItem( "16000", OnRate16ID, XO("16000 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "22050", OnRate22ID, XO("22050 Hz"), OnRateChange) AppendCheckItem( "22050", OnRate22ID, XO("22050 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "44100", OnRate44ID, XO("44100 Hz"), OnRateChange) AppendCheckItem( "44100", OnRate44ID, XO("44100 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "48000", OnRate48ID, XO("48000 Hz"), OnRateChange) AppendCheckItem( "48000", OnRate48ID, XO("48000 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "88200", OnRate88ID, XO("88200 Hz"), OnRateChange) AppendCheckItem( "88200", OnRate88ID, XO("88200 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "96000", OnRate96ID, XO("96000 Hz"), OnRateChange) AppendCheckItem( "96000", OnRate96ID, XO("96000 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "176400", OnRate176ID, XO("176400 Hz"), OnRateChange) AppendCheckItem( "176400", OnRate176ID, XO("176400 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "192000", OnRate192ID, XO("192000 Hz"), OnRateChange) AppendCheckItem( "192000", OnRate192ID, XO("192000 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "352800", OnRate352ID, XO("352800 Hz"), OnRateChange) AppendCheckItem( "352800", OnRate352ID, XO("352800 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "384000", OnRate384ID, XO("384000 Hz"), OnRateChange) AppendCheckItem( "384000", OnRate384ID, XO("384000 Hz"), POPUP_MENU_FN( OnRateChange ) );
POPUP_MENU_CHECK_ITEM( "Other", OnRateOtherID, XO("&Other..."), OnRateOther) AppendCheckItem( "Other", OnRateOtherID, XO("&Other..."), POPUP_MENU_FN( OnRateOther ) );
END_POPUP_MENU() END_POPUP_MENU()
const int nRates = 12; const int nRates = 12;
@ -768,20 +768,20 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
WaveTrack *const pTrack = static_cast<WaveTrack*>(mpTrack); WaveTrack *const pTrack = static_cast<WaveTrack*>(mpTrack);
const auto &view = WaveTrackView::Get( *pTrack ); const auto &view = WaveTrackView::Get( *pTrack );
BEGIN_POPUP_MENU_SECTION( "SubViews" ) BeginSection( "SubViews" );
if ( WaveTrackSubViews::slots() > 1 ) if ( WaveTrackSubViews::slots() > 1 )
POPUP_MENU_CHECK_ITEM( "MultiView", OnMultiViewID, XO("&Multi-view"), OnMultiView) AppendCheckItem( "MultiView", OnMultiViewID, XO("&Multi-view"), POPUP_MENU_FN( OnMultiView ) );
int id = OnSetDisplayId; int id = OnSetDisplayId;
for ( const auto &type : AllTypes() ) { for ( const auto &type : AllTypes() ) {
if ( view.GetMultiView() ) { if ( view.GetMultiView() ) {
POPUP_MENU_CHECK_ITEM( type.name.Internal(), id++, type.name.Msgid(), OnSetDisplay) AppendCheckItem( type.name.Internal(), id++, type.name.Msgid(), POPUP_MENU_FN( OnSetDisplay ) );
} }
else { else {
POPUP_MENU_RADIO_ITEM( type.name.Internal(), id++, type.name.Msgid(), OnSetDisplay) AppendRadioItem( type.name.Internal(), id++, type.name.Msgid(), POPUP_MENU_FN( OnSetDisplay ) );
} }
} }
END_POPUP_MENU_SECTION() EndSection();
if ( pTrack ) { if ( pTrack ) {
@ -791,9 +791,9 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
WaveTrackSubView::Type{ WaveTrackViewConstants::Waveform, {} } WaveTrackSubView::Type{ WaveTrackViewConstants::Waveform, {} }
) ); ) );
if( hasWaveform ){ if( hasWaveform ){
BEGIN_POPUP_MENU_SECTION( "WaveColor" ) BeginSection( "WaveColor" );
POPUP_MENU_SUB_MENU( "WaveColor", WaveColorMenuTable, mpData ) POPUP_MENU_SUB_MENU( "WaveColor", WaveColorMenuTable, mpData )
END_POPUP_MENU_SECTION() EndSection();
} }
bool hasSpectrum = (displays.end() != std::find( bool hasSpectrum = (displays.end() != std::find(
@ -801,36 +801,36 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
WaveTrackSubView::Type{ WaveTrackViewConstants::Spectrum, {} } WaveTrackSubView::Type{ WaveTrackViewConstants::Spectrum, {} }
) ); ) );
if( hasSpectrum ){ if( hasSpectrum ){
BEGIN_POPUP_MENU_SECTION( "SpectrogramSettings" ) BeginSection( "SpectrogramSettings" );
POPUP_MENU_ITEM( "SpectrogramSettings", OnSpectrogramSettingsID, XO("S&pectrogram Settings..."), OnSpectrogramSettings) AppendItem( "SpectrogramSettings", OnSpectrogramSettingsID, XO("S&pectrogram Settings..."), POPUP_MENU_FN( OnSpectrogramSettings ) );
END_POPUP_MENU_SECTION() EndSection();
} }
} }
BEGIN_POPUP_MENU_SECTION( "Channels" ) BeginSection( "Channels" );
// If these are enabled again, choose a hot key for Mono that does not conflict // If these are enabled again, choose a hot key for Mono that does not conflict
// with Multi View // with Multi View
// POPUP_MENU_RADIO_ITEM(OnChannelMonoID, XO("&Mono"), OnChannelChange) // AppendRadioItem(OnChannelMonoID, XO("&Mono"), OnChannelChange)
// POPUP_MENU_RADIO_ITEM(OnChannelLeftID, XO("&Left Channel"), OnChannelChange) // AppendRadioItem(OnChannelLeftID, XO("&Left Channel"), OnChannelChange)
// POPUP_MENU_RADIO_ITEM(OnChannelRightID, XO("R&ight Channel"), OnChannelChange) // AppendRadioItem(OnChannelRightID, XO("R&ight Channel"), OnChannelChange)
POPUP_MENU_ITEM( "MakeStereo", OnMergeStereoID, XO("Ma&ke Stereo Track"), OnMergeStereo) AppendItem( "MakeStereo", OnMergeStereoID, XO("Ma&ke Stereo Track"), POPUP_MENU_FN( OnMergeStereo ) );
POPUP_MENU_ITEM( "Swap", OnSwapChannelsID, XO("Swap Stereo &Channels"), OnSwapChannels) AppendItem( "Swap", OnSwapChannelsID, XO("Swap Stereo &Channels"), POPUP_MENU_FN( OnSwapChannels ) );
POPUP_MENU_ITEM( "Split", OnSplitStereoID, XO("Spl&it Stereo Track"), OnSplitStereo) AppendItem( "Split", OnSplitStereoID, XO("Spl&it Stereo Track"), POPUP_MENU_FN( OnSplitStereo ) );
// DA: Uses split stereo track and then drag pan sliders for split-stereo-to-mono // DA: Uses split stereo track and then drag pan sliders for split-stereo-to-mono
#ifndef EXPERIMENTAL_DA #ifndef EXPERIMENTAL_DA
POPUP_MENU_ITEM( "SplitToMono", OnSplitStereoMonoID, XO("Split Stereo to Mo&no"), OnSplitStereoMono) AppendItem( "SplitToMono", OnSplitStereoMonoID, XO("Split Stereo to Mo&no"), POPUP_MENU_FN( OnSplitStereoMono ) );
#endif #endif
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Format" ) BeginSection( "Format" );
POPUP_MENU_SUB_MENU( "Format", FormatMenuTable, mpData ) POPUP_MENU_SUB_MENU( "Format", FormatMenuTable, mpData )
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Rate" ) BeginSection( "Rate" );
POPUP_MENU_SUB_MENU( "Rate", RateMenuTable, mpData ) POPUP_MENU_SUB_MENU( "Rate", RateMenuTable, mpData )
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()

32
src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
View File

@ -279,33 +279,33 @@ void WaveformVRulerMenuTable::InitMenu(wxMenu *pMenu)
BEGIN_POPUP_MENU(WaveformVRulerMenuTable) BEGIN_POPUP_MENU(WaveformVRulerMenuTable)
BEGIN_POPUP_MENU_SECTION( "Scales" ) BeginSection( "Scales" );
{ {
const auto & names = WaveformSettings::GetScaleNames(); const auto & names = WaveformSettings::GetScaleNames();
for (int ii = 0, nn = names.size(); ii < nn; ++ii) { for (int ii = 0, nn = names.size(); ii < nn; ++ii) {
POPUP_MENU_RADIO_ITEM( names[ii].Internal(), AppendRadioItem( names[ii].Internal(),
OnFirstWaveformScaleID + ii, names[ii].Msgid(), OnFirstWaveformScaleID + ii, names[ii].Msgid(),
OnWaveformScaleType); POPUP_MENU_FN( OnWaveformScaleType ) );
} }
} }
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Zoom" ) BeginSection( "Zoom" );
BEGIN_POPUP_MENU_SECTION( "Basic" ) BeginSection( "Basic" );
POPUP_MENU_ITEM( "Reset", OnZoomFitVerticalID, XO("Zoom Reset\tShift-Right-Click"), OnZoomReset) AppendItem( "Reset", OnZoomFitVerticalID, XO("Zoom Reset\tShift-Right-Click"), POPUP_MENU_FN( OnZoomReset ) );
POPUP_MENU_ITEM( "TimesHalf", OnZoomDiv2ID, XO("Zoom x1/2"), OnZoomDiv2Vertical) AppendItem( "TimesHalf", OnZoomDiv2ID, XO("Zoom x1/2"), POPUP_MENU_FN( OnZoomDiv2Vertical ) );
POPUP_MENU_ITEM( "TimesTwo", OnZoomTimes2ID, XO("Zoom x2"), OnZoomTimes2Vertical) AppendItem( "TimesTwo", OnZoomTimes2ID, XO("Zoom x2"), POPUP_MENU_FN( OnZoomTimes2Vertical ) );
#ifdef EXPERIMENTAL_HALF_WAVE #ifdef EXPERIMENTAL_HALF_WAVE
POPUP_MENU_ITEM( "HalfWave", OnZoomHalfWaveID, XO("Half Wave"), OnZoomHalfWave) AppendItem( "HalfWave", OnZoomHalfWaveID, XO("Half Wave"), POPUP_MENU_FN( OnZoomHalfWave ) );
#endif #endif
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "InOut" ) BeginSection( "InOut" );
POPUP_MENU_ITEM( "In", OnZoomInVerticalID, XO("Zoom In\tLeft-Click/Left-Drag"), OnZoomInVertical) AppendItem( "In", OnZoomInVerticalID, XO("Zoom In\tLeft-Click/Left-Drag"), POPUP_MENU_FN( OnZoomInVertical ) );
POPUP_MENU_ITEM( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"), OnZoomOutVertical) AppendItem( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"), POPUP_MENU_FN( OnZoomOutVertical ) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()

16
src/tracks/timetrack/ui/TimeTrackControls.cpp
View File

@ -162,15 +162,15 @@ void TimeTrackMenuTable::OnTimeTrackLogInt(wxCommandEvent & /*event*/)
} }
BEGIN_POPUP_MENU(TimeTrackMenuTable) BEGIN_POPUP_MENU(TimeTrackMenuTable)
BEGIN_POPUP_MENU_SECTION( "Scales" ) BeginSection( "Scales" );
POPUP_MENU_RADIO_ITEM( "Linear", OnTimeTrackLinID, XO("&Linear scale"), OnTimeTrackLin) AppendRadioItem( "Linear", OnTimeTrackLinID, XO("&Linear scale"), POPUP_MENU_FN( OnTimeTrackLin ) );
POPUP_MENU_RADIO_ITEM( "Log", OnTimeTrackLogID, XO("L&ogarithmic scale"), OnTimeTrackLog) AppendRadioItem( "Log", OnTimeTrackLogID, XO("L&ogarithmic scale"), POPUP_MENU_FN( OnTimeTrackLog ) );
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Other" ) BeginSection( "Other" );
POPUP_MENU_ITEM( "Range", OnSetTimeTrackRangeID, XO("&Range..."), OnSetTimeTrackRange) AppendItem( "Range", OnSetTimeTrackRangeID, XO("&Range..."), POPUP_MENU_FN( OnSetTimeTrackRange ) );
POPUP_MENU_CHECK_ITEM( "LogInterp", OnTimeTrackLogIntID, XO("Logarithmic &Interpolation"), OnTimeTrackLogInt) AppendCheckItem( "LogInterp", OnTimeTrackLogIntID, XO("Logarithmic &Interpolation"), POPUP_MENU_FN( OnTimeTrackLogInt) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()
PopupMenuTable *TimeTrackControls::GetMenuExtension(Track *) PopupMenuTable *TimeTrackControls::GetMenuExtension(Track *)

26
src/tracks/ui/CommonTrackControls.cpp
View File

@ -127,11 +127,11 @@ void TrackMenuTable::InitMenu(wxMenu *pMenu)
} }
BEGIN_POPUP_MENU(TrackMenuTable) BEGIN_POPUP_MENU(TrackMenuTable)
BEGIN_POPUP_MENU_SECTION( "Basic" ) BeginSection( "Basic" );
POPUP_MENU_ITEM( "Name", OnSetNameID, XO("&Name..."), OnSetName) AppendItem( "Name", OnSetNameID, XO("&Name..."), POPUP_MENU_FN( OnSetName ) );
END_POPUP_MENU_SECTION() EndSection();
BEGIN_POPUP_MENU_SECTION( "Move" ) BeginSection( "Move" );
POPUP_MENU_ITEM( "Up", AppendItem( "Up",
// It is not correct to use NormalizedKeyString::Display here -- // It is not correct to use NormalizedKeyString::Display here --
// wxWidgets will apply its equivalent to the key names passed to menu // wxWidgets will apply its equivalent to the key names passed to menu
// functions. // functions.
@ -143,8 +143,8 @@ BEGIN_POPUP_MENU(TrackMenuTable)
GetKeyFromName(wxT("TrackMoveUp")).GET() ), GetKeyFromName(wxT("TrackMoveUp")).GET() ),
wxT("\t") wxT("\t")
), ),
OnMoveTrack) POPUP_MENU_FN( OnMoveTrack ) );
POPUP_MENU_ITEM( "Down", AppendItem( "Down",
OnMoveDownID, OnMoveDownID,
XO("Move Track &Down").Join( XO("Move Track &Down").Join(
Verbatim( Verbatim(
@ -153,8 +153,8 @@ BEGIN_POPUP_MENU(TrackMenuTable)
GetKeyFromName(wxT("TrackMoveDown")).GET() ), GetKeyFromName(wxT("TrackMoveDown")).GET() ),
wxT("\t") wxT("\t")
), ),
OnMoveTrack) POPUP_MENU_FN( OnMoveTrack ) );
POPUP_MENU_ITEM( "Top", AppendItem( "Top",
OnMoveTopID, OnMoveTopID,
XO("Move Track to &Top").Join( XO("Move Track to &Top").Join(
Verbatim( Verbatim(
@ -163,8 +163,8 @@ BEGIN_POPUP_MENU(TrackMenuTable)
GetKeyFromName(wxT("TrackMoveTop")).GET() ), GetKeyFromName(wxT("TrackMoveTop")).GET() ),
wxT("\t") wxT("\t")
), ),
OnMoveTrack) POPUP_MENU_FN( OnMoveTrack ) );
POPUP_MENU_ITEM( "Bottom", AppendItem( "Bottom",
OnMoveBottomID, OnMoveBottomID,
XO("Move Track to &Bottom").Join( XO("Move Track to &Bottom").Join(
Verbatim( Verbatim(
@ -173,8 +173,8 @@ BEGIN_POPUP_MENU(TrackMenuTable)
GetKeyFromName(wxT("TrackMoveBottom")).GET() ), GetKeyFromName(wxT("TrackMoveBottom")).GET() ),
wxT("\t") wxT("\t")
), ),
OnMoveTrack) POPUP_MENU_FN( OnMoveTrack ) );
END_POPUP_MENU_SECTION() EndSection();
END_POPUP_MENU() END_POPUP_MENU()

22
src/widgets/PopupMenuTable.cpp
View File

@ -145,6 +145,28 @@ void PopupMenuTable::ExtendMenu( wxMenu &menu, PopupMenuTable &table )
Registry::Visit( visitor, table.Get( theMenu.pUserData ).get() ); Registry::Visit( visitor, table.Get( theMenu.pUserData ).get() );
} }
void PopupMenuTable::Append(
const Identifier &stringId, PopupMenuTableEntry::Type type, int id,
const TranslatableString &string, wxCommandEventFunction memFn)
{
mStack.back()->items.push_back( std::make_unique<Entry>(
stringId, type, id, string, memFn
) );
}
void PopupMenuTable::BeginSection( const Identifier &name )
{
auto uSection = std::make_unique< PopupMenuSection >( name );
auto section = uSection.get();
mStack.back()->items.push_back( std::move( uSection ) );
mStack.push_back( section );
}
void PopupMenuTable::EndSection()
{
mStack.pop_back();
}
namespace{ namespace{
void PopupMenu::DisconnectTable(PopupMenuTable *pTable) void PopupMenu::DisconnectTable(PopupMenuTable *pTable)
{ {

62
src/widgets/PopupMenuTable.h
View File

@ -115,6 +115,27 @@ public:
protected: protected:
virtual void Populate() = 0; virtual void Populate() = 0;
// To be used in implementations of Populate():
void Append(
const Identifier &stringId, PopupMenuTableEntry::Type type, int id,
const TranslatableString &string, wxCommandEventFunction memFn);
void AppendItem( const Identifier &stringId, int id,
const TranslatableString &string, wxCommandEventFunction memFn )
{ Append( stringId, PopupMenuTableEntry::Item, id, string, memFn ); }
void AppendRadioItem( const Identifier &stringId, int id,
const TranslatableString &string, wxCommandEventFunction memFn )
{ Append( stringId, PopupMenuTableEntry::RadioItem, id, string, memFn ); }
void AppendCheckItem( const Identifier &stringId, int id,
const TranslatableString &string, wxCommandEventFunction memFn )
{ Append( stringId, PopupMenuTableEntry::CheckItem, id, string, memFn ); }
void BeginSection( const Identifier &name );
void EndSection();
void Clear() { mTop.reset(); } void Clear() { mTop.reset(); }
std::shared_ptr< Registry::GroupItem > mTop; std::shared_ptr< Registry::GroupItem > mTop;
@ -156,9 +177,10 @@ void MyTable::DestroyMenu()
BEGIN_POPUP_MENU(MyTable) BEGIN_POPUP_MENU(MyTable)
// This is inside a function and can contain arbitrary code. But usually // This is inside a function and can contain arbitrary code. But usually
// you only need a sequence of macro calls: // you only need a sequence of calls:
POPUP_MENU_ITEM("Cut", OnCutSelectedTextID, XO("Cu&t"), OnCutSelectedText) AppendItem("Cut",
OnCutSelectedTextID, XO("Cu&t"), POPUP_MENU_FN( OnCutSelectedText ) );
// etc. // etc.
END_POPUP_MENU() END_POPUP_MENU()
@ -192,46 +214,12 @@ void HandlerClass::Populate() { \
mStack.clear(); \ mStack.clear(); \
mStack.push_back( mTop.get() ); mStack.push_back( mTop.get() );
#define POPUP_MENU_APPEND(stringId, type, id, string, memFn) \ #define POPUP_MENU_FN( memFn ) ( (wxCommandEventFunction) (&My::memFn) )
mStack.back()->items.push_back( std::make_unique<Entry>( \
Identifier{ stringId }, \
type, \
id, \
string, \
memFn \
) );
#define POPUP_MENU_APPEND_ITEM(stringId, type, id, string, memFn) \
POPUP_MENU_APPEND( stringId, \
type, \
id, \
string, \
(wxCommandEventFunction) (&My::memFn) )
#define POPUP_MENU_ITEM(stringId, id, string, memFn) \
POPUP_MENU_APPEND_ITEM(stringId, Entry::Item, id, string, memFn);
#define POPUP_MENU_RADIO_ITEM(stringId, id, string, memFn) \
POPUP_MENU_APPEND_ITEM(stringId, Entry::RadioItem, id, string, memFn);
#define POPUP_MENU_CHECK_ITEM(stringId, id, string, memFn) \
POPUP_MENU_APPEND_ITEM(stringId, Entry::CheckItem, id, string, memFn);
// classname names a class that derives from MenuTable and defines Instance()
#define POPUP_MENU_SUB_MENU(stringId, classname, pUserData ) \ #define POPUP_MENU_SUB_MENU(stringId, classname, pUserData ) \
mStack.back()->items.push_back( \ mStack.back()->items.push_back( \
Registry::Shared( classname::Instance().Get( pUserData ) ) ); Registry::Shared( classname::Instance().Get( pUserData ) ) );
#define BEGIN_POPUP_MENU_SECTION( name ) \
{ auto uSection = std::make_unique< PopupMenuSection >( \
Identifier{ name } ); \
auto section = uSection.get(); \
mStack.back()->items.push_back( std::move( uSection ) ); \
mStack.push_back( section ); \
}
#define END_POPUP_MENU_SECTION() mStack.pop_back();
// ends function // ends function
#define END_POPUP_MENU() } #define END_POPUP_MENU() }