Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4188] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2014-07-19 21:08:22
|
Revision: 4188
http://sourceforge.net/p/modplug/code/4188
Author: saga-games
Date: 2014-07-19 21:08:07 +0000 (Sat, 19 Jul 2014)
Log Message:
-----------
[Imp] Add dummy keybdinging to recycle default keybindings into if you don't like them (https://bugs.openmpt.org/view.php?id=550)
[Ref] Rewrite some key edit code to use std::vector instead of CArray
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.h
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2014-07-19 16:46:30 UTC (rev 4187)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2014-07-19 21:08:07 UTC (rev 4188)
@@ -666,6 +666,7 @@
DefineKeyCommand(kcSampleTransposeOctUp, 1909, _T("Transpose +12"));
DefineKeyCommand(kcSampleTransposeOctDown, 1910, _T("Transpose -12"));
DefineKeyCommand(kcPatternInterpolateInstr, 1911, _T("Interpolate Instrument"));
+ DefineKeyCommand(kcDummyShortcut, 1912, _T("Dummy Shortcut"));
// Add new key commands here.
@@ -1441,27 +1442,6 @@
}
-KeyCombination CCommandSet::GetKey(CommandID cmd, UINT key)
-//---------------------------------------------------------
-{
- return commands[cmd].kcList[key];
-}
-
-
-int CCommandSet::GetKeyListSize(CommandID cmd)
-//--------------------------------------------
-{
- return commands[cmd].kcList.size();
-}
-
-
-CString CCommandSet::GetCommandText(CommandID cmd)
-//------------------------------------------------
-{
- return commands[cmd].Message;
-}
-
-
bool CCommandSet::SaveFile(const mpt::PathString &filename)
//---------------------------------------------------------
{ //TODO: Make C++
@@ -1806,14 +1786,6 @@
}
-bool CCommandSet::isHidden(UINT c)
-//--------------------------------
-{
- return commands[c].isHidden;
-}
-
-
-
//-------------------------------------------------------
// Quick Changes - modify many commands with one call.
//-------------------------------------------------------
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2014-07-19 16:46:30 UTC (rev 4187)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2014-07-19 21:08:07 UTC (rev 4188)
@@ -149,8 +149,10 @@
kcPrevOrder,
kcNextOrder,
kcEndMisc=kcNextOrder,
- kcGlobalEnd=kcNextOrder,
+ kcDummyShortcut,
+ kcGlobalEnd=kcDummyShortcut,
+
//Pattern Navigation
kcStartPatNavigation,
kcStartJumpSnap=kcStartPatNavigation,
@@ -1200,13 +1202,13 @@
// Key combination to string
static CString GetContextText(InputTargetContext ctx);
CString GetContextText() const { return GetContextText(Context()); }
-
+
static CString GetModifierText(UINT mod);
CString GetModifierText() const { return GetModifierText(Modifier()); }
-
+
static CString GetKeyText(UINT mod, UINT code);
CString GetKeyText() const { return GetKeyText(Modifier(), KeyCode()); }
-
+
static CString GetKeyEventText(KeyEventType event);
CString GetKeyEventText() const { return GetKeyEventText(EventType()); }
@@ -1309,10 +1311,10 @@
bool QuickChange_NoNotesRepeat();
//Communication
- KeyCombination GetKey(CommandID cmd, UINT key);
- bool isHidden(UINT c);
- int GetKeyListSize(CommandID cmd);
- CString GetCommandText(CommandID cmd);
+ KeyCombination GetKey(CommandID cmd, UINT key) const { return commands[cmd].kcList[key]; }
+ bool isHidden(UINT c) const { return commands[c].isHidden; }
+ int GetKeyListSize(CommandID cmd) const { return commands[cmd].kcList.size(); }
+ CString GetCommandText(CommandID cmd) const { return commands[cmd].Message; }
CString GetKeyTextFromCommand(CommandID c, UINT key);
//Pululation ;)
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2014-07-19 16:46:30 UTC (rev 4187)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2014-07-19 21:08:07 UTC (rev 4188)
@@ -173,9 +173,9 @@
//Fill category combo and automatically selects first category
DefineCommandCategories();
- for (int c=0; c<commandCategories.GetSize(); c++)
+ for(size_t c = 0; c < commandCategories.size(); c++)
{
- if (commandCategories[c].name && commandCategories[c].commands.GetCount())
+ if (commandCategories[c].name && !commandCategories[c].commands.empty())
m_cmbCategory.SetItemData(m_cmbCategory.AddString(commandCategories[c].name), c);
}
m_cmbCategory.SetCurSel(0);
@@ -200,202 +200,203 @@
CommandCategory newCat("Global keys", kCtxAllContexts);
for(int c = kcStartFile; c <= kcEndFile; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndFile); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndFile); //--------------------------------------
for(int c = kcStartPlayCommands; c <= kcEndPlayCommands; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndPlayCommands); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndPlayCommands); //--------------------------------------
for(int c = kcStartEditCommands; c <= kcEndEditCommands; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndEditCommands); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndEditCommands); //--------------------------------------
for(int c = kcStartView; c <= kcEndView; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndView); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndView); //--------------------------------------
for(int c = kcStartMisc; c <= kcEndMisc; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndMisc); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndMisc); //--------------------------------------
+ newCat.commands.push_back(kcDummyShortcut);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" General [Top]", kCtxCtrlGeneral);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" General [Bottom]", kCtxViewGeneral);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor [Top]", kCtxCtrlPatterns);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Order List", kCtxCtrlOrderlist);
for(int c = kcStartOrderlistCommands; c <= kcEndOrderlistCommands; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndOrderlistNavigation); //--------------------------------------
- newCat.separators.Add(kcEndOrderlistEdit); //--------------------------------------
- newCat.separators.Add(kcEndOrderlistNum); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndOrderlistNavigation); //--------------------------------------
+ newCat.separators.push_back(kcEndOrderlistEdit); //--------------------------------------
+ newCat.separators.push_back(kcEndOrderlistNum); //--------------------------------------
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Quick Channel Settings", kCtxChannelSettings);
for(int c = kcStartChnSettingsCommands; c <= kcEndChnSettingsCommands; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - General", kCtxViewPatterns);
for(int c = kcStartPlainNavigate; c <= kcEndPlainNavigate; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndPlainNavigate); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndPlainNavigate); //--------------------------------------
for(int c = kcStartJumpSnap; c <= kcEndJumpSnap; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndJumpSnap); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndJumpSnap); //--------------------------------------
for(int c = kcStartHomeEnd; c <= kcEndHomeEnd; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndHomeEnd); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndHomeEnd); //--------------------------------------
for(int c = kcPrevPattern; c <= kcNextPattern; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcNextPattern); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcNextPattern); //--------------------------------------
for(int c = kcStartSelect; c <= kcEndSelect; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndSelect); //--------------------------------------
- newCat.commands.Add(kcCopyAndLoseSelection);
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndSelect); //--------------------------------------
+ newCat.commands.push_back(kcCopyAndLoseSelection);
for(int c = kcClearRow; c <= kcInsertAllRows; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcInsertAllRows); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcInsertAllRows); //--------------------------------------
for(int c = kcStartChannelKeys; c <= kcEndChannelKeys; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndChannelKeys); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndChannelKeys); //--------------------------------------
for(int c = kcBeginTranspose; c <= kcEndTranspose; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndTranspose); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndTranspose); //--------------------------------------
for(int c = kcPatternAmplify; c <= kcPatternShrinkSelection; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcPatternShrinkSelection); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcPatternShrinkSelection); //--------------------------------------
for(int c = kcStartPatternEditMisc; c <= kcEndPatternEditMisc; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndPatternEditMisc); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndPatternEditMisc); //--------------------------------------
for(int c = kcStartPatternClipboard; c <= kcEndPatternClipboard; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndPatternClipboard); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndPatternClipboard); //--------------------------------------
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Note Column", kCtxViewPatternsNote);
for(int c = kcVPStartNotes; c <= kcVPEndNotes; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcVPEndNotes); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcVPEndNotes); //--------------------------------------
for(int c = kcSetOctave0; c <= kcSetOctave9; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcVPEndNotes); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcVPEndNotes); //--------------------------------------
for(int c = kcStartNoteMisc; c <= kcEndNoteMisc; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Instrument Column", kCtxViewPatternsIns);
for(int c = kcSetIns0; c <= kcSetIns9; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Volume Column", kCtxViewPatternsVol);
for(int c = kcSetVolumeStart; c <= kcSetVolumeEnd; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Effect Column", kCtxViewPatternsFX);
for(int c = kcSetFXStart; c <= kcSetFXEnd; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Pattern Editor - Effect Parameter Column", kCtxViewPatternsFXparam);
for(int c = kcSetFXParam0; c <= kcSetFXParamF; c++)
- newCat.commands.Add(c);
- commandCategories.Add(newCat);
+ newCat.commands.push_back(c);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Sample [Top]", kCtxCtrlSamples);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Sample Editor", kCtxViewSamples);
for(int c = kcStartSampleEditing; c <= kcEndSampleEditing; c++)
- newCat.commands.Add(c);
- newCat.separators.Add(kcEndSampleEditing); //--------------------------------------
+ newCat.commands.push_back(c);
+ newCat.separators.push_back(kcEndSampleEditing); //--------------------------------------
for(int c = kcStartSampleMisc; c <= kcEndSampleMisc; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Instrument Editor", kCtxCtrlInstruments);
for(int c = kcStartInstrumentCtrlMisc; c <= kcEndInstrumentCtrlMisc; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Envelope Editor", kCtxViewInstruments);
for(int c = kcStartInstrumentMisc; c <= kcEndInstrumentMisc; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Comments [Top]", kCtxCtrlComments);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Comments [Bottom]", kCtxViewComments);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
{
CommandCategory newCat(" Plugin Editor", kCtxVSTGUI);
for(int c = kcStartVSTGUICommands; c <= kcEndVSTGUICommands; c++)
- newCat.commands.Add(c);
+ newCat.commands.push_back(c);
- commandCategories.Add(newCat);
+ commandCategories.push_back(newCat);
}
}
@@ -497,7 +498,7 @@
{
// We will search in all categories
firstCat = 0;
- lastCat = commandCategories.GetSize() - 1;
+ lastCat = commandCategories.size() - 1;
}
CommandID curCommand = static_cast<CommandID>(m_lbnCommandKeys.GetItemData( m_lbnCommandKeys.GetCurSel()));
@@ -508,7 +509,7 @@
// When searching, we also add the category names to the list.
bool addCategoryName = (firstCat != lastCat);
- for(int cmd = 0; cmd < commandCategories[cat].commands.GetSize(); cmd++)
+ for(size_t cmd = 0; cmd < commandCategories[cat].commands.size(); cmd++)
{
CommandID com = (CommandID)commandCategories[cat].commands[cmd];
@@ -934,9 +935,9 @@
int COptionsKeyboard::GetCategoryFromCommandID(CommandID command) const
//---------------------------------------------------------------------
{
- for(int cat = 0; cat < commandCategories.GetSize(); cat++)
+ for(size_t cat = 0; cat < commandCategories.size(); cat++)
{
- for(int cmd = 0; cmd < commandCategories[cat].commands.GetSize(); cmd++)
+ for(size_t cmd = 0; cmd < commandCategories[cat].commands.size(); cmd++)
{
if(commandCategories[cat].commands[cmd] == command)
{
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.h
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.h 2014-07-19 16:46:30 UTC (rev 4187)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.h 2014-07-19 21:08:07 UTC (rev 4188)
@@ -17,52 +17,29 @@
OPENMPT_NAMESPACE_BEGIN
-// Might promote to class so we can add rules
+// Might promote to class so we can add rules
// (eg automatically do note off stuff, generate chord keybindings from notes based just on modifier.
// Would need GUI rules too as options would be different for each category
-class CommandCategory
+class CommandCategory
{
public:
- CommandCategory(CString n, InputTargetContext d)
- {
- CommandCategory();
- name=n;
- id=d;
- }
-
+ CommandCategory(CString n, InputTargetContext d) : name(n), id(d) { }
- //copy constructor; necessary if we want to use arrays of this class
- CommandCategory(const CommandCategory © )
+ bool separatorAt(int c) const
{
- name = copy.name;
- id = copy.id;
- commands.Copy(copy.commands);
- separators.Copy(copy.separators);
- }
- void operator=(const CommandCategory& copy)
- {
- name = copy.name;
- id = copy.id;
- commands.Copy(copy.commands);
- separators.Copy(copy.separators);
- }
- bool separatorAt(int c)
- {
- for (int p=0; p<separators.GetSize(); p++)
+ for(std::vector<int>::const_iterator i = separators.begin(); i != separators.end(); i++)
{
- if (separators[p]==c)
+ if (*i == c)
return true;
}
return false;
}
- CommandCategory() {};
- ~CommandCategory() {};
CString name;
InputTargetContext id;
- CArray<int> separators;
- CArray<int> commands;
+ std::vector<int> separators;
+ std::vector<int> commands;
};
@@ -120,7 +97,7 @@
public:
COptionsKeyboard() : CPropertyPage(IDD_OPTIONS_KEYBOARD), m_eCustHotKey(false), m_eFindHotKey(true), m_nKeyboardCfg(0) { }
BOOL SetKey(UINT nId, UINT nChar, UINT nFlags);
- CArray<CommandCategory, CommandCategory> commandCategories;
+ std::vector<CommandCategory> commandCategories;
void DefineCommandCategories();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
