mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-10 16:24:45 -07:00
add keybinds to mill cards (#3439)
* add keybinds to mill cards Add functions to move single card from top of deck to the graveyard and exile. Add keybinds to move single or multiple cards from top of deck to exile or graveyard. Add new keybinds to settings menu. Move settings menu items around for a better fit. Rename a few of the items in the settings menu. Add default keybinds: ctrl alt d/e for single/multiple cards from top of deck to the graveyard. No defaults are set for moving to exile. * fix shortcut menu * fix missing tag * rename mismatched functions * fixed your typos * refactor shortcutsettings correct a lot of typos optimize a lot of functions this could merit a pr on its own * set mill keybinds * refactor add related card actions I found a function that was completely unintelligible so I made it remotely legible and removed the duplication. * shorten line by 17 characters replace a lot of function calls with just a single reference * add brackets add brackets to all single line if statements etc. readability improvements
This commit is contained in:
ebbit1q
Zach H
parent
843b9df939
commit
06081bd940
13 changed files with 1154 additions and 933 deletions
|
|
@ -4,19 +4,18 @@
|
|||
#include <QStringList>
|
||||
#include <utility>
|
||||
|
||||
ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QObject(parent)
|
||||
ShortcutsSettings::ShortcutsSettings(const QString &settingsPath, QObject *parent) : QObject(parent)
|
||||
{
|
||||
this->settingsFilePath = std::move(settingsPath);
|
||||
this->settingsFilePath.append("shortcuts.ini");
|
||||
fillDefaultShorcuts();
|
||||
shortCuts = QMap<QString, QList<QKeySequence>>(defaultShortCuts);
|
||||
shortCuts = defaultShortCuts;
|
||||
settingsFilePath = settingsPath;
|
||||
settingsFilePath.append("shortcuts.ini");
|
||||
|
||||
bool exists = QFile(settingsFilePath).exists();
|
||||
|
||||
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
|
||||
|
||||
if (exists) {
|
||||
shortCutsFile.beginGroup("Custom");
|
||||
shortCutsFile.beginGroup(custom);
|
||||
const QStringList customKeys = shortCutsFile.allKeys();
|
||||
|
||||
QMap<QString, QString> invalidItems;
|
||||
|
|
@ -55,114 +54,123 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
|
|||
}
|
||||
}
|
||||
|
||||
QList<QKeySequence> ShortcutsSettings::getShortcut(QString name)
|
||||
QList<QKeySequence> ShortcutsSettings::getDefaultShortcut(const QString &name) const
|
||||
{
|
||||
return defaultShortCuts.value(name, QList<QKeySequence>());
|
||||
}
|
||||
|
||||
QList<QKeySequence> ShortcutsSettings::getShortcut(const QString &name) const
|
||||
{
|
||||
if (shortCuts.contains(name)) {
|
||||
return shortCuts.value(name);
|
||||
}
|
||||
|
||||
return defaultShortCuts.value(name, QList<QKeySequence>());
|
||||
return getDefaultShortcut(name);
|
||||
}
|
||||
|
||||
QKeySequence ShortcutsSettings::getSingleShortcut(QString name)
|
||||
QKeySequence ShortcutsSettings::getSingleShortcut(const QString &name) const
|
||||
{
|
||||
return getShortcut(std::move(name)).at(0);
|
||||
return getShortcut(name).at(0);
|
||||
}
|
||||
|
||||
QString ShortcutsSettings::getDefaultShortcutString(QString name)
|
||||
QString ShortcutsSettings::getDefaultShortcutString(const QString &name) const
|
||||
{
|
||||
return stringifySequence(defaultShortCuts.value(name));
|
||||
return stringifySequence(getDefaultShortcut(name));
|
||||
}
|
||||
|
||||
QString ShortcutsSettings::getShortcutString(QString name)
|
||||
QString ShortcutsSettings::getShortcutString(const QString &name) const
|
||||
{
|
||||
return stringifySequence(shortCuts.value(name));
|
||||
return stringifySequence(getShortcut(name));
|
||||
}
|
||||
|
||||
QString ShortcutsSettings::stringifySequence(QList<QKeySequence> Sequence) const
|
||||
QString ShortcutsSettings::stringifySequence(const QList<QKeySequence> &Sequence) const
|
||||
{
|
||||
QString stringSequence;
|
||||
QStringList stringSequence;
|
||||
for (int i = 0; i < Sequence.size(); ++i) {
|
||||
stringSequence.append(Sequence.at(i).toString(QKeySequence::PortableText));
|
||||
if (i < Sequence.size() - 1) {
|
||||
stringSequence.append(";");
|
||||
}
|
||||
}
|
||||
|
||||
return stringSequence;
|
||||
return stringSequence.join(sep);
|
||||
}
|
||||
|
||||
QList<QKeySequence> ShortcutsSettings::parseSequenceString(QString stringSequence)
|
||||
QList<QKeySequence> ShortcutsSettings::parseSequenceString(const QString &stringSequence) const
|
||||
{
|
||||
QStringList Sequences = stringSequence.split(";");
|
||||
QList<QKeySequence> SequenceList;
|
||||
for (QStringList::const_iterator ss = Sequences.constBegin(); ss != Sequences.constEnd(); ++ss) {
|
||||
SequenceList.append(QKeySequence(*ss, QKeySequence::PortableText));
|
||||
for (const QString &shortcut : stringSequence.split(sep)) {
|
||||
SequenceList.append(QKeySequence(shortcut, QKeySequence::PortableText));
|
||||
}
|
||||
|
||||
return SequenceList;
|
||||
}
|
||||
|
||||
void ShortcutsSettings::setShortcuts(QString name, QList<QKeySequence> Sequence)
|
||||
void ShortcutsSettings::setShortcuts(const QString &name, const QList<QKeySequence> &Sequence)
|
||||
{
|
||||
shortCuts[name] = Sequence;
|
||||
|
||||
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
|
||||
shortCutsFile.beginGroup("Custom");
|
||||
QString stringSequence = stringifySequence(Sequence);
|
||||
shortCutsFile.setValue(name, stringSequence);
|
||||
shortCutsFile.beginGroup(custom);
|
||||
shortCutsFile.setValue(name, stringifySequence(Sequence));
|
||||
shortCutsFile.endGroup();
|
||||
emit shortCutchanged();
|
||||
emit shortCutChanged();
|
||||
}
|
||||
|
||||
void ShortcutsSettings::setShortcuts(QString name, QKeySequence Sequence)
|
||||
void ShortcutsSettings::setShortcuts(const QString &name, const QKeySequence &Sequence)
|
||||
{
|
||||
setShortcuts(std::move(name), QList<QKeySequence>() << Sequence);
|
||||
setShortcuts(name, QList<QKeySequence>{Sequence});
|
||||
}
|
||||
|
||||
void ShortcutsSettings::setShortcuts(QString name, QString Sequences)
|
||||
void ShortcutsSettings::setShortcuts(const QString &name, const QString &Sequences)
|
||||
{
|
||||
setShortcuts(std::move(name), parseSequenceString(std::move(Sequences)));
|
||||
setShortcuts(name, parseSequenceString(Sequences));
|
||||
}
|
||||
|
||||
bool ShortcutsSettings::isKeyAllowed(QString name, QString Sequences)
|
||||
void ShortcutsSettings::resetAllShortcuts()
|
||||
{
|
||||
shortCuts = defaultShortCuts;
|
||||
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
|
||||
shortCutsFile.beginGroup(custom);
|
||||
shortCutsFile.remove("");
|
||||
shortCutsFile.endGroup();
|
||||
emit shortCutChanged();
|
||||
emit allShortCutsReset();
|
||||
}
|
||||
|
||||
void ShortcutsSettings::clearAllShortcuts()
|
||||
{
|
||||
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
|
||||
shortCutsFile.beginGroup(custom);
|
||||
for (auto it = shortCuts.begin(); it != shortCuts.end(); ++it) {
|
||||
it.value() = parseSequenceString("");
|
||||
shortCutsFile.setValue(it.key(), "");
|
||||
}
|
||||
shortCutsFile.endGroup();
|
||||
emit shortCutChanged();
|
||||
emit allShortCutsClear();
|
||||
}
|
||||
|
||||
bool ShortcutsSettings::isKeyAllowed(const QString &name, const QString &Sequences) const
|
||||
{
|
||||
// if the shortcut is not to be used in deck-editor then it doesn't matter
|
||||
if (name.startsWith("Player")) {
|
||||
return true;
|
||||
}
|
||||
QString checkSequence = Sequences.split(";").last();
|
||||
QStringList forbiddenKeys = (QStringList() << "Del"
|
||||
<< "Backspace"
|
||||
<< "Down"
|
||||
<< "Up"
|
||||
<< "Left"
|
||||
<< "Right"
|
||||
<< "Return"
|
||||
<< "Enter"
|
||||
<< "Menu"
|
||||
<< "Ctrl+Alt+-"
|
||||
<< "Ctrl+Alt+="
|
||||
<< "Ctrl+Alt+["
|
||||
<< "Ctrl+Alt+]"
|
||||
<< "Tab"
|
||||
<< "Space"
|
||||
<< "Shift+S"
|
||||
<< "Shift+Left"
|
||||
<< "Shift+Right");
|
||||
QString checkSequence = Sequences.split(sep).last();
|
||||
QStringList forbiddenKeys{"Del", "Backspace", "Down", "Up", "Left", "Right",
|
||||
"Return", "Enter", "Menu", "Ctrl+Alt+-", "Ctrl+Alt+=", "Ctrl+Alt+[",
|
||||
"Ctrl+Alt+]", "Tab", "Space", "Shift+S", "Shift+Left", "Shift+Right"};
|
||||
return !forbiddenKeys.contains(checkSequence);
|
||||
}
|
||||
|
||||
bool ShortcutsSettings::isValid(QString name, QString Sequences)
|
||||
bool ShortcutsSettings::isValid(const QString &name, const QString &Sequences) const
|
||||
{
|
||||
QString checkSequence = Sequences.split(";").last();
|
||||
QString checkSequence = Sequences.split(sep).last();
|
||||
QString checkKey = name.left(name.indexOf("/"));
|
||||
|
||||
QList<QString> allKeys = shortCuts.keys();
|
||||
for (const auto &key : allKeys) {
|
||||
if (key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow")) {
|
||||
QString storedSequence = stringifySequence(shortCuts.value(key));
|
||||
QStringList stringSequences = storedSequence.split(";");
|
||||
QStringList stringSequences = storedSequence.split(sep);
|
||||
if (stringSequences.contains(checkSequence)) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -170,161 +178,3 @@ bool ShortcutsSettings::isValid(QString name, QString Sequences)
|
|||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void ShortcutsSettings::resetAllShortcuts()
|
||||
{
|
||||
for (auto it = defaultShortCuts.begin(); it != defaultShortCuts.end(); ++it) {
|
||||
setShortcuts(it.key(), it.value());
|
||||
}
|
||||
emit allShortCutsReset();
|
||||
}
|
||||
|
||||
void ShortcutsSettings::clearAllShortcuts()
|
||||
{
|
||||
for (auto it = shortCuts.begin(); it != shortCuts.end(); ++it) {
|
||||
setShortcuts(it.key(), "");
|
||||
}
|
||||
emit allShortCutsClear();
|
||||
}
|
||||
|
||||
void ShortcutsSettings::fillDefaultShorcuts()
|
||||
{
|
||||
defaultShortCuts["MainWindow/aCheckCardUpdates"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aConnect"] = parseSequenceString("Ctrl+L");
|
||||
defaultShortCuts["MainWindow/aDeckEditor"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aDisconnect"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aExit"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aFullScreen"] = parseSequenceString("Ctrl+F");
|
||||
defaultShortCuts["MainWindow/aRegister"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aSettings"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aSinglePlayer"] = parseSequenceString("");
|
||||
defaultShortCuts["MainWindow/aWatchReplay"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["TabDeckEditor/aAnalyzeDeck"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aClearFilterAll"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aClearFilterOne"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aClose"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aDecrement"] = parseSequenceString("-");
|
||||
defaultShortCuts["TabDeckEditor/aManageSets"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aEditTokens"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aExportDeckDecklist"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aIncrement"] = parseSequenceString("+");
|
||||
defaultShortCuts["TabDeckEditor/aLoadDeck"] = parseSequenceString("Ctrl+O");
|
||||
defaultShortCuts["TabDeckEditor/aLoadDeckFromClipboard"] = parseSequenceString("Ctrl+Shift+V");
|
||||
defaultShortCuts["TabDeckEditor/aNewDeck"] = parseSequenceString("Ctrl+N");
|
||||
defaultShortCuts["TabDeckEditor/aOpenCustomFolder"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aPrintDeck"] = parseSequenceString("Ctrl+P");
|
||||
defaultShortCuts["TabDeckEditor/aRemoveCard"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aResetLayout"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aSaveDeck"] = parseSequenceString("Ctrl+S");
|
||||
defaultShortCuts["TabDeckEditor/aSaveDeckAs"] = parseSequenceString("");
|
||||
defaultShortCuts["TabDeckEditor/aSaveDeckToClipboard"] = parseSequenceString("Ctrl+Shift+C");
|
||||
defaultShortCuts["TabDeckEditor/aSaveDeckToClipboardRaw"] = parseSequenceString("Ctrl+Shift+R");
|
||||
|
||||
defaultShortCuts["DeckViewContainer/loadLocalButton"] = parseSequenceString("Ctrl+O");
|
||||
defaultShortCuts["DeckViewContainer/loadRemoteButton"] = parseSequenceString("Ctrl+Alt+O");
|
||||
|
||||
defaultShortCuts["Player/aDec"] = parseSequenceString("F11");
|
||||
defaultShortCuts["Player/aInc"] = parseSequenceString("F12");
|
||||
defaultShortCuts["Player/aSet"] = parseSequenceString("Ctrl+L");
|
||||
defaultShortCuts["Player/aCloseMostRecentZoneView"] = parseSequenceString("Esc");
|
||||
defaultShortCuts["Player/IncP"] = parseSequenceString("Ctrl++");
|
||||
defaultShortCuts["Player/aAlwaysRevealTopCard"] = parseSequenceString("Ctrl+N");
|
||||
defaultShortCuts["Player/aAttach"] = parseSequenceString("Ctrl+Alt+A");
|
||||
defaultShortCuts["Player/aCCGreen"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aCCRed"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aCCYellow"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aClone"] = parseSequenceString("Ctrl+J");
|
||||
defaultShortCuts["Player/aCreateAnotherToken"] = parseSequenceString("Ctrl+G");
|
||||
defaultShortCuts["Player/aCreateToken"] = parseSequenceString("Ctrl+T");
|
||||
defaultShortCuts["Player/aCreateRelatedTokens"] = parseSequenceString("Ctrl+Shift+T");
|
||||
defaultShortCuts["Player/aDecP"] = parseSequenceString("Ctrl+-");
|
||||
defaultShortCuts["Player/aDecPT"] = parseSequenceString("Ctrl+Alt+-");
|
||||
defaultShortCuts["Player/aDecT"] = parseSequenceString("Alt+-");
|
||||
defaultShortCuts["Player/aDoesntUntap"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDrawArrow"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDrawCard"] = parseSequenceString("Ctrl+D");
|
||||
defaultShortCuts["Player/aDrawCards"] = parseSequenceString("Ctrl+E");
|
||||
defaultShortCuts["Player/aFlip"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aIncPT"] = parseSequenceString("Ctrl+Alt++");
|
||||
defaultShortCuts["Player/aIncT"] = parseSequenceString("Alt++");
|
||||
defaultShortCuts["Player/aMoveToBottomLibrary"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aMoveToExile"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aMoveToGraveyard"] = parseSequenceString("Ctrl+Del");
|
||||
defaultShortCuts["Player/aMoveToHand"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aMoveToTopLibrary"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aMulligan"] = parseSequenceString("Ctrl+M");
|
||||
defaultShortCuts["Player/aPeek"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aPlay"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aRCGreen"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aRCRed"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aRCYellow"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aRollDie"] = parseSequenceString("Ctrl+I");
|
||||
defaultShortCuts["Player/aSCGreen"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSCRed"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSCYellow"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetAnnotation"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetPT"] = parseSequenceString("Ctrl+P");
|
||||
defaultShortCuts["Player/aResetPT"] = parseSequenceString("Ctrl+Alt+0");
|
||||
defaultShortCuts["Player/aShuffle"] = parseSequenceString("Ctrl+S");
|
||||
defaultShortCuts["Player/aTap"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aUnattach"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aUndoDraw"] = parseSequenceString("Ctrl+Shift+D");
|
||||
defaultShortCuts["Player/aUntapAll"] = parseSequenceString("Ctrl+U");
|
||||
defaultShortCuts["Player/aViewGraveyard"] = parseSequenceString("F4");
|
||||
defaultShortCuts["Player/aViewLibrary"] = parseSequenceString("F3");
|
||||
defaultShortCuts["Player/aViewRfg"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aViewSideboard"] = parseSequenceString("Ctrl+F3");
|
||||
defaultShortCuts["Player/aViewTopCards"] = parseSequenceString("Ctrl+W");
|
||||
defaultShortCuts["Player/aConcede"] = parseSequenceString("F2");
|
||||
defaultShortCuts["Player/aLeaveGame"] = parseSequenceString("Ctrl+Q");
|
||||
defaultShortCuts["Player/aNextPhase"] = parseSequenceString("Ctrl+Space;Tab");
|
||||
defaultShortCuts["Player/aNextTurn"] = parseSequenceString("Ctrl+Return;Ctrl+Enter");
|
||||
defaultShortCuts["Player/aRemoveLocalArrows"] = parseSequenceString("Ctrl+R");
|
||||
defaultShortCuts["Player/aRotateViewCCW"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aRotateViewCW"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/phase0"] = parseSequenceString("F5");
|
||||
defaultShortCuts["Player/phase1"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/phase10"] = parseSequenceString("F10");
|
||||
defaultShortCuts["Player/phase2"] = parseSequenceString("F6");
|
||||
defaultShortCuts["Player/phase3"] = parseSequenceString("F7");
|
||||
defaultShortCuts["Player/phase4"] = parseSequenceString("F8");
|
||||
defaultShortCuts["Player/phase5"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/phase6"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/phase7"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/phase8"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/phase9"] = parseSequenceString("F9");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_w"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_w"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_w"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_u"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_u"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_u"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_b"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_b"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_b"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_r"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_r"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_r"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_g"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_g"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_g"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_x"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_x"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_x"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["Player/aIncCounter_storm"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aDecCounter_storm"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aSetCounter_storm"] = parseSequenceString("");
|
||||
|
||||
defaultShortCuts["tab_room/aClearChat"] = parseSequenceString("F12");
|
||||
defaultShortCuts["DlgLoadDeckFromClipboard/refreshButton"] = parseSequenceString("F5");
|
||||
defaultShortCuts["Player/aResetLayout"] = parseSequenceString("");
|
||||
defaultShortCuts["Player/aMoveTopToPlayFaceDown"] = parseSequenceString("Ctrl+Shift+E");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue