Skip to content

Commit

Permalink
Merged revision(s) 22191, 22194 from trunk/OpenMPT:
Browse files Browse the repository at this point in the history 
[Fix] File/Append shortcut didn't work.
........
[Fix] Special note keys (cut/off/fade/PC/PCs) were not available in the default key map on various keyboard layouts (https://bugs.openmpt.org/view.php?id=1838).
........
[Mod] OpenMPT: Version is now 1.31.12.02

git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@22195 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
@sagamusix
sagamusix committed Nov 15, 2024
1 parent 2e4ebdf commit 3152b38
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion common/versionNumber.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ OPENMPT_NAMESPACE_BEGIN
#define VER_MAJORMAJOR 1
#define VER_MAJOR 31
#define VER_MINOR 12
#define VER_MINORMINOR 01
#define VER_MINORMINOR 02

OPENMPT_NAMESPACE_END
13 changes: 9 additions & 4 deletions mptrack/CommandSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,15 @@ constexpr struct
{kcSetOctave9, VK_NUMPAD9, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcChordModifier, VK_SHIFT, ModShift, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcNoteCut, VK_OEM_3, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcNoteOff, VK_OEM_PLUS, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcNoteFade, VK_OEM_PLUS, ModShift, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcNotePC, VK_OEM_MINUS, ModShift, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcNotePCS, VK_OEM_MINUS, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31")},
{kcNoteCut, 41 | 0x8000, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02") },
{kcNoteOff, VK_OEM_PLUS, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNoteOff, 13 | 0x8000, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNoteFade, VK_OEM_MINUS, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNoteFade, 12 | 0x8000, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNotePC, VK_OEM_102, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNotePC, 86 | 0x8000, ModNone, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNotePCS, VK_OEM_102, ModShift, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcNotePCS, 86 | 0x8000, ModShift, kKeyEventDown, kCtxViewPatternsNote, MPT_V("1.31.12.02")},
{kcSetIns0, VK_NUMPAD0, ModNone, kKeyEventDown, kCtxViewPatternsIns, MPT_V("1.31")},
{kcSetIns0, '0', ModNone, kKeyEventDown, kCtxViewPatternsIns, MPT_V("1.31")},
{kcSetIns1, VK_NUMPAD1, ModNone, kKeyEventDown, kCtxViewPatternsIns, MPT_V("1.31")},
Expand Down
1 change: 1 addition & 0 deletions mptrack/MainFrm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2467,6 +2467,7 @@ LRESULT CMainFrame::OnCustomKeyMsg(WPARAM wParam, LPARAM lParam)

//D'oh!! moddoc isn't a CWnd so we have to handle its messages and pass them on.

case kcFileAppend:
case kcFileSaveAs:
case kcFileSaveCopy:
case kcFileSaveAsWave:
Expand Down

0 comments on commit 3152b38

Please sign in to comment.