From: <sv...@op...> - 2024-11-15 22:27:43
|
Author: sagamusix Date: Fri Nov 15 23:27:37 2024 New Revision: 22195 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22195 Log: Merged revision(s) 22191, 22194 from trunk/OpenMPT: [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 Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/common/versionNumber.h branches/OpenMPT-1.31/mptrack/CommandSet.cpp branches/OpenMPT-1.31/mptrack/MainFrm.cpp Modified: branches/OpenMPT-1.31/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.31/common/versionNumber.h Fri Nov 15 23:25:54 2024 (r22194) +++ branches/OpenMPT-1.31/common/versionNumber.h Fri Nov 15 23:27:37 2024 (r22195) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 31 #define VER_MINOR 12 -#define VER_MINORMINOR 01 +#define VER_MINORMINOR 02 OPENMPT_NAMESPACE_END Modified: branches/OpenMPT-1.31/mptrack/CommandSet.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/CommandSet.cpp Fri Nov 15 23:25:54 2024 (r22194) +++ branches/OpenMPT-1.31/mptrack/CommandSet.cpp Fri Nov 15 23:27:37 2024 (r22195) @@ -247,10 +247,15 @@ {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")}, Modified: branches/OpenMPT-1.31/mptrack/MainFrm.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/MainFrm.cpp Fri Nov 15 23:25:54 2024 (r22194) +++ branches/OpenMPT-1.31/mptrack/MainFrm.cpp Fri Nov 15 23:27:37 2024 (r22195) @@ -2467,6 +2467,7 @@ //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: |