From: <sag...@us...> - 2015-03-10 18:24:20
|
Revision: 4854 http://sourceforge.net/p/modplug/code/4854 Author: saga-games Date: 2015-03-10 18:24:07 +0000 (Tue, 10 Mar 2015) Log Message: ----------- [Mod] actually show new shortcuts in the context menu. Modified Paths: -------------- trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/mptrack/View_pat.h Modified: trunk/OpenMPT/mptrack/View_pat.cpp =================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp 2015-03-10 18:20:29 UTC (rev 4853) +++ trunk/OpenMPT/mptrack/View_pat.cpp 2015-03-10 18:24:07 UTC (rev 4854) @@ -1451,7 +1451,7 @@ if (BuildSoloMuteCtxMenu(hMenu, ih, nChn, pSndFile)) AppendMenu(hMenu, MF_SEPARATOR, 0, ""); BuildRecordCtxMenu(hMenu, ih, nChn, pModDoc); - BuildChannelControlCtxMenu(hMenu); + BuildChannelControlCtxMenu(hMenu, ih); } } @@ -6356,13 +6356,13 @@ } -bool CViewPattern::BuildChannelControlCtxMenu(HMENU hMenu) const -//-------------------------------------------------------------- +bool CViewPattern::BuildChannelControlCtxMenu(HMENU hMenu, CInputHandler *ih) const +//--------------------------------------------------------------------------------- { AppendMenu(hMenu, MF_SEPARATOR, 0, ""); - AppendMenu(hMenu, MF_STRING, ID_PATTERN_TRANSPOSECHANNEL, "&Transpose Channel"); - AppendMenu(hMenu, MF_STRING, ID_PATTERN_DUPLICATECHANNEL, "&Duplicate Channel"); + AppendMenu(hMenu, MF_STRING, ID_PATTERN_TRANSPOSECHANNEL, "&Transpose Channel\t" + ih->GetKeyTextFromCommand(kcChannelTranspose)); + AppendMenu(hMenu, MF_STRING, ID_PATTERN_DUPLICATECHANNEL, "&Duplicate Channel\t" + ih->GetKeyTextFromCommand(kcChannelDuplicate)); HMENU addChannelMenu = ::CreatePopupMenu(); AppendMenu(hMenu, MF_POPUP, reinterpret_cast<UINT_PTR>(addChannelMenu), "&Add Channel\t"); Modified: trunk/OpenMPT/mptrack/View_pat.h =================================================================== --- trunk/OpenMPT/mptrack/View_pat.h 2015-03-10 18:20:29 UTC (rev 4853) +++ trunk/OpenMPT/mptrack/View_pat.h 2015-03-10 18:24:07 UTC (rev 4854) @@ -460,7 +460,7 @@ CHANNELINDEX FindGroupRecordChannel(BYTE recordGroup, bool forceFreeChannel, CHANNELINDEX startChannel = 0) const; - bool BuildChannelControlCtxMenu(HMENU hMenu) const; + bool BuildChannelControlCtxMenu(HMENU hMenu, CInputHandler *ih) const; bool BuildPluginCtxMenu(HMENU hMenu, UINT nChn, CSoundFile *pSndFile) const; bool BuildRecordCtxMenu(HMENU hMenu, CInputHandler *ih, CHANNELINDEX nChn, CModDoc *pModDoc) const; bool BuildSoloMuteCtxMenu(HMENU hMenu, CInputHandler *ih, UINT nChn, CSoundFile *pSndFile) const; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |