Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1054] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-09-24 22:58:10
|
Revision: 1054
http://modplug.svn.sourceforge.net/modplug/?rev=1054&view=rev
Author: saga-games
Date: 2011-09-24 22:58:02 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
[Imp] Keyboard Config Dialog: Added a button to restore default configuration.
[Mod] Keyboard Config Dialog: Removed annoying and unnecessary notifications.
[Imp] Order list: Added a context menu to add a separator index.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/Ctrl_pat.h
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/InputHandler.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/resource.h
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2011-09-24 22:58:02 UTC (rev 1054)
@@ -1407,7 +1407,7 @@
return commands[cmd].Message;
}
-bool CCommandSet::SaveFile(CString fileName, bool debug)
+bool CCommandSet::SaveFile(CString fileName)
{ //TODO: Make C++
/* Layout:
@@ -1446,7 +1446,7 @@
if (kc.ctx != ctx)
continue; //sort by context
- if (debug || !commands[cmd].isHidden)
+ if (!commands[cmd].isHidden)
{
fprintf(outStream, "%d:%d:%d:%d:%d\t\t//%s: %s (%s)\n",
ctx, commands[cmd].UID, kc.mod, kc.code, kc.event,
@@ -1596,7 +1596,9 @@
return true;
}
+
bool CCommandSet::LoadFile(CString fileName)
+//------------------------------------------
{
std::ifstream fin(fileName);
if (fin.fail())
@@ -1611,6 +1613,23 @@
}
+bool CCommandSet::LoadDefaultKeymap()
+//-----------------------------------
+{
+ bool success = false;
+ const char* pData = nullptr;
+ HGLOBAL hglob = nullptr;
+ size_t nSize = 0;
+ if (LoadResource(MAKEINTRESOURCE(IDR_DEFAULT_KEYBINDINGS), TEXT("KEYBINDINGS"), pData, nSize, hglob) != nullptr)
+ {
+ std::istrstream iStrm(pData, nSize);
+ success = LoadFile(iStrm, TEXT("\"executable resource\""));
+ FreeResource(hglob);
+ }
+ return success;
+}
+
+
// Fix outdated keymap files
void CCommandSet::UpgradeKeymap(CCommandSet *pCommands, int oldVersion)
//---------------------------------------------------------------------
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2011-09-24 22:58:02 UTC (rev 1054)
@@ -1198,9 +1198,10 @@
//Pululation ;)
void Copy(CCommandSet *source); // copy the contents of a commandset into this command set
void GenKeyMap(KeyMap &km); // Generate a keymap from this command set
- bool SaveFile(CString FileName, bool debug);
+ bool SaveFile(CString FileName);
bool LoadFile(CString FileName);
bool LoadFile(std::istream& iStrm, LPCTSTR szFilename);
+ bool LoadDefaultKeymap();
void UpgradeKeymap(CCommandSet *pCommands, int oldVersion);
static DWORD GetKeymapLabel(InputTargetContext ctx, UINT mod, UINT code, KeyEventType ke);
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h 2011-09-24 22:58:02 UTC (rev 1054)
@@ -63,18 +63,18 @@
BYTE SetMargins(int);
// Returns the effective margin value.
- BYTE GetMargins() {return GetMargins(GetMarginsMax());}
+ BYTE GetMargins() { return GetMargins(GetMarginsMax()); }
// Returns the effective margin value.
- BYTE GetMargins(const BYTE nMaxMargins) {return Util::Min(nMaxMargins, static_cast<BYTE>(m_nOrderlistMargins));}
+ BYTE GetMargins(const BYTE nMaxMargins) const { return Util::Min(nMaxMargins, static_cast<BYTE>(m_nOrderlistMargins)); }
// Returns maximum margin value given current window width.
- BYTE GetMarginsMax() {return GetMarginsMax(GetLength());}
+ BYTE GetMarginsMax() { return GetMarginsMax(GetLength()); }
// Returns maximum margin value when shown sequence has nLength orders.
// For example: If length is 4 orders -> maxMargins = 4/2 - 1 = 1;
// if maximum is 5 -> maxMargins = (int)5/2 = 2
- BYTE GetMarginsMax(const BYTE nLength) {return (nLength > 0 && nLength % 2 == 0) ? nLength/2 - 1 : nLength/2;}
+ BYTE GetMarginsMax(const BYTE nLength) const { return (nLength > 0 && nLength % 2 == 0) ? nLength / 2 - 1 : nLength / 2; }
// Returns the number of sequence items visible in the list.
BYTE GetLength();
@@ -122,6 +122,7 @@
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnSwitchToView();
afx_msg void OnInsertOrder();
+ afx_msg void OnInsertSeparatorPattern();
afx_msg void OnDeleteOrder();
afx_msg void OnRenderOrder();
afx_msg void OnPatternProperties();
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2011-09-24 22:58:02 UTC (rev 1054)
@@ -41,29 +41,30 @@
ON_WM_KILLFOCUS()
ON_WM_HSCROLL()
ON_WM_SIZE()
- ON_COMMAND(ID_CONTROLTAB, OnSwitchToView)
+ ON_COMMAND(ID_CONTROLTAB, OnSwitchToView)
- ON_COMMAND(ID_ORDERLIST_INSERT, OnInsertOrder)
- ON_COMMAND(ID_ORDERLIST_DELETE, OnDeleteOrder)
- ON_COMMAND(ID_ORDERLIST_RENDER, OnRenderOrder)
- ON_COMMAND(ID_ORDERLIST_EDIT_COPY, OnEditCopy)
- ON_COMMAND(ID_ORDERLIST_EDIT_CUT, OnEditCut)
- ON_COMMAND(ID_ORDERLIST_EDIT_PASTE, OnEditPaste)
+ ON_COMMAND(ID_ORDERLIST_INSERT, OnInsertOrder)
+ ON_COMMAND(ID_ORDERLIST_INSERT_SEPARATOR, OnInsertSeparatorPattern)
+ ON_COMMAND(ID_ORDERLIST_DELETE, OnDeleteOrder)
+ ON_COMMAND(ID_ORDERLIST_RENDER, OnRenderOrder)
+ ON_COMMAND(ID_ORDERLIST_EDIT_COPY, OnEditCopy)
+ ON_COMMAND(ID_ORDERLIST_EDIT_CUT, OnEditCut)
+ ON_COMMAND(ID_ORDERLIST_EDIT_PASTE, OnEditPaste)
- ON_COMMAND(ID_PATTERN_PROPERTIES, OnPatternProperties)
- ON_COMMAND(ID_PLAYER_PLAY, OnPlayerPlay)
- ON_COMMAND(ID_PLAYER_PAUSE, OnPlayerPause)
- ON_COMMAND(ID_PLAYER_PLAYFROMSTART, OnPlayerPlayFromStart)
- ON_COMMAND(IDC_PATTERN_PLAYFROMSTART,OnPatternPlayFromStart)
- //ON_COMMAND(ID_PATTERN_RESTART, OnPatternPlayFromStart)
- ON_COMMAND(ID_ORDERLIST_NEW, OnCreateNewPattern)
- ON_COMMAND(ID_ORDERLIST_COPY, OnDuplicatePattern)
- ON_COMMAND(ID_PATTERNCOPY, OnPatternCopy)
- ON_COMMAND(ID_PATTERNPASTE, OnPatternPaste)
+ ON_COMMAND(ID_PATTERN_PROPERTIES, OnPatternProperties)
+ ON_COMMAND(ID_PLAYER_PLAY, OnPlayerPlay)
+ ON_COMMAND(ID_PLAYER_PAUSE, OnPlayerPause)
+ ON_COMMAND(ID_PLAYER_PLAYFROMSTART, OnPlayerPlayFromStart)
+ ON_COMMAND(IDC_PATTERN_PLAYFROMSTART, OnPatternPlayFromStart)
+ //ON_COMMAND(ID_PATTERN_RESTART, OnPatternPlayFromStart)
+ ON_COMMAND(ID_ORDERLIST_NEW, OnCreateNewPattern)
+ ON_COMMAND(ID_ORDERLIST_COPY, OnDuplicatePattern)
+ ON_COMMAND(ID_PATTERNCOPY, OnPatternCopy)
+ ON_COMMAND(ID_PATTERNPASTE, OnPatternPaste)
ON_COMMAND_RANGE(ID_SEQUENCE_ITEM, ID_SEQUENCE_ITEM + MAX_SEQUENCES + 2, OnSelectSequence)
- ON_MESSAGE(WM_MOD_DRAGONDROPPING, OnDragonDropping)
- ON_MESSAGE(WM_HELPHITTEST, OnHelpHitTest)
- ON_MESSAGE(WM_MOD_KEYCOMMAND, OnCustomKeyMsg)
+ ON_MESSAGE(WM_MOD_DRAGONDROPPING, OnDragonDropping)
+ ON_MESSAGE(WM_HELPHITTEST, OnHelpHitTest)
+ ON_MESSAGE(WM_MOD_KEYCOMMAND, OnCustomKeyMsg)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -245,7 +246,8 @@
ORD_SELECTION result;
result.nOrdLo = result.nOrdHi = m_nScrollPos;
// bIgnoreSelection: true if only first selection marker is important.
- if(!bIgnoreSelection && m_nScrollPos2nd != ORDERINDEX_INVALID) {
+ if(!bIgnoreSelection && m_nScrollPos2nd != ORDERINDEX_INVALID)
+ {
if(m_nScrollPos2nd < m_nScrollPos) // ord2 < ord1
result.nOrdLo = m_nScrollPos2nd;
else
@@ -1063,6 +1065,10 @@
{
// only one pattern is selected
AppendMenu(hMenu, MF_STRING, ID_ORDERLIST_INSERT, "&Insert Pattern\t" + ih->GetKeyTextFromCommand(kcOrderlistEditInsert));
+ if(pSndFile->GetModSpecifications().hasIgnoreIndex)
+ {
+ AppendMenu(hMenu, MF_STRING, ID_ORDERLIST_INSERT_SEPARATOR, "&Insert Separator\t" + ih->GetKeyTextFromCommand(kcOrderlistPatIgnore));
+ }
AppendMenu(hMenu, MF_STRING, ID_ORDERLIST_DELETE, "&Remove Pattern\t" + ih->GetKeyTextFromCommand(kcOrderlistEditDelete));
AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
AppendMenu(hMenu, MF_STRING, ID_ORDERLIST_NEW, "Create &New Pattern\t" + ih->GetKeyTextFromCommand(kcNewPattern));
@@ -1189,12 +1195,12 @@
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
- ORD_SELECTION selection = GetCurSel(false);
- ORDERINDEX nInsertCount = selection.nOrdHi - selection.nOrdLo, nInsertEnd = selection.nOrdHi;
+ const ORD_SELECTION selection = GetCurSel(false);
+ const ORDERINDEX nInsertCount = selection.nOrdHi - selection.nOrdLo, nInsertEnd = selection.nOrdHi;
for(ORDERINDEX i = 0; i <= nInsertCount; i++)
{
- //Checking whether there is some pattern at the end of orderlist.
+ // Checking whether there is some pattern at the end of orderlist.
if (pSndFile->Order.GetLength() < 1 || pSndFile->Order.Last() < pSndFile->Patterns.Size())
{
if(pSndFile->Order.GetLength() < pSndFile->GetModSpecifications().ordersMax)
@@ -1228,6 +1234,34 @@
}
}
+
+void COrderList::OnInsertSeparatorPattern()
+//-----------------------------------------
+{
+ // Insert a separator pattern after the current pattern, don't move order list cursor
+ if (m_pModDoc)
+ {
+ CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
+
+ const ORD_SELECTION selection = GetCurSel(true);
+ // Checking whether there is some pattern at the end of orderlist.
+ if (pSndFile->Order.GetLength() < 1 || pSndFile->Order.Last() < pSndFile->Patterns.Size())
+ {
+ if(pSndFile->Order.GetLength() < pSndFile->GetModSpecifications().ordersMax)
+ pSndFile->Order.Append();
+ }
+ for(int j = pSndFile->Order.GetLastIndex(); j > selection.nOrdHi; j--)
+ pSndFile->Order[j] = pSndFile->Order[j - 1];
+
+ pSndFile->Order[selection.nOrdHi + 1] = pSndFile->Order.GetIgnoreIndex();
+
+ InvalidateRect(NULL, FALSE);
+ m_pModDoc->SetModified();
+ m_pModDoc->UpdateAllViews(NULL, HINT_MODSEQUENCE, this);
+ }
+}
+
+
void COrderList::OnRenderOrder()
//------------------------------
{
Modified: trunk/OpenMPT/mptrack/InputHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/InputHandler.cpp 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/InputHandler.cpp 2011-09-24 22:58:02 UTC (rev 1054)
@@ -45,16 +45,10 @@
{
// Load keybindings from resources.
Log("Loading keybindings from resources\n");
- const char* pData = nullptr;
- HGLOBAL hglob = nullptr;
- size_t nSize = 0;
- if (LoadResource(MAKEINTRESOURCE(IDR_DEFAULT_KEYBINDINGS), TEXT("KEYBINDINGS"), pData, nSize, hglob) != nullptr)
+ bSuccess = activeCommandSet->LoadDefaultKeymap();
+ if (bSuccess && bNoExistingKbdFileSetting)
{
- std::istrstream iStrm(pData, nSize);
- bSuccess = activeCommandSet->LoadFile(iStrm, TEXT("\"executable resource\""));
- FreeResource(hglob);
- if (bSuccess && bNoExistingKbdFileSetting)
- activeCommandSet->SaveFile(CMainFrame::GetSettings().m_szKbdFile, false);
+ activeCommandSet->SaveFile(CMainFrame::GetSettings().m_szKbdFile);
}
}
if (bSuccess == false)
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2011-09-24 22:58:02 UTC (rev 1054)
@@ -83,23 +83,24 @@
//-----------------------------------------------------------
BEGIN_MESSAGE_MAP(COptionsKeyboard, CPropertyPage)
- ON_LBN_SELCHANGE(IDC_CHOICECOMBO, OnKeyChoiceSelect)
- ON_LBN_SELCHANGE(IDC_COMMAND_LIST, OnCommandKeySelChanged)
- ON_LBN_SELCHANGE(IDC_KEYCATEGORY, OnCategorySelChanged)
- ON_EN_UPDATE(IDC_CHORDDETECTWAITTIME, OnChordWaitTimeChanged) //rewbs.autochord
- ON_COMMAND(IDC_SET, OnSetKeyChoice)
- ON_COMMAND(IDC_DELETE, OnDeleteKeyChoice)
- ON_COMMAND(IDC_RESTORE, OnRestoreKeyChoice)
- ON_COMMAND(IDC_LOAD, OnLoad)
- ON_COMMAND(IDC_SAVE, OnSave)
- ON_COMMAND(IDC_CHECKKEYDOWN, OnCheck)
- ON_COMMAND(IDC_CHECKKEYHOLD, OnCheck)
- ON_COMMAND(IDC_CHECKKEYUP, OnCheck)
- ON_COMMAND(IDC_NOTESREPEAT, OnNotesRepeat)
- ON_COMMAND(IDC_NONOTESREPEAT, OnNoNotesRepeat)
- ON_COMMAND(IDC_EFFECTLETTERSXM, OnSetXMEffects)
- ON_COMMAND(IDC_EFFECTLETTERSIT, OnSetITEffects)
- ON_COMMAND(IDC_CLEARLOG, OnClearLog)
+ ON_LBN_SELCHANGE(IDC_CHOICECOMBO, OnKeyChoiceSelect)
+ ON_LBN_SELCHANGE(IDC_COMMAND_LIST, OnCommandKeySelChanged)
+ ON_LBN_SELCHANGE(IDC_KEYCATEGORY, OnCategorySelChanged)
+ ON_EN_UPDATE(IDC_CHORDDETECTWAITTIME, OnChordWaitTimeChanged) //rewbs.autochord
+ ON_COMMAND(IDC_SET, OnSetKeyChoice)
+ ON_COMMAND(IDC_DELETE, OnDeleteKeyChoice)
+ ON_COMMAND(IDC_RESTORE, OnRestoreKeyChoice)
+ ON_COMMAND(IDC_LOAD, OnLoad)
+ ON_COMMAND(IDC_SAVE, OnSave)
+ ON_COMMAND(IDC_CHECKKEYDOWN, OnCheck)
+ ON_COMMAND(IDC_CHECKKEYHOLD, OnCheck)
+ ON_COMMAND(IDC_CHECKKEYUP, OnCheck)
+ ON_COMMAND(IDC_NOTESREPEAT, OnNotesRepeat)
+ ON_COMMAND(IDC_NONOTESREPEAT, OnNoNotesRepeat)
+ ON_COMMAND(IDC_EFFECTLETTERSXM, OnSetXMEffects)
+ ON_COMMAND(IDC_EFFECTLETTERSIT, OnSetITEffects)
+ ON_COMMAND(IDC_CLEARLOG, OnClearLog)
+ ON_COMMAND(IDC_RESTORE_KEYMAP, OnRestoreDefaultKeymap)
ON_WM_DESTROY()
END_MESSAGE_MAP()
@@ -116,8 +117,6 @@
DDX_Control(pDX, IDC_CHECKKEYDOWN, m_bKeyDown);
DDX_Control(pDX, IDC_CHECKKEYHOLD, m_bKeyHold);
DDX_Control(pDX, IDC_CHECKKEYUP, m_bKeyUp);
-
- DDX_Control(pDX, IDC_DEBUGSAVE, m_bDebugSave);
}
@@ -527,15 +526,16 @@
CInputHandler *ih=CMainFrame::GetInputHandler();
- //Do nothing if there's nothing to restore
+ // Do nothing if there's nothing to restore
if (cmd<0 || m_nCurKeyChoice<0 || m_nCurKeyChoice>=ih->GetKeyListSize(cmd))
{
- CString error = "Nothing to restore for this slot.";
- Reporting::Error(error, "Invalid key data");
+ // Annoying message box is annoying.
+ //CString error = "Nothing to restore for this slot.";
+ //Reporting::Error(error, "Invalid key data");
return;
}
- //Restore current key combination choice for currently selected command.
+ // Restore current key combination choice for currently selected command.
kc = ih->activeCommandSet->GetKey(cmd, m_nCurKeyChoice);
plocalCmdSet->Remove(m_nCurKeyChoice, cmd);
plocalCmdSet->Add(kc, cmd, true, m_nCurKeyChoice);
@@ -548,11 +548,12 @@
{
CommandID cmd = (CommandID)m_nCurHotKey;
- //Do nothing if there's no key defined for this slot.
+ // Do nothing if there's no key defined for this slot.
if (m_nCurHotKey<0 || m_nCurKeyChoice<0 || m_nCurKeyChoice>=plocalCmdSet->GetKeyListSize(cmd))
{
- CString error = "No key currently set for this slot.";
- Reporting::Warning(error, "Invalid key data");
+ // Annoying message box is annoying.
+ //CString error = "No key currently set for this slot.";
+ //Reporting::Warning(error, "Invalid key data");
return;
}
@@ -657,7 +658,7 @@
if(files.abort) return;
m_sFullPathName = files.first_file.c_str();
- plocalCmdSet->SaveFile(m_sFullPathName, m_bDebugSave.GetCheck() != BST_UNCHECKED);
+ plocalCmdSet->SaveFile(m_sFullPathName);
//TentativeSetToDefaultFile(m_sFullPathName);
}
@@ -700,4 +701,15 @@
{
m_eReport.SetWindowText("");
ForceUpdateGUI();
+}
+
+
+void COptionsKeyboard::OnRestoreDefaultKeymap()
+//---------------------------------------------
+{
+ if(Reporting::Confirm("Discard all custom changes and restore default key configuration?") == cnfYes)
+ {
+ plocalCmdSet->LoadDefaultKeymap();
+ ForceUpdateGUI();
+ }
}
\ No newline at end of file
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.h
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.h 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.h 2011-09-24 22:58:02 UTC (rev 1054)
@@ -98,8 +98,6 @@
bool m_bModified;
bool m_bChoiceModified;
- CButton m_bDebugSave;
-
void ForceUpdateGUI();
public:
@@ -135,6 +133,7 @@
afx_msg void OnLoad();
afx_msg void OnSave();
afx_msg void OnClearLog();
+ afx_msg void OnRestoreDefaultKeymap();
DECLARE_MESSAGE_MAP();
public:
afx_msg void OnDestroy();
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2011-09-24 22:58:02 UTC (rev 1054)
@@ -508,13 +508,13 @@
gpSoundDevice = NULL;
}
// Save Settings
- RemoveControlBar(&m_wndStatusBar); //Remove statusbar so that its state won't get saved.
+ RemoveControlBar(&m_wndStatusBar); // Remove statusbar so that its state won't get saved.
m_Settings.SaveSettings();
- AddControlBar(&m_wndStatusBar); //Restore statusbar to mainframe.
+ AddControlBar(&m_wndStatusBar); // Restore statusbar to mainframe.
if(m_InputHandler && m_InputHandler->activeCommandSet)
{
- m_InputHandler->activeCommandSet->SaveFile(GetSettings().m_szKbdFile, false);
+ m_InputHandler->activeCommandSet->SaveFile(GetSettings().m_szKbdFile);
}
EndWaitCursor();
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2011-09-24 22:58:02 UTC (rev 1054)
@@ -441,35 +441,35 @@
CAPTION "Keyboard"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
+ LTEXT "Select category:",IDC_STATIC,7,5,131,11
COMBOBOX IDC_KEYCATEGORY,5,16,133,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LISTBOX IDC_COMMAND_LIST,5,32,133,244,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_CHOICECOMBO,150,18,114,51,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_CUSTHOTKEY,168,36,95,13,ES_AUTOHSCROLL
+ COMBOBOX IDC_CHOICECOMBO,150,18,72,51,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Key:",IDC_STATIC,150,38,16,8
+ EDITTEXT IDC_CUSTHOTKEY,168,36,54,13,ES_AUTOHSCROLL
CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,54,66,8
CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,66,66,8
CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,78,66,8
- PUSHBUTTON "Restore",IDC_RESTORE,222,54,43,13
- PUSHBUTTON "Delete",IDC_DELETE,222,71,43,13
- EDITTEXT IDC_KEYREPORT,144,192,126,84,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+ PUSHBUTTON "Restore",IDC_RESTORE,228,36,37,13
+ PUSHBUTTON "Set",IDC_SET,228,30,36,13,NOT WS_VISIBLE
+ PUSHBUTTON "Delete",IDC_DELETE,228,18,37,13
+ LTEXT "Repeat notes on hold?",IDC_STATIC,150,108,74,8
PUSHBUTTON "Yes",IDC_NOTESREPEAT,228,108,18,9
PUSHBUTTON "No",IDC_NONOTESREPEAT,246,108,18,9
+ LTEXT "Chord detect interval (ms):",IDC_STATIC,150,122,88,8
EDITTEXT IDC_CHORDDETECTWAITTIME,240,120,24,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
- PUSHBUTTON "it",IDC_EFFECTLETTERSIT,103,184,12,9,NOT WS_VISIBLE
- PUSHBUTTON "xm",IDC_EFFECTLETTERSXM,119,184,12,9,NOT WS_VISIBLE
PUSHBUTTON "Import Keys...",IDC_LOAD,150,156,54,13
PUSHBUTTON "Export Keys...",IDC_SAVE,210,156,54,13
- CONTROL "Debug Save",IDC_DEBUGSAVE,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,59,199,56,10
- LTEXT "Select category:",IDC_STATIC,7,5,131,11
- PUSHBUTTON "Set",IDC_SET,228,52,43,13,NOT WS_VISIBLE
+ LTEXT "Error Log:",IDC_STATIC,144,198,78,8
+ PUSHBUTTON "Clear Log",IDC_CLEARLOG,228,196,42,12
+ EDITTEXT IDC_KEYREPORT,144,210,126,66,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
GROUPBOX "Key setup for this command ",IDC_STATIC,144,6,126,84
- LTEXT "Key:",IDC_STATIC,150,38,16,8
GROUPBOX "Misc",IDC_STATIC,144,96,126,40
- GROUPBOX "Multi Config Handling",IDC_STATIC,144,144,126,31
- LTEXT "Repeat notes on hold?",IDC_STATIC,150,108,74,8
- LTEXT "Effect letters like:",IDC_STATIC,11,185,73,11,NOT WS_VISIBLE
- LTEXT "Chord detect interval (ms):",IDC_STATIC,150,122,88,8
- LTEXT "Error Log:",IDC_STATIC,144,180,88,8
- PUSHBUTTON "Clear Log",IDC_CLEARLOG,228,179,42,12
+ GROUPBOX "Multi Config Handling",IDC_STATIC,144,144,126,48
+ PUSHBUTTON "it",IDC_EFFECTLETTERSIT,98,252,12,9,NOT WS_VISIBLE
+ PUSHBUTTON "xm",IDC_EFFECTLETTERSXM,114,252,12,9,NOT WS_VISIBLE
+ LTEXT "Effect letters like:",IDC_STATIC,6,254,73,11,NOT WS_VISIBLE
+ PUSHBUTTON "Restore default configuration",IDC_RESTORE_KEYMAP,150,174,114,12
END
IDD_OPTIONS_COLORS DIALOGEX 0, 0, 272, 281
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2011-09-24 15:07:51 UTC (rev 1053)
+++ trunk/OpenMPT/mptrack/resource.h 2011-09-24 22:58:02 UTC (rev 1054)
@@ -676,7 +676,6 @@
#define IDC_CHECKKEYDOWN 2094
#define IDC_CHECKKEYHOLD 2095
#define IDC_CHECKKEYUP 2096
-#define IDC_DEBUGSAVE 2097
#define IDC_CUSTHOTKEY 2098
#define IDC_SET 2099
#define IDC_RESTORE 2100
@@ -946,6 +945,7 @@
#define IDC_SAMPLE_QUICKFADE 2433
#define IDC_SAMPLE_XFADE 2434
#define IDC_LASTUPDATE 2435
+#define IDC_RESTORE_KEYMAP 2436
#define ID_FILE_NEWMOD 32771
#define ID_FILE_NEWXM 32772
#define ID_FILE_NEWS3M 32773
@@ -1205,6 +1205,7 @@
#define ID_INTERNETUPDATE 44458
#define ID_HELP_EXAMPLEMODULES 44459
#define ID_FILE_SAVEASTEMPLATE 44460
+#define ID_ORDERLIST_INSERT_SEPARATOR 44461
// Next default values for new objects
//
@@ -1212,8 +1213,8 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 531
-#define _APS_NEXT_COMMAND_VALUE 44461
-#define _APS_NEXT_CONTROL_VALUE 2436
+#define _APS_NEXT_COMMAND_VALUE 44462
+#define _APS_NEXT_CONTROL_VALUE 2437
#define _APS_NEXT_SYMED_VALUE 901
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
