Skip to content
GitLab
Commit 3412ce2f authored by Zach's avatar Zach
Browse files

Merge pull request #1501 from marcofernandezheras/Fix-Shortcut-Detection 

Fix shortcuts detection on settings & game
parents f97a7e83 4c6b543c
Hide whitespace changes
Inline Side-by-side
cockatrice/src/shortcutssettings.cpp
View file @ 3412ce2f
...@@ -18,9 +18,9 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO ...@@ -18,9 +18,9 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
const QStringList customKeys = shortCutsFile.allKeys(); const QStringList customKeys = shortCutsFile.allKeys();
for(QStringList::const_iterator it = customKeys.constBegin(); it != customKeys.constEnd(); ++it) for(QStringList::const_iterator it = customKeys.constBegin(); it != customKeys.constEnd(); ++it)
{ {
QString stringSecuence = shortCutsFile.value(*it).toString(); QString stringSequence = shortCutsFile.value(*it).toString();
QList<QKeySequence> secuenceList = parseSecuenceString(stringSecuence); QList<QKeySequence> SequenceList = parseSequenceString(stringSequence);
shortCuts.insert(*it, secuenceList); shortCuts.insert(*it, SequenceList);
} }
shortCutsFile.endGroup(); shortCutsFile.endGroup();
} }
...@@ -41,76 +41,77 @@ QKeySequence ShortcutsSettings::getSingleShortcut(QString name) ...@@ -41,76 +41,77 @@ QKeySequence ShortcutsSettings::getSingleShortcut(QString name)
QString ShortcutsSettings::getDefaultShortcutString(QString name) QString ShortcutsSettings::getDefaultShortcutString(QString name)
{ {
return stringifySecuence(defaultShortCuts.value(name)); return stringifySequence(defaultShortCuts.value(name));
} }
QString ShortcutsSettings::getShortcutString(QString name) QString ShortcutsSettings::getShortcutString(QString name)
{ {
return stringifySecuence(shortCuts.value(name)); return stringifySequence(shortCuts.value(name));
} }
QString ShortcutsSettings::stringifySecuence(QList<QKeySequence> secuence) const QString ShortcutsSettings::stringifySequence(QList<QKeySequence> Sequence) const
{ {
QString stringSecuence; QString stringSequence;
for(int i=0; i < secuence.size(); ++i) for(int i=0; i < Sequence.size(); ++i)
{ {
stringSecuence.append(secuence.at(i).toString(QKeySequence::PortableText)); stringSequence.append(Sequence.at(i).toString(QKeySequence::PortableText));
if(i < secuence.size() - 1) if(i < Sequence.size() - 1)
stringSecuence.append(";"); stringSequence.append(";");
} }
return stringSecuence; return stringSequence;
} }
QList<QKeySequence> ShortcutsSettings::parseSecuenceString(QString stringSecuence) QList<QKeySequence> ShortcutsSettings::parseSequenceString(QString stringSequence)
{ {
QStringList secuences = stringSecuence.split(";"); QStringList Sequences = stringSequence.split(";");
QList<QKeySequence> secuenceList; QList<QKeySequence> SequenceList;
for(QStringList::const_iterator ss = secuences.constBegin(); ss != secuences.constEnd(); ++ss) for(QStringList::const_iterator ss = Sequences.constBegin(); ss != Sequences.constEnd(); ++ss)
{ {
secuenceList.append(QKeySequence(*ss, QKeySequence::PortableText)); SequenceList.append(QKeySequence(*ss, QKeySequence::PortableText));
} }
return secuenceList; return SequenceList;
} }
void ShortcutsSettings::setShortcuts(QString name, QList<QKeySequence> secuence) void ShortcutsSettings::setShortcuts(QString name, QList<QKeySequence> Sequence)
{ {
shortCuts[name] = secuence; shortCuts[name] = Sequence;
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat); QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
shortCutsFile.beginGroup("Custom"); shortCutsFile.beginGroup("Custom");
QString stringSecuence = stringifySecuence(secuence); QString stringSequence = stringifySequence(Sequence);
shortCutsFile.setValue(name, stringSecuence); shortCutsFile.setValue(name, stringSequence);
shortCutsFile.endGroup(); shortCutsFile.endGroup();
emit shortCutchanged(); emit shortCutchanged();
} }
void ShortcutsSettings::setShortcuts(QString name, QKeySequence secuence) void ShortcutsSettings::setShortcuts(QString name, QKeySequence Sequence)
{ {
setShortcuts(name, QList<QKeySequence>() << secuence); setShortcuts(name, QList<QKeySequence>() << Sequence);
} }
void ShortcutsSettings::setShortcuts(QString name, QString secuences) void ShortcutsSettings::setShortcuts(QString name, QString Sequences)
{ {
setShortcuts(name,parseSecuenceString(secuences)); setShortcuts(name,parseSequenceString(Sequences));
} }
bool ShortcutsSettings::isValid(QString name, QString secuences) bool ShortcutsSettings::isValid(QString name, QString Sequences)
{ {
QString checkKey = name.left(name.indexOf("/")); QString checkKey = name.left(name.indexOf("/"));
QStringList stringSecuences = secuences.split(";"); QString checkSequence = Sequences.split(";").last();
QList<QString> allKeys = shortCuts.keys(); QList<QString> allKeys = shortCuts.keys();
for(int i=0; i < allKeys.size(); i++){ for(int i=0; i < allKeys.size(); i++){
QString key = allKeys.at(i); QString key = allKeys.at(i);
if(key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow")) if(key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow"))
{ {
QString storedSecuence = stringifySecuence(shortCuts.value(key)); QString storedSequence = stringifySequence(shortCuts.value(key));
for(int j = 0; j < stringSecuences.size(); j++) QStringList stringSequences = storedSequence.split(";");
for(int j = 0; j < stringSequences.size(); j++)
{ {
if(storedSecuence.contains(stringSecuences.at(j))) if(checkSequence == stringSequences.at(j))
return false; return false;
} }
} }
...@@ -120,109 +121,108 @@ bool ShortcutsSettings::isValid(QString name, QString secuences) ...@@ -120,109 +121,108 @@ bool ShortcutsSettings::isValid(QString name, QString secuences)
void ShortcutsSettings::fillDefaultShorcuts() void ShortcutsSettings::fillDefaultShorcuts()
{ {
defaultShortCuts["MainWindow/aCheckCardUpdates"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aCheckCardUpdates"] = parseSequenceString("");
defaultShortCuts["MainWindow/aConnect"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aConnect"] = parseSequenceString("");
defaultShortCuts["MainWindow/aDeckEditor"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aDeckEditor"] = parseSequenceString("");
defaultShortCuts["MainWindow/aDisconnect"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aDisconnect"] = parseSequenceString("");
defaultShortCuts["MainWindow/aExit"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aExit"] = parseSequenceString("");
defaultShortCuts["MainWindow/aFullScreen"] = parseSecuenceString("Ctrl+F"); defaultShortCuts["MainWindow/aFullScreen"] = parseSequenceString("Ctrl+F");
defaultShortCuts["MainWindow/aRegister"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aRegister"] = parseSequenceString("");
defaultShortCuts["MainWindow/aSettings"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aSettings"] = parseSequenceString("");
defaultShortCuts["MainWindow/aSinglePlayer"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aSinglePlayer"] = parseSequenceString("");
defaultShortCuts["MainWindow/aWatchReplay"] = parseSecuenceString(""); defaultShortCuts["MainWindow/aWatchReplay"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aAnalyzeDeck"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aAnalyzeDeck"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aClearFilterAll"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aClearFilterAll"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aClearFilterOne"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aClearFilterOne"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aClose"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aClose"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aDecrement"] = parseSecuenceString("-"); defaultShortCuts["TabDeckEditor/aDecrement"] = parseSequenceString("-");
defaultShortCuts["TabDeckEditor/aEditSets"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aEditSets"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aEditTokens"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aEditTokens"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aIncrement"] = parseSecuenceString("+"); defaultShortCuts["TabDeckEditor/aIncrement"] = parseSequenceString("+");
defaultShortCuts["TabDeckEditor/aLoadDeck"] = parseSecuenceString("Ctrl+O"); defaultShortCuts["TabDeckEditor/aLoadDeck"] = parseSequenceString("Ctrl+O");
defaultShortCuts["TabDeckEditor/aLoadDeckFromClipboard"] = parseSecuenceString("Ctrl+V"); defaultShortCuts["TabDeckEditor/aLoadDeckFromClipboard"] = parseSequenceString("Ctrl+V");
defaultShortCuts["TabDeckEditor/aNewDeck"] = parseSecuenceString("Ctrl+N"); defaultShortCuts["TabDeckEditor/aNewDeck"] = parseSequenceString("Ctrl+N");
defaultShortCuts["TabDeckEditor/aOpenCustomFolder"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aOpenCustomFolder"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aPrintDeck"] = parseSecuenceString("Ctrl+P"); defaultShortCuts["TabDeckEditor/aPrintDeck"] = parseSequenceString("Ctrl+P");
defaultShortCuts["TabDeckEditor/aRemoveCard"] = parseSecuenceString("Del"); defaultShortCuts["TabDeckEditor/aRemoveCard"] = parseSequenceString("Del");
defaultShortCuts["TabDeckEditor/aResetLayout"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aResetLayout"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aSaveDeck"] = parseSecuenceString("Ctrl+S"); defaultShortCuts["TabDeckEditor/aSaveDeck"] = parseSequenceString("Ctrl+S");
defaultShortCuts["TabDeckEditor/aSaveDeckAs"] = parseSecuenceString(""); defaultShortCuts["TabDeckEditor/aSaveDeckAs"] = parseSequenceString("");
defaultShortCuts["TabDeckEditor/aSaveDeckToClipboard"] = parseSecuenceString("Ctrl+C"); defaultShortCuts["TabDeckEditor/aSaveDeckToClipboard"] = parseSequenceString("Ctrl+C");
defaultShortCuts["DeckViewContainer/loadLocalButton"] = parseSecuenceString("Ctrl+O"); defaultShortCuts["DeckViewContainer/loadLocalButton"] = parseSequenceString("Ctrl+O");
defaultShortCuts["DeckViewContainer/loadRemoteButton"] = parseSecuenceString("Ctrl+Alt+O"); defaultShortCuts["DeckViewContainer/loadRemoteButton"] = parseSequenceString("Ctrl+Alt+O");
defaultShortCuts["Player/aDec"] = parseSecuenceString("F11"); defaultShortCuts["Player/aDec"] = parseSequenceString("F11");
defaultShortCuts["Player/aInc"] = parseSecuenceString("F12"); defaultShortCuts["Player/aInc"] = parseSequenceString("F12");
defaultShortCuts["Player/aSet"] = parseSecuenceString("Ctrl+L"); defaultShortCuts["Player/aSet"] = parseSequenceString("Ctrl+L");
defaultShortCuts["Player/aCloseMostRecentZoneView"] = parseSecuenceString("Esc"); defaultShortCuts["Player/aCloseMostRecentZoneView"] = parseSequenceString("Esc");
defaultShortCuts["Player/IncP"] = parseSecuenceString("Ctrl++"); defaultShortCuts["Player/IncP"] = parseSequenceString("Ctrl++");
defaultShortCuts["Player/aAlwaysRevealTopCard"] = parseSecuenceString("Ctrl+N"); defaultShortCuts["Player/aAlwaysRevealTopCard"] = parseSequenceString("Ctrl+N");
defaultShortCuts["Player/aAttach"] = parseSecuenceString("Ctrl+A"); defaultShortCuts["Player/aAttach"] = parseSequenceString("Ctrl+A");
defaultShortCuts["Player/aCCGreen"] = parseSecuenceString(""); defaultShortCuts["Player/aCCGreen"] = parseSequenceString("");
defaultShortCuts["Player/aCCRed"] = parseSecuenceString(""); defaultShortCuts["Player/aCCRed"] = parseSequenceString("");
defaultShortCuts["Player/aCCYellow"] = parseSecuenceString(""); defaultShortCuts["Player/aCCYellow"] = parseSequenceString("");
defaultShortCuts["Player/aClone"] = parseSecuenceString("Ctrl+J"); defaultShortCuts["Player/aClone"] = parseSequenceString("Ctrl+J");
defaultShortCuts["Player/aCreateAnotherToken"] = parseSecuenceString("Ctrl+G"); defaultShortCuts["Player/aCreateAnotherToken"] = parseSequenceString("Ctrl+G");
defaultShortCuts["Player/aCreateToken"] = parseSecuenceString("Ctrl+T"); defaultShortCuts["Player/aCreateToken"] = parseSequenceString("Ctrl+T");
defaultShortCuts["Player/aDecP"] = parseSecuenceString("Ctrl+-"); defaultShortCuts["Player/aDecP"] = parseSequenceString("Ctrl+-");
defaultShortCuts["Player/aDecPT"] = parseSecuenceString("Ctrl+Alt+-"); defaultShortCuts["Player/aDecPT"] = parseSequenceString("Ctrl+Alt+-");
defaultShortCuts["Player/aDecT"] = parseSecuenceString("Alt+-"); defaultShortCuts["Player/aDecT"] = parseSequenceString("Alt+-");
defaultShortCuts["Player/aDoesntUntap"] = parseSecuenceString(""); defaultShortCuts["Player/aDoesntUntap"] = parseSequenceString("");
defaultShortCuts["Player/aDrawArrow"] = parseSecuenceString(""); defaultShortCuts["Player/aDrawArrow"] = parseSequenceString("");
defaultShortCuts["Player/aDrawCard"] = parseSecuenceString("Ctrl+D"); defaultShortCuts["Player/aDrawCard"] = parseSequenceString("Ctrl+D");
defaultShortCuts["Player/aDrawCards"] = parseSecuenceString("Ctrl+E"); defaultShortCuts["Player/aDrawCards"] = parseSequenceString("Ctrl+E");
defaultShortCuts["Player/aFlip"] = parseSecuenceString(""); defaultShortCuts["Player/aFlip"] = parseSequenceString("");
defaultShortCuts["Player/aIncPT"] = parseSecuenceString("Ctrl+Alt++"); defaultShortCuts["Player/aIncPT"] = parseSequenceString("Ctrl+Alt++");
defaultShortCuts["Player/aIncT"] = parseSecuenceString("Alt++"); defaultShortCuts["Player/aIncT"] = parseSequenceString("Alt++");
defaultShortCuts["Player/aMoveToBottomLibrary"] = parseSecuenceString(""); defaultShortCuts["Player/aMoveToBottomLibrary"] = parseSequenceString("");
defaultShortCuts["Player/aMoveToExile"] = parseSecuenceString(""); defaultShortCuts["Player/aMoveToExile"] = parseSequenceString("");
defaultShortCuts["Player/aMoveToGraveyard"] = parseSecuenceString("Ctrl+Del"); defaultShortCuts["Player/aMoveToGraveyard"] = parseSequenceString("Ctrl+Del");
defaultShortCuts["Player/aMoveToHand"] = parseSecuenceString(""); defaultShortCuts["Player/aMoveToHand"] = parseSequenceString("");
defaultShortCuts["Player/aMoveToTopLibrary"] = parseSecuenceString(""); defaultShortCuts["Player/aMoveToTopLibrary"] = parseSequenceString("");
defaultShortCuts["Player/aMulligan"] = parseSecuenceString("Ctrl+M"); defaultShortCuts["Player/aMulligan"] = parseSequenceString("Ctrl+M");
defaultShortCuts["Player/aPeek"] = parseSecuenceString(""); defaultShortCuts["Player/aPeek"] = parseSequenceString("");
defaultShortCuts["Player/aPlay"] = parseSecuenceString(""); defaultShortCuts["Player/aPlay"] = parseSequenceString("");
defaultShortCuts["Player/aRCGreen"] = parseSecuenceString(""); defaultShortCuts["Player/aRCGreen"] = parseSequenceString("");
defaultShortCuts["Player/aRCRed"] = parseSecuenceString(""); defaultShortCuts["Player/aRCRed"] = parseSequenceString("");
defaultShortCuts["Player/aRCYellow"] = parseSecuenceString(""); defaultShortCuts["Player/aRCYellow"] = parseSequenceString("");
defaultShortCuts["Player/aRollDie"] = parseSecuenceString("Ctrl+I"); defaultShortCuts["Player/aRollDie"] = parseSequenceString("Ctrl+I");
defaultShortCuts["Player/aSCGreen"] = parseSecuenceString(""); defaultShortCuts["Player/aSCGreen"] = parseSequenceString("");
defaultShortCuts["Player/aSCRed"] = parseSecuenceString(""); defaultShortCuts["Player/aSCRed"] = parseSequenceString("");
defaultShortCuts["Player/aSCYellow"] = parseSecuenceString(""); defaultShortCuts["Player/aSCYellow"] = parseSequenceString("");
defaultShortCuts["Player/aSetAnnotation"] = parseSecuenceString(""); defaultShortCuts["Player/aSetAnnotation"] = parseSequenceString("");
defaultShortCuts["Player/aSetPT"] = parseSecuenceString("Ctrl+P"); defaultShortCuts["Player/aSetPT"] = parseSequenceString("Ctrl+P");
defaultShortCuts["Player/aShuffle"] = parseSecuenceString("Ctrl+S"); defaultShortCuts["Player/aShuffle"] = parseSequenceString("Ctrl+S");
defaultShortCuts["Player/aTap"] = parseSecuenceString(""); defaultShortCuts["Player/aTap"] = parseSequenceString("");
defaultShortCuts["Player/aUnattach"] = parseSecuenceString(""); defaultShortCuts["Player/aUnattach"] = parseSequenceString("");
defaultShortCuts["Player/aUndoDraw"] = parseSecuenceString("Ctrl+Shift+D"); defaultShortCuts["Player/aUndoDraw"] = parseSequenceString("Ctrl+Shift+D");
defaultShortCuts["Player/aUntap"] = parseSecuenceString(""); defaultShortCuts["Player/aUntap"] = parseSequenceString("");
defaultShortCuts["Player/aUntapAll"] = parseSecuenceString("Ctrl+U"); defaultShortCuts["Player/aUntapAll"] = parseSequenceString("Ctrl+U");
defaultShortCuts["Player/aViewGraveyard"] = parseSecuenceString("F4"); defaultShortCuts["Player/aViewGraveyard"] = parseSequenceString("F4");
defaultShortCuts["Player/aViewLibrary"] = parseSecuenceString("F3"); defaultShortCuts["Player/aViewLibrary"] = parseSequenceString("F3");
defaultShortCuts["Player/aViewRfg"] = parseSecuenceString(""); defaultShortCuts["Player/aViewRfg"] = parseSequenceString("");
defaultShortCuts["Player/aViewSideboard"] = parseSecuenceString("Ctrl+F3"); defaultShortCuts["Player/aViewSideboard"] = parseSequenceString("Ctrl+F3");
defaultShortCuts["Player/aViewTopCards"] = parseSecuenceString("Ctrl+W"); defaultShortCuts["Player/aViewTopCards"] = parseSequenceString("Ctrl+W");
defaultShortCuts["Player/aConcede"] = parseSecuenceString("F2"); defaultShortCuts["Player/aConcede"] = parseSequenceString("F2");
defaultShortCuts["Player/aLeaveGame"] = parseSecuenceString("Ctrl+Q"); defaultShortCuts["Player/aLeaveGame"] = parseSequenceString("Ctrl+Q");
defaultShortCuts["Player/aNextPhase"] = parseSecuenceString("Ctrl+Space;Tab"); defaultShortCuts["Player/aNextPhase"] = parseSequenceString("Ctrl+Space;Tab");
defaultShortCuts["Player/aNextTurn"] = parseSecuenceString("Ctrl+Return;Ctrl+Enter"); defaultShortCuts["Player/aNextTurn"] = parseSequenceString("Ctrl+Return;Ctrl+Enter");
defaultShortCuts["Player/aRemoveLocalArrows"] = parseSecuenceString("Ctrl+R"); defaultShortCuts["Player/aRemoveLocalArrows"] = parseSequenceString("Ctrl+R");
defaultShortCuts["Player/aRotateViewCCW"] = parseSecuenceString("Ctrl+["); defaultShortCuts["Player/aRotateViewCCW"] = parseSequenceString("Ctrl+[");
defaultShortCuts["Player/aRotateViewCW"] = parseSecuenceString("Ctrl+]"); defaultShortCuts["Player/aRotateViewCW"] = parseSequenceString("Ctrl+]");
defaultShortCuts["Player/phase0"] = parseSecuenceString("F5"); defaultShortCuts["Player/phase0"] = parseSequenceString("F5");
defaultShortCuts["Player/phase1"] = parseSecuenceString(""); defaultShortCuts["Player/phase1"] = parseSequenceString("");
defaultShortCuts["Player/phase10"] = parseSecuenceString("F10"); defaultShortCuts["Player/phase10"] = parseSequenceString("F10");
defaultShortCuts["Player/phase2"] = parseSecuenceString("F6"); defaultShortCuts["Player/phase2"] = parseSequenceString("F6");
defaultShortCuts["Player/phase3"] = parseSecuenceString("F7"); defaultShortCuts["Player/phase3"] = parseSequenceString("F7");
defaultShortCuts["Player/phase4"] = parseSecuenceString("F8"); defaultShortCuts["Player/phase4"] = parseSequenceString("F8");
defaultShortCuts["Player/phase5"] = parseSecuenceString(""); defaultShortCuts["Player/phase5"] = parseSequenceString("");
defaultShortCuts["Player/phase6"] = parseSecuenceString(""); defaultShortCuts["Player/phase6"] = parseSequenceString("");
defaultShortCuts["Player/phase7"] = parseSecuenceString(""); defaultShortCuts["Player/phase7"] = parseSequenceString("");
defaultShortCuts["Player/phase8"] = parseSecuenceString(""); defaultShortCuts["Player/phase8"] = parseSequenceString("");
defaultShortCuts["Player/phase9"] = parseSecuenceString("F9"); defaultShortCuts["Player/phase9"] = parseSequenceString("F9");
defaultShortCuts["tab_room/aClearChat"] = parseSecuenceString("F12"); defaultShortCuts["tab_room/aClearChat"] = parseSequenceString("F12");
defaultShortCuts["DlgLoadDeckFromClipboard/refreshButton"] = parseSecuenceString("F5"); defaultShortCuts["DlgLoadDeckFromClipboard/refreshButton"] = parseSequenceString("F5");
} }
cockatrice/src/shortcutssettings.h
View file @ 3412ce2f
...@@ -19,11 +19,11 @@ public: ...@@ -19,11 +19,11 @@ public:
QString getDefaultShortcutString(QString name); QString getDefaultShortcutString(QString name);
QString getShortcutString(QString name); QString getShortcutString(QString name);
void setShortcuts(QString name, QList<QKeySequence> secuence); void setShortcuts(QString name, QList<QKeySequence> Sequence);
void setShortcuts(QString name, QKeySequence secuence); void setShortcuts(QString name, QKeySequence Sequence);
void setShortcuts(QString name, QString secuences); void setShortcuts(QString name, QString Sequences);
bool isValid(QString name, QString secuences); bool isValid(QString name, QString Sequences);
signals: signals:
void shortCutchanged(); void shortCutchanged();
...@@ -33,8 +33,8 @@ private: ...@@ -33,8 +33,8 @@ private:
QMap<QString,QList<QKeySequence> > defaultShortCuts; QMap<QString,QList<QKeySequence> > defaultShortCuts;
void fillDefaultShorcuts(); void fillDefaultShorcuts();
QString stringifySecuence(QList<QKeySequence> secuence) const; QString stringifySequence(QList<QKeySequence> Sequence) const;
QList<QKeySequence> parseSecuenceString(QString stringSecuence); QList<QKeySequence> parseSequenceString(QString stringSequence);
}; };
#endif // SHORTCUTSSETTINGS_H #endif // SHORTCUTSSETTINGS_H
cockatrice/src/tab_game.cpp
View file @ 3412ce2f
...@@ -452,6 +452,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client ...@@ -452,6 +452,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
scene = new GameScene(phasesToolbar, this); scene = new GameScene(phasesToolbar, this);
gameView = new GameView(scene); gameView = new GameView(scene);
gameView->hide(); gameView->hide();
gameView->setFocusPolicy(Qt::ClickFocus);
cardInfo = new CardFrame(); cardInfo = new CardFrame();
playerListWidget = new PlayerListWidget(tabSupervisor, clients.first(), this); playerListWidget = new PlayerListWidget(tabSupervisor, clients.first(), this);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment