From: <sag...@us...> - 2012-09-28 19:54:14
|
Revision: 1367 http://modplug.svn.sourceforge.net/modplug/?rev=1367&view=rev Author: saga-games Date: 2012-09-28 19:54:06 +0000 (Fri, 28 Sep 2012) Log Message: ----------- [New] Pattern Editor: Can now also transpose by arbitrary amounts. Select from context menu or shortcut. [Mod] Updated various keymaps to add custom transpose command. [Mod] OpenMPT: Version is now 1.20.03.02 Modified Paths: -------------- trunk/OpenMPT/mptrack/CommandSet.cpp trunk/OpenMPT/mptrack/CommandSet.h trunk/OpenMPT/mptrack/KeyConfigDlg.cpp trunk/OpenMPT/mptrack/View_ins.cpp trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/mptrack/View_pat.h trunk/OpenMPT/mptrack/dlg_misc.cpp trunk/OpenMPT/mptrack/dlg_misc.h trunk/OpenMPT/mptrack/mptrack.rc trunk/OpenMPT/mptrack/resource.h trunk/OpenMPT/mptrack/version.h trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb trunk/OpenMPT/packageTemplate/extraKeymaps/FI_FT2Style_cce.mkb trunk/OpenMPT/packageTemplate/extraKeymaps/FR_FT2Style_(goor00).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_(legovitch).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_classic_(vanisherIII).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/SE_laptop_(ganja).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/UK_mpt_it2_hybrid_(rewbs).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/US_it2_(lpchip).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(nobuyuki).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/US_mptit_(coda).mkb trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb Modified: trunk/OpenMPT/mptrack/CommandSet.cpp =================================================================== --- trunk/OpenMPT/mptrack/CommandSet.cpp 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/CommandSet.cpp 2012-09-28 19:54:06 UTC (rev 1367) @@ -633,6 +633,7 @@ DefineKeyCommand(kcChnSettingsPrev, 1878, _T("Previous Channel")); DefineKeyCommand(kcChnSettingsNext, 1879, _T("Next Channel")); DefineKeyCommand(kcChnSettingsClose, 1880, _T("Switch to Pattern Editor")); + DefineKeyCommand(kcTransposeCustom, 1881, _T("Transpose Custom")); // Add new key commands here. #ifdef _DEBUG Modified: trunk/OpenMPT/mptrack/CommandSet.h =================================================================== --- trunk/OpenMPT/mptrack/CommandSet.h 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/CommandSet.h 2012-09-28 19:54:06 UTC (rev 1367) @@ -267,6 +267,7 @@ kcTransposeDown, kcTransposeOctUp, kcTransposeOctDown, + kcTransposeCustom, kcPatternAmplify, kcPatternInterpolateNote, kcPatternInterpolateVol, @@ -277,11 +278,11 @@ kcPatternSetInstrument, kcPatternGrowSelection, kcPatternShrinkSelection, - // kcClearSelection, - kcClearRow, + // kcClearSelection, + kcClearRow, kcClearField, kcClearFieldITStyle, - kcClearRowStep, + kcClearRowStep, kcClearFieldStep, kcClearFieldStepITStyle, kcDeleteRows, Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp =================================================================== --- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2012-09-28 19:54:06 UTC (rev 1367) @@ -276,9 +276,9 @@ for(int c = kcStartChannelKeys; c <= kcEndChannelKeys; c++) newCat.commands.Add(c); newCat.separators.Add(kcEndChannelKeys); //-------------------------------------- - for(int c = kcTransposeUp; c <= kcTransposeOctDown; c++) + for(int c = kcTransposeUp; c <= kcTransposeCustom; c++) newCat.commands.Add(c); - newCat.separators.Add(kcTransposeOctDown); //-------------------------------------- + newCat.separators.Add(kcTransposeCustom); //-------------------------------------- for(int c = kcPatternAmplify; c <= kcPatternShrinkSelection; c++) newCat.commands.Add(c); newCat.separators.Add(kcPatternShrinkSelection); //-------------------------------------- Modified: trunk/OpenMPT/mptrack/View_ins.cpp =================================================================== --- trunk/OpenMPT/mptrack/View_ins.cpp 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/View_ins.cpp 2012-09-28 19:54:06 UTC (rev 1367) @@ -2311,7 +2311,7 @@ int nOffset = ((m_nEnv != ENV_VOLUME) && !GetEnvelopePtr()->dwFlags[ENV_FILTER]) ? 32 : 0; CScaleEnvPointsDlg dlg(this, GetEnvelopePtr(), nOffset); - if(dlg.DoModal()) + if(dlg.DoModal() == IDOK) { SetInstrumentModified(); pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); Modified: trunk/OpenMPT/mptrack/View_pat.cpp =================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/View_pat.cpp 2012-09-28 19:54:06 UTC (rev 1367) @@ -108,6 +108,7 @@ ON_COMMAND(ID_TRANSPOSE_DOWN, OnTransposeDown) ON_COMMAND(ID_TRANSPOSE_OCTUP, OnTransposeOctUp) ON_COMMAND(ID_TRANSPOSE_OCTDOWN, OnTransposeOctDown) + ON_COMMAND(ID_TRANSPOSE_CUSTOM, OnTransposeCustom) ON_COMMAND(ID_PATTERN_PROPERTIES, OnPatternProperties) ON_COMMAND(ID_PATTERN_INTERPOLATE_VOLUME, OnInterpolateVolume) ON_COMMAND(ID_PATTERN_INTERPOLATE_EFFECT, OnInterpolateEffect) @@ -1370,7 +1371,7 @@ if(pModDoc && pModDoc->GetSoundFile() && pModDoc->GetSoundFile()->Patterns.IsValidPat(m_nPattern)) { CPatternPropertiesDlg dlg(pModDoc, m_nPattern, this); - if (dlg.DoModal()) + if(dlg.DoModal() == IDOK) { UpdateScrollSize(); InvalidatePattern(true); @@ -2791,6 +2792,19 @@ } +void CViewPattern::OnTransposeCustom() +//------------------------------------ +{ + static int32 tranpose = 1; + CInputDlg dlg(this, "Enter transpose amount:", -(NOTE_MAX - NOTE_MIN), (NOTE_MAX - NOTE_MIN), tranpose); + if(dlg.DoModal() == IDOK) + { + tranpose = dlg.resultNumber; + TransposeSelection(dlg.resultNumber); + } +} + + bool CViewPattern::TransposeSelection(int transp) //----------------------------------------------- { @@ -3980,6 +3994,7 @@ case kcTransposeDown: OnTransposeDown(); return wParam; case kcTransposeOctUp: OnTransposeOctUp(); return wParam; case kcTransposeOctDown: OnTransposeOctDown(); return wParam; + case kcTransposeCustom: OnTransposeCustom(); return wParam; case kcSelectColumn: OnSelectCurrentColumn(); return wParam; case kcPatternAmplify: OnPatternAmplify(); return wParam; case kcPatternSetInstrument: OnSetSelInstrument(); return wParam; @@ -5747,12 +5762,13 @@ vector<CHANNELINDEX> validChans; DWORD greyed = IsColumnSelected(PatternCursor::noteColumn) ? FALSE : MF_GRAYED; - if (!greyed || !(CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_OLDCTXMENUSTYLE)) + if(!greyed || !(CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_OLDCTXMENUSTYLE)) { AppendMenu(transMenu, MF_STRING | greyed, ID_TRANSPOSE_UP, "Transpose +1\t" + ih->GetKeyTextFromCommand(kcTransposeUp)); AppendMenu(transMenu, MF_STRING | greyed, ID_TRANSPOSE_DOWN, "Transpose -1\t" + ih->GetKeyTextFromCommand(kcTransposeDown)); AppendMenu(transMenu, MF_STRING | greyed, ID_TRANSPOSE_OCTUP, "Transpose +12\t" + ih->GetKeyTextFromCommand(kcTransposeOctUp)); AppendMenu(transMenu, MF_STRING | greyed, ID_TRANSPOSE_OCTDOWN, "Transpose -12\t" + ih->GetKeyTextFromCommand(kcTransposeOctDown)); + AppendMenu(transMenu, MF_STRING | greyed, ID_TRANSPOSE_CUSTOM, "Custom...\t" + ih->GetKeyTextFromCommand(kcTransposeCustom)); AppendMenu(hMenu, MF_POPUP | greyed, reinterpret_cast<UINT_PTR>(transMenu), "Transpose..."); return true; } @@ -5765,7 +5781,7 @@ vector<CHANNELINDEX> validChans; DWORD greyed = IsColumnSelected(PatternCursor::volumeColumn) ? 0 : MF_GRAYED; - if (!greyed || !(CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_OLDCTXMENUSTYLE)) + if(!greyed || !(CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_OLDCTXMENUSTYLE)) { AppendMenu(hMenu, MF_STRING | greyed, ID_PATTERN_AMPLIFY, "Amplify\t" + ih->GetKeyTextFromCommand(kcPatternAmplify)); return true; Modified: trunk/OpenMPT/mptrack/View_pat.h =================================================================== --- trunk/OpenMPT/mptrack/View_pat.h 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/View_pat.h 2012-09-28 19:54:06 UTC (rev 1367) @@ -383,6 +383,7 @@ afx_msg void OnTransposeDown() { TransposeSelection(-1); } afx_msg void OnTransposeOctUp() { TransposeSelection(12); } afx_msg void OnTransposeOctDown() { TransposeSelection(-12); } + afx_msg void OnTransposeCustom(); afx_msg void OnSetSelInstrument(); afx_msg void OnAddChannelFront() { AddChannelBefore(m_MenuCursor.GetChannel()); } afx_msg void OnAddChannelAfter() { AddChannelBefore(m_MenuCursor.GetChannel() + 1); }; Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp =================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.cpp 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2012-09-28 19:54:06 UTC (rev 1367) @@ -1122,6 +1122,75 @@ } +///////////////////////////////////////////////////////////////////////// +// Generic input dialog + +void CInputDlg::DoDataExchange(CDataExchange* pDX) +//------------------------------------------------ +{ + CDialog::DoDataExchange(pDX); + DDX_Control(pDX, IDC_SPIN1, spin); +} + + +BOOL CInputDlg::OnInitDialog() +//---------------------------- +{ + CDialog::OnInitDialog(); + SetDlgItemText(IDC_PROMPT, description); + + // Get all current control sizes and positions + CRect windowRect, labelRect, inputRect, okRect, cancelRect; + GetWindowRect(windowRect); + GetDlgItem(IDC_PROMPT)->GetWindowRect(labelRect); + GetDlgItem(IDC_EDIT1)->GetWindowRect(inputRect); + GetDlgItem(IDOK)->GetWindowRect(okRect); + GetDlgItem(IDCANCEL)->GetWindowRect(cancelRect); + ScreenToClient(labelRect); + ScreenToClient(inputRect); + ScreenToClient(okRect); + ScreenToClient(cancelRect); + + // Find out how big our label shall be + CSize size; + GetTextExtentPoint32(GetDC()->GetSafeHdc(), description, strlen(description), &size); + if(size.cx < 320) size.cx = 320; + const int windowWidth = windowRect.Width() - labelRect.Width() + size.cx; + const int windowHeight = windowRect.Height() - labelRect.Height() + size.cy; + + // Resize and move all controls + GetDlgItem(IDC_PROMPT)->SetWindowPos(nullptr, 0, 0, size.cx, size.cy, SWP_NOMOVE | SWP_NOZORDER); + GetDlgItem(IDC_EDIT1)->SetWindowPos(nullptr, inputRect.left, labelRect.top + size.cy + (inputRect.top - labelRect.bottom), size.cx, inputRect.Height(), SWP_NOZORDER); + GetDlgItem(IDOK)->SetWindowPos(nullptr, windowWidth - (windowRect.Width() - okRect.left), windowHeight - (windowRect.Height() - okRect.top), 0, 0, SWP_NOSIZE | SWP_NOZORDER); + GetDlgItem(IDCANCEL)->SetWindowPos(nullptr, windowWidth - (windowRect.Width() - cancelRect.left), windowHeight - (windowRect.Height() - cancelRect.top), 0, 0, SWP_NOSIZE | SWP_NOZORDER); + SetWindowPos(nullptr, 0, 0, windowWidth, windowHeight, SWP_NOMOVE | SWP_NOZORDER); + + if(minValue != maxValue) + { + // Numeric + spin.SetRange(minValue, maxValue); + spin.SetBuddy(GetDlgItem(IDC_EDIT1)); + SetDlgItemInt(IDC_EDIT1, resultNumber); + } else + { + // Text + spin.ShowWindow(SW_HIDE); + SetDlgItemText(IDC_EDIT1, resultString); + } + + return TRUE; +} + + +void CInputDlg::OnOK() +//-------------------- +{ + CDialog::OnOK(); + GetDlgItemText(IDC_EDIT1, resultString); + resultNumber = static_cast<int32>(GetDlgItemInt(IDC_EDIT1)); +} + + /////////////////////////////////////////////////////////////////////////////////////// // Messagebox with 'don't show again'-option. Modified: trunk/OpenMPT/mptrack/dlg_misc.h =================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.h 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/dlg_misc.h 2012-09-28 19:54:06 UTC (rev 1367) @@ -222,6 +222,37 @@ ///////////////////////////////////////////////////////////////////////// +// Generic input dialog + +//============================= +class CInputDlg: public CDialog +//============================= +{ +protected: + CSpinButtonCtrl spin; + const char *description; + int32 minValue, maxValue; + +public: + CString resultString; + int32 resultNumber; + +public: + // Initialize text input box + CInputDlg(CWnd *parent, const char *desc, const char *defaultString) : CDialog(IDD_INPUT, parent), + description(desc), minValue(0), maxValue(0), resultString(defaultString) { } + // Initialize numeric input box + CInputDlg(CWnd *parent, const char *desc, int32 minVal, int32 maxVal, int32 defaultNumber) : CDialog(IDD_INPUT, parent), + description(desc), minValue(minVal), maxValue(maxVal), resultNumber(defaultNumber) { } + +protected: + virtual void DoDataExchange(CDataExchange* pDX); + virtual BOOL OnInitDialog(); + virtual void OnOK(); +}; + + +///////////////////////////////////////////////////////////////////////// // Messagebox with 'don't show again'-option. // Enums for message entries. See dlg_misc.cpp for the array of entries. Modified: trunk/OpenMPT/mptrack/mptrack.rc =================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/mptrack.rc 2012-09-28 19:54:06 UTC (rev 1367) @@ -244,6 +244,19 @@ END +IDD_INPUT DIALOGEX 0, 0, 166, 66 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "OpenMPT" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_PROMPT,6,6,156,12 + EDITTEXT IDC_EDIT1,6,24,150,12,ES_AUTOHSCROLL + CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,150,24,11,11 + DEFPUSHBUTTON "OK",IDOK,54,42,50,14 + PUSHBUTTON "Cancel",IDCANCEL,108,42,50,14 +END + + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -347,6 +360,14 @@ TOPMARGIN, 7 BOTTOMMARGIN, 70 END + + IDD_INPUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 159 + TOPMARGIN, 7 + BOTTOMMARGIN, 59 + END END #endif // APSTUDIO_INVOKED Modified: trunk/OpenMPT/mptrack/resource.h =================================================================== --- trunk/OpenMPT/mptrack/resource.h 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/resource.h 2012-09-28 19:54:06 UTC (rev 1367) @@ -148,6 +148,7 @@ #define IDD_OPTIONS_UPDATE 529 #define IDD_CLOSEDOCUMENTS 530 #define IDD_AUTOTUNE 531 +#define IDD_INPUT 532 #define IDC_BUTTON1 1001 #define IDC_BUTTON2 1002 #define IDC_BUTTON3 1003 @@ -938,6 +939,7 @@ #define IDC_SAMPLE_AUTOTUNE 2437 #define IDC_FIND 2438 #define IDC_PITCHWHEELDEPTH 2439 +#define IDC_PROMPT 2440 #define ID_FILE_NEWMOD 32771 #define ID_FILE_NEWXM 32772 #define ID_FILE_NEWS3M 32773 @@ -1207,15 +1209,16 @@ #define ID_HELPSHOW 44602 #define ID_ORDERLIST_LOCKPLAYBACK 44603 #define ID_ORDERLIST_UNLOCKPLAYBACK 44604 +#define ID_TRANSPOSE_CUSTOM 44605 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 535 -#define _APS_NEXT_COMMAND_VALUE 44605 -#define _APS_NEXT_CONTROL_VALUE 2440 +#define _APS_NEXT_RESOURCE_VALUE 536 +#define _APS_NEXT_COMMAND_VALUE 44606 +#define _APS_NEXT_CONTROL_VALUE 2441 #define _APS_NEXT_SYMED_VALUE 901 #endif #endif Modified: trunk/OpenMPT/mptrack/version.h =================================================================== --- trunk/OpenMPT/mptrack/version.h 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/mptrack/version.h 2012-09-28 19:54:06 UTC (rev 1367) @@ -19,7 +19,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 20 #define VER_MINOR 03 -#define VER_MINORMINOR 01 +#define VER_MINORMINOR 02 //Creates version number from version parts that appears in version string. //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -103,6 +103,7 @@ 2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold) 2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold) 2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate Volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate Effect: Ctrl+K (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/FI_FT2Style_cce.mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/FI_FT2Style_cce.mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/FI_FT2Style_cce.mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -87,6 +87,7 @@ 2:1008:4:81:5 //Transpose -1: Alt+Q (KeyDown|KeyHold) 2:1009:5:65:5 //Transpose +12: Shift+Alt+A (KeyDown|KeyHold) 2:1010:5:81:5 //Transpose -12: Shift+Alt+Q (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:4:74:1 //Amplify selection: Alt+J (KeyDown) 2:1014:4:73:1 //Interpolate volume: Alt+I (KeyDown) 2:1015:4:88:1 //Interpolate effect: Alt+X (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/FR_FT2Style_(goor00).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/FR_FT2Style_(goor00).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/FR_FT2Style_(goor00).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -84,6 +84,7 @@ 2:1008:2:81:5 //Transpose -1: Ctrl+Q (KeyDown|KeyHold) 2:1009:6:81:5 //Transpose +12: Ctrl+Alt+Q (KeyDown|KeyHold) 2:1010:6:65:5 //Transpose -12: Ctrl+Alt+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:4:74:1 //Amplify selection: Alt+J (KeyDown) 2:1014:4:73:1 //Interpolate volume: Alt+I (KeyDown) 2:1015:4:88:1 //Interpolate effect: Alt+X (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_(legovitch).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_(legovitch).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_(legovitch).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -91,6 +91,7 @@ 2:1008:2:81:1 //Transpose -1: Ctrl+Q (KeyDown) 2:1009:6:65:5 //Transpose +12: Ctrl+Alt+A (KeyDown|KeyHold) 2:1010:6:81:5 //Transpose -12: Ctrl+Alt+Q (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_classic_(vanisherIII).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_classic_(vanisherIII).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_classic_(vanisherIII).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -77,6 +77,7 @@ 2:1008:2:81:1 //Transpose -1: Ctrl+Q (KeyDown) 2:1009:6:65:5 //Transpose +12: Ctrl+Alt+A (KeyDown|KeyHold) 2:1010:6:81:5 //Transpose -12: Ctrl+Alt+Q (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -86,6 +86,7 @@ 2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold) 2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold) 2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/SE_laptop_(ganja).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/SE_laptop_(ganja).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/SE_laptop_(ganja).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -49,6 +49,7 @@ 2:1008:6:40:1 //Transpose -1: Ctrl+Alt+NEDPIL (KeyDown) 2:1009:3:38:1 //Transpose +12: Shift+Ctrl+UPPIL (KeyDown) 2:1010:3:40:1 //Transpose -12: Shift+Ctrl+NEDPIL (KeyDown) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) 2:1016:0:65:1 //Open effect visualizer: A (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/UK_mpt_it2_hybrid_(rewbs).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/UK_mpt_it2_hybrid_(rewbs).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/UK_mpt_it2_hybrid_(rewbs).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -89,6 +89,7 @@ 2:1008:4:65:5 //Transpose -1: Alt+A (KeyDown|KeyHold) 2:1009:6:81:5 //Transpose +12: Ctrl+Alt+Q (KeyDown|KeyHold) 2:1010:6:65:5 //Transpose -12: Ctrl+Alt+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:4:74:1 //Amplify selection: Alt+J (KeyDown) 2:1014:4:73:1 //Interpolate volume: Alt+I (KeyDown) 2:1015:4:88:1 //Interpolate effect: Alt+X (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/US_it2_(lpchip).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/US_it2_(lpchip).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/US_it2_(lpchip).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -81,6 +81,7 @@ 2:1008:4:65:5 //Transpose -1: Alt+A (KeyDown|KeyHold) 2:1009:6:81:5 //Transpose +12: Ctrl+Alt+Q (KeyDown|KeyHold) 2:1010:6:65:5 //Transpose -12: Ctrl+Alt+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:4:74:1 //Amplify selection: Alt+J (KeyDown) 2:1014:4:75:1 //Interpolate volume: Alt+K (KeyDown) 2:1015:4:88:1 //Interpolate effect: Alt+X (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(nobuyuki).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(nobuyuki).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(nobuyuki).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -74,6 +74,7 @@ 2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold) 2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold) 2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -92,6 +92,7 @@ 2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold) 2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold) 2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/US_mptit_(coda).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/US_mptit_(coda).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/US_mptit_(coda).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -83,6 +83,7 @@ 2:1008:4:65:5 //Transpose -1: Alt+A (KeyDown|KeyHold) 2:1009:6:81:5 //Transpose +12: Ctrl+Alt+Q (KeyDown|KeyHold) 2:1010:6:65:5 //Transpose -12: Ctrl+Alt+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:4:74:1 //Amplify selection: Alt+J (KeyDown) 2:1014:4:75:1 //Interpolate volume: Alt+K (KeyDown) 2:1015:4:88:1 //Interpolate effect: Alt+X (KeyDown) Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb =================================================================== --- trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb 2012-09-28 15:36:28 UTC (rev 1366) +++ trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb 2012-09-28 19:54:06 UTC (rev 1367) @@ -92,6 +92,7 @@ 2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold) 2:1009:6:222:5 //Transpose +12: Ctrl+Alt+' (KeyDown|KeyHold) 2:1010:6:65:5 //Transpose -12: Ctrl+Alt+A (KeyDown|KeyHold) +2:1881:2:84:1 //Transpose Custom: Ctrl+T (KeyDown) 2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown) 2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown) 2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |