aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add keybinds to mill cards (#3439)

Browse source 
* 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 2018-11-24 04:21:20 +01:00 committed by Zach H
parent 843b9df939
commit 06081bd940
13 changed files with 1154 additions and 933 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/abstractcounter.cpp
View file

@ -46,7 +46,7 @@ AbstractCounter::AbstractCounter(Player *_player,
} else } else
menu = nullptr; menu = nullptr;
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
retranslateUi(); retranslateUi();
} }

2
cockatrice/src/dlg_load_deck_from_clipboard.cpp
View file

@ -32,7 +32,7 @@ DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent) : QDialog(pa
resize(500, 500); resize(500, 500);
actRefresh(); actRefresh();
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
} }

2
cockatrice/src/gameview.cpp
View file

@ -22,7 +22,7 @@ GameView::GameView(QGraphicsScene *scene, QWidget *parent) : QGraphicsView(scene
connect(aCloseMostRecentZoneView, SIGNAL(triggered()), scene, SLOT(closeMostRecentZoneView())); connect(aCloseMostRecentZoneView, SIGNAL(triggered()), scene, SLOT(closeMostRecentZoneView()));
addAction(aCloseMostRecentZoneView); addAction(aCloseMostRecentZoneView);
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
rubberBand = new QRubberBand(QRubberBand::Rectangle, this); rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
} }

832
cockatrice/src/player.cpp
View file

File diff suppressed because it is too large Load diff

10
cockatrice/src/player.h
View file

@ -144,6 +144,8 @@ public slots:
void actUndoDraw(); void actUndoDraw();
void actMulligan(); void actMulligan();
void actMoveTopCardToPlayFaceDown(); void actMoveTopCardToPlayFaceDown();
void actMoveTopCardToGrave();
void actMoveTopCardToExile();
void actMoveTopCardsToGrave(); void actMoveTopCardsToGrave();
void actMoveTopCardsToExile(); void actMoveTopCardsToExile();
void actMoveTopCardToBottom(); void actMoveTopCardToBottom();
@ -201,10 +203,10 @@ private:
QAction *aMoveHandToTopLibrary, *aMoveHandToBottomLibrary, *aMoveHandToGrave, *aMoveHandToRfg, QAction *aMoveHandToTopLibrary, *aMoveHandToBottomLibrary, *aMoveHandToGrave, *aMoveHandToRfg,
*aMoveGraveToTopLibrary, *aMoveGraveToBottomLibrary, *aMoveGraveToHand, *aMoveGraveToRfg, *aMoveRfgToTopLibrary, *aMoveGraveToTopLibrary, *aMoveGraveToBottomLibrary, *aMoveGraveToHand, *aMoveGraveToRfg, *aMoveRfgToTopLibrary,
*aMoveRfgToBottomLibrary, *aMoveRfgToHand, *aMoveRfgToGrave, *aViewLibrary, *aViewTopCards, *aMoveRfgToBottomLibrary, *aMoveRfgToHand, *aMoveRfgToGrave, *aViewLibrary, *aViewTopCards,
*aAlwaysRevealTopCard, *aOpenDeckInDeckEditor, *aMoveTopCardsToGrave, *aMoveTopCardsToExile, *aAlwaysRevealTopCard, *aOpenDeckInDeckEditor, *aMoveTopCardToGraveyard, *aMoveTopCardToExile,
*aMoveTopCardToBottom, *aViewGraveyard, *aViewRfg, *aViewSideboard, *aDrawCard, *aDrawCards, *aUndoDraw, *aMoveTopCardsToGraveyard, *aMoveTopCardsToExile, *aMoveTopCardToBottom, *aViewGraveyard, *aViewRfg,
*aMulligan, *aShuffle, *aMoveTopToPlayFaceDown, *aUntapAll, *aRollDie, *aCreateToken, *aCreateAnotherToken, *aViewSideboard, *aDrawCard, *aDrawCards, *aUndoDraw, *aMulligan, *aShuffle, *aMoveTopToPlayFaceDown,
*aCardMenu, *aMoveBottomCardToGrave; *aUntapAll, *aRollDie, *aCreateToken, *aCreateAnotherToken, *aCardMenu, *aMoveBottomCardToGrave;
QList<QAction *> aAddCounter, aSetCounter, aRemoveCounter; QList<QAction *> aAddCounter, aSetCounter, aRemoveCounter;
QAction *aPlay, *aPlayFacedown, *aHide, *aTap, *aDoesntUntap, *aAttach, *aUnattach, *aDrawArrow, *aSetPT, *aResetPT, QAction *aPlay, *aPlayFacedown, *aHide, *aTap, *aDoesntUntap, *aAttach, *aUnattach, *aDrawArrow, *aSetPT, *aResetPT,

34
cockatrice/src/sequenceEdit/sequenceedit.cpp
View file

@ -1,20 +1,12 @@
#include "sequenceedit.h" #include "sequenceedit.h"
#include "../settingscache.h" #include "../settingscache.h"
#include <QEvent>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QKeyEvent> #include <QKeyEvent>
#include <QLineEdit>
#include <QPushButton>
#include <QToolTip> #include <QToolTip>
#include <utility> #include <utility>
SequenceEdit::SequenceEdit(QString _shorcutName, QWidget *parent) : QWidget(parent) SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent), shortcutName(_shortcutName)
{ {
shorcutName = std::move(_shorcutName);
currentKey = 0;
keys = 0;
valid = false;
lineEdit = new QLineEdit(this); lineEdit = new QLineEdit(this);
clearButton = new QPushButton("", this); clearButton = new QPushButton("", this);
defaultButton = new QPushButton("", this); defaultButton = new QPushButton("", this);
@ -42,20 +34,20 @@ SequenceEdit::SequenceEdit(QString _shorcutName, QWidget *parent) : QWidget(pare
connect(defaultButton, SIGNAL(clicked()), this, SLOT(restoreDefault())); connect(defaultButton, SIGNAL(clicked()), this, SLOT(restoreDefault()));
lineEdit->installEventFilter(this); lineEdit->installEventFilter(this);
lineEdit->setText(settingsCache->shortcuts().getShortcutString(shorcutName)); lineEdit->setText(settingsCache->shortcuts().getShortcutString(shortcutName));
} }
QString SequenceEdit::getSecuence() QString SequenceEdit::getSequence()
{ {
return lineEdit->text(); return lineEdit->text();
} }
void SequenceEdit::removeLastShortcut() void SequenceEdit::removeLastShortcut()
{ {
QString secuences = lineEdit->text(); QString sequences = lineEdit->text();
if (!secuences.isEmpty()) { if (!sequences.isEmpty()) {
if (secuences.lastIndexOf(";") > 0) { if (sequences.lastIndexOf(";") > 0) {
QString valid = secuences.left(secuences.lastIndexOf(";")); QString valid = sequences.left(sequences.lastIndexOf(";"));
lineEdit->setText(valid); lineEdit->setText(valid);
} else { } else {
lineEdit->clear(); lineEdit->clear();
@ -67,18 +59,18 @@ void SequenceEdit::removeLastShortcut()
void SequenceEdit::restoreDefault() void SequenceEdit::restoreDefault()
{ {
lineEdit->setText(settingsCache->shortcuts().getDefaultShortcutString(shorcutName)); lineEdit->setText(settingsCache->shortcuts().getDefaultShortcutString(shortcutName));
updateSettings(); updateSettings();
} }
void SequenceEdit::refreshShortcut() void SequenceEdit::refreshShortcut()
{ {
lineEdit->setText(settingsCache->shortcuts().getShortcutString(shorcutName)); lineEdit->setText(settingsCache->shortcuts().getShortcutString(shortcutName));
} }
void SequenceEdit::clear() void SequenceEdit::clear()
{ {
this->lineEdit->setText(""); lineEdit->setText("");
} }
bool SequenceEdit::eventFilter(QObject *, QEvent *event) bool SequenceEdit::eventFilter(QObject *, QEvent *event)
@ -142,8 +134,8 @@ void SequenceEdit::finishShortcut()
QKeySequence sequence(keys); QKeySequence sequence(keys);
if (!sequence.isEmpty() && valid) { if (!sequence.isEmpty() && valid) {
QString sequenceString = sequence.toString(); QString sequenceString = sequence.toString();
if (settingsCache->shortcuts().isKeyAllowed(shorcutName, sequenceString)) { if (settingsCache->shortcuts().isKeyAllowed(shortcutName, sequenceString)) {
if (settingsCache->shortcuts().isValid(shorcutName, sequenceString)) { if (settingsCache->shortcuts().isValid(shortcutName, sequenceString)) {
if (!lineEdit->text().isEmpty()) { if (!lineEdit->text().isEmpty()) {
if (lineEdit->text().contains(sequenceString)) { if (lineEdit->text().contains(sequenceString)) {
return; return;
@ -167,5 +159,5 @@ void SequenceEdit::finishShortcut()
void SequenceEdit::updateSettings() void SequenceEdit::updateSettings()
{ {
settingsCache->shortcuts().setShortcuts(shorcutName, lineEdit->text()); settingsCache->shortcuts().setShortcuts(shortcutName, lineEdit->text());
} }

25
cockatrice/src/sequenceEdit/sequenceedit.h
View file

@ -1,19 +1,18 @@
#ifndef SECUENCEEDIT_H #ifndef SEQUENCEEDIT_H
#define SECUENCEEDIT_H #define SEQUENCEEDIT_H
#include <QEvent>
#include <QKeySequence> #include <QKeySequence>
#include <QLineEdit>
#include <QPushButton>
#include <QWidget> #include <QWidget>
class QLineEdit;
class QPushButton;
class QEvent;
class SequenceEdit : public QWidget class SequenceEdit : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
SequenceEdit(QString _shorcutName, QWidget *parent = nullptr); SequenceEdit(const QString &_shortcutName, QWidget *parent = nullptr);
QString getSecuence(); QString getSequence();
void refreshShortcut(); void refreshShortcut();
void clear(); void clear();
@ -25,13 +24,13 @@ protected:
bool eventFilter(QObject *, QEvent *event); bool eventFilter(QObject *, QEvent *event);
private: private:
QString shorcutName; QString shortcutName;
QLineEdit *lineEdit; QLineEdit *lineEdit;
QPushButton *clearButton; QPushButton *clearButton;
QPushButton *defaultButton; QPushButton *defaultButton;
int keys; int keys = 0;
int currentKey; int currentKey = 0;
bool valid; bool valid = false;
void processKey(QKeyEvent *e); void processKey(QKeyEvent *e);
int translateModifiers(Qt::KeyboardModifiers state, const QString &text); int translateModifiers(Qt::KeyboardModifiers state, const QString &text);
@ -39,4 +38,4 @@ private:
void updateSettings(); void updateSettings();
}; };
#endif // SECUENCEEDIT_H #endif // SEQUENCEEDIT_H

626
cockatrice/src/sequenceEdit/ui_shortcutstab.h
View file

@ -279,42 +279,8 @@ public:
QSpacerItem *verticalSpacer_2; QSpacerItem *verticalSpacer_2;
QWidget *tab_3; QWidget *tab_3;
QGridLayout *gridLayout_20; QGridLayout *gridLayout_20;
QGroupBox *groupBox_15; QGroupBox *groupBox_gameplay;
QGridLayout *gridLayout_15; QGridLayout *gridLayout_gameplay;
QLabel *lbl_Player_aMoveToBottomLibrary;
SequenceEdit *Player_aMoveToBottomLibrary;
QLabel *lbl_Player_aMoveToTopLibrary;
SequenceEdit *Player_aMoveToTopLibrary;
QLabel *lbl_Player_aMoveToGraveyard;
SequenceEdit *Player_aMoveToGraveyard;
QLabel *lbl_Player_aMoveToExile;
SequenceEdit *Player_aMoveToExile;
QLabel *lbl_Player_aMoveToHand;
SequenceEdit *Player_aMoveToHand;
QLabel *lbl_Player_aMoveTopToPlayFaceDown;
SequenceEdit *Player_aMoveTopToPlayFaceDown;
QGroupBox *groupBox_16;
QGridLayout *gridLayout_16;
QLabel *lbl_Player_aViewGraveyard;
SequenceEdit *Player_aViewGraveyard;
QLabel *lbl_Player_aViewLibrary;
SequenceEdit *Player_aViewLibrary;
QLabel *lbl_Player_aViewTopCards;
SequenceEdit *Player_aViewTopCards;
QLabel *lbl_Player_aViewSideboard;
SequenceEdit *Player_aViewSideboard;
QLabel *lbl_Player_aViewRfg;
SequenceEdit *Player_aViewRfg;
QLabel *lbl_GameView_aCloseMostRecentZoneView;
SequenceEdit *GameView_aCloseMostRecentZoneView;
QGroupBox *groupBox_17;
QGridLayout *gridLayout_18;
SequenceEdit *DeckViewContainer_loadRemoteButton;
SequenceEdit *DeckViewContainer_loadLocalButton;
QLabel *lbl_DeckViewContainer_loadRemoteButton;
QLabel *lbl_DeckViewContainer_loadLocalButton;
QGroupBox *groupBox_18;
QGridLayout *gridLayout_19;
QLabel *lbl_Player_aDrawArrow; QLabel *lbl_Player_aDrawArrow;
SequenceEdit *Player_aDrawArrow; SequenceEdit *Player_aDrawArrow;
QLabel *lbl_TabGame_aLeaveGame; QLabel *lbl_TabGame_aLeaveGame;
@ -331,8 +297,36 @@ public:
SequenceEdit *Player_aShuffle; SequenceEdit *Player_aShuffle;
QLabel *lbl_TabGame_aRotateViewCCW; QLabel *lbl_TabGame_aRotateViewCCW;
SequenceEdit *TabGame_aRotateViewCCW; SequenceEdit *TabGame_aRotateViewCCW;
QGroupBox *groupBox_14; QGroupBox *groupBox_moveCard;
QGridLayout *gridLayout_14; QGridLayout *gridLayout_moveCard;
QLabel *lbl_Player_aMoveToBottomLibrary;
SequenceEdit *Player_aMoveToBottomLibrary;
QLabel *lbl_Player_aMoveToTopLibrary;
SequenceEdit *Player_aMoveToTopLibrary;
QLabel *lbl_Player_aMoveToGraveyard;
SequenceEdit *Player_aMoveToGraveyard;
QLabel *lbl_Player_aMoveToExile;
SequenceEdit *Player_aMoveToExile;
QLabel *lbl_Player_aMoveToHand;
SequenceEdit *Player_aMoveToHand;
QLabel *lbl_Player_aMoveTopToPlayFaceDown;
SequenceEdit *Player_aMoveTopToPlayFaceDown;
QGroupBox *groupBox_view;
QGridLayout *gridLayout_view;
QLabel *lbl_Player_aViewGraveyard;
SequenceEdit *Player_aViewGraveyard;
QLabel *lbl_Player_aViewLibrary;
SequenceEdit *Player_aViewLibrary;
QLabel *lbl_Player_aViewTopCards;
SequenceEdit *Player_aViewTopCards;
QLabel *lbl_Player_aViewSideboard;
SequenceEdit *Player_aViewSideboard;
QLabel *lbl_Player_aViewRfg;
SequenceEdit *Player_aViewRfg;
QLabel *lbl_GameView_aCloseMostRecentZoneView;
SequenceEdit *GameView_aCloseMostRecentZoneView;
QGroupBox *groupBox_draw;
QGridLayout *gridLayout_draw;
QLabel *lbl_Player_aMulligan; QLabel *lbl_Player_aMulligan;
SequenceEdit *Player_aMulligan; SequenceEdit *Player_aMulligan;
QLabel *lbl_Player_aDrawCard; QLabel *lbl_Player_aDrawCard;
@ -343,6 +337,22 @@ public:
SequenceEdit *Player_aUndoDraw; SequenceEdit *Player_aUndoDraw;
QLabel *lbl_Player_aAlwaysRevealTopCard; QLabel *lbl_Player_aAlwaysRevealTopCard;
SequenceEdit *Player_aAlwaysRevealTopCard; SequenceEdit *Player_aAlwaysRevealTopCard;
QGroupBox *groupBox_moveDeck;
QGridLayout *gridLayout_moveDeck;
QLabel *lbl_Player_aMoveTopCardToGraveyard;
SequenceEdit *Player_aMoveTopCardToGraveyard;
QLabel *lbl_Player_aMoveTopCardToExile;
SequenceEdit *Player_aMoveTopCardToExile;
QLabel *lbl_Player_aMoveTopCardsToGraveyard;
SequenceEdit *Player_aMoveTopCardsToGraveyard;
QLabel *lbl_Player_aMoveTopCardsToExile;
SequenceEdit *Player_aMoveTopCardsToExile;
QGroupBox *groupBox_gameLobby;
QGridLayout *gridLayout_gameLobby;
SequenceEdit *DeckViewContainer_loadRemoteButton;
QLabel *lbl_DeckViewContainer_loadRemoteButton;
SequenceEdit *DeckViewContainer_loadLocalButton;
QLabel *lbl_DeckViewContainer_loadLocalButton;
QSpacerItem *verticalSpacer_3; QSpacerItem *verticalSpacer_3;
QWidget *tab_4; QWidget *tab_4;
QLabel *faqLabel; QLabel *faqLabel;
@ -1406,304 +1416,352 @@ public:
tab_3->setObjectName("tab_3"); tab_3->setObjectName("tab_3");
gridLayout_20 = new QGridLayout(tab_3); gridLayout_20 = new QGridLayout(tab_3);
gridLayout_20->setObjectName("gridLayout_20"); gridLayout_20->setObjectName("gridLayout_20");
groupBox_15 = new QGroupBox(tab_3);
groupBox_15->setObjectName("groupBox_15");
gridLayout_15 = new QGridLayout(groupBox_15);
gridLayout_15->setObjectName("gridLayout_15");
lbl_Player_aMoveToBottomLibrary = new QLabel(groupBox_15);
lbl_Player_aMoveToBottomLibrary->setObjectName("lbl_Player_aMoveToBottomLibrary");
gridLayout_15->addWidget(lbl_Player_aMoveToBottomLibrary, 0, 0, 1, 1); groupBox_gameplay = new QGroupBox(tab_3);
groupBox_gameplay->setObjectName("groupBox_gameplay");
Player_aMoveToBottomLibrary = new SequenceEdit("Player/aMoveToBottomLibrary", groupBox_15); gridLayout_gameplay = new QGridLayout(groupBox_gameplay);
Player_aMoveToBottomLibrary->setObjectName("Player_aMoveToBottomLibrary"); gridLayout_gameplay->setObjectName("gridLayout_gameplay");
lbl_Player_aDrawArrow = new QLabel(groupBox_gameplay);
gridLayout_15->addWidget(Player_aMoveToBottomLibrary, 0, 1, 1, 1);
lbl_Player_aMoveToTopLibrary = new QLabel(groupBox_15);
lbl_Player_aMoveToTopLibrary->setObjectName("lbl_Player_aMoveToTopLibrary");
gridLayout_15->addWidget(lbl_Player_aMoveToTopLibrary, 1, 0, 1, 1);
Player_aMoveToTopLibrary = new SequenceEdit("Player/aMoveToTopLibrary", groupBox_15);
Player_aMoveToTopLibrary->setObjectName("Player_aMoveToTopLibrary");
gridLayout_15->addWidget(Player_aMoveToTopLibrary, 1, 1, 1, 1);
lbl_Player_aMoveToGraveyard = new QLabel(groupBox_15);
lbl_Player_aMoveToGraveyard->setObjectName("lbl_Player_aMoveToGraveyard");
gridLayout_15->addWidget(lbl_Player_aMoveToGraveyard, 2, 0, 1, 1);
Player_aMoveToGraveyard = new SequenceEdit("Player/aMoveToGraveyard", groupBox_15);
Player_aMoveToGraveyard->setObjectName("Player_aMoveToGraveyard");
gridLayout_15->addWidget(Player_aMoveToGraveyard, 2, 1, 1, 1);
lbl_Player_aMoveToExile = new QLabel(groupBox_15);
lbl_Player_aMoveToExile->setObjectName("lbl_Player_aMoveToExile");
gridLayout_15->addWidget(lbl_Player_aMoveToExile, 3, 0, 1, 1);
Player_aMoveToExile = new SequenceEdit("Player/aMoveToExile", groupBox_15);
Player_aMoveToExile->setObjectName("Player_aMoveToExile");
gridLayout_15->addWidget(Player_aMoveToExile, 3, 1, 1, 1);
lbl_Player_aMoveToHand = new QLabel(groupBox_15);
lbl_Player_aMoveToHand->setObjectName("lbl_Player_aMoveToHand");
gridLayout_15->addWidget(lbl_Player_aMoveToHand, 4, 0, 1, 1);
Player_aMoveToHand = new SequenceEdit("Player/aMoveToHand", groupBox_15);
Player_aMoveToHand->setObjectName("Player_aMoveToHand");
gridLayout_15->addWidget(Player_aMoveToHand, 4, 1, 1, 1);
lbl_Player_aMoveTopToPlayFaceDown = new QLabel(groupBox_15);
lbl_Player_aMoveTopToPlayFaceDown->setObjectName("lbl_Player_aMoveTopToPlayFaceDown");
gridLayout_15->addWidget(lbl_Player_aMoveTopToPlayFaceDown, 5, 0, 1, 1);
Player_aMoveTopToPlayFaceDown = new SequenceEdit("Player/aMoveTopToPlayFaceDown", groupBox_15);
Player_aMoveTopToPlayFaceDown->setObjectName("Player_aMoveTopToPlayFaceDown");
gridLayout_15->addWidget(Player_aMoveTopToPlayFaceDown, 5, 1, 1, 1);
gridLayout_20->addWidget(groupBox_15, 0, 1, 1, 1);
groupBox_16 = new QGroupBox(tab_3);
groupBox_16->setObjectName("groupBox_16");
gridLayout_16 = new QGridLayout(groupBox_16);
gridLayout_16->setObjectName("gridLayout_16");
lbl_Player_aViewGraveyard = new QLabel(groupBox_16);
lbl_Player_aViewGraveyard->setObjectName("lbl_Player_aViewGraveyard");
gridLayout_16->addWidget(lbl_Player_aViewGraveyard, 0, 0, 1, 1);
Player_aViewGraveyard = new SequenceEdit("Player/aViewGraveyard", groupBox_16);
Player_aViewGraveyard->setObjectName("Player_aViewGraveyard");
gridLayout_16->addWidget(Player_aViewGraveyard, 0, 1, 1, 1);
lbl_Player_aViewLibrary = new QLabel(groupBox_16);
lbl_Player_aViewLibrary->setObjectName("lbl_Player_aViewLibrary");
gridLayout_16->addWidget(lbl_Player_aViewLibrary, 1, 0, 1, 1);
Player_aViewLibrary = new SequenceEdit("Player/aViewLibrary", groupBox_16);
Player_aViewLibrary->setObjectName("Player_aViewLibrary");
gridLayout_16->addWidget(Player_aViewLibrary, 1, 1, 1, 1);
lbl_Player_aViewTopCards = new QLabel(groupBox_16);
lbl_Player_aViewTopCards->setObjectName("lbl_Player_aViewTopCards");
gridLayout_16->addWidget(lbl_Player_aViewTopCards, 2, 0, 1, 1);
Player_aViewTopCards = new SequenceEdit("Player/aViewTopCards", groupBox_16);
Player_aViewTopCards->setObjectName("Player_aViewTopCards");
gridLayout_16->addWidget(Player_aViewTopCards, 2, 1, 1, 1);
lbl_Player_aViewSideboard = new QLabel(groupBox_16);
lbl_Player_aViewSideboard->setObjectName("lbl_Player_aViewSideboard");
gridLayout_16->addWidget(lbl_Player_aViewSideboard, 3, 0, 1, 1);
Player_aViewSideboard = new SequenceEdit("Player/aViewSideboard", groupBox_16);
Player_aViewSideboard->setObjectName("Player_aViewSideboard");
gridLayout_16->addWidget(Player_aViewSideboard, 3, 1, 1, 1);
lbl_Player_aViewRfg = new QLabel(groupBox_16);
lbl_Player_aViewRfg->setObjectName("lbl_Player_aViewRfg");
gridLayout_16->addWidget(lbl_Player_aViewRfg, 4, 0, 1, 1);
Player_aViewRfg = new SequenceEdit("Player/aViewRfg", groupBox_16);
Player_aViewRfg->setObjectName("Player_aViewRfg");
gridLayout_16->addWidget(Player_aViewRfg, 4, 1, 1, 1);
lbl_GameView_aCloseMostRecentZoneView = new QLabel(groupBox_16);
lbl_GameView_aCloseMostRecentZoneView->setObjectName("lbl_GameView_aCloseMostRecentZoneView");
gridLayout_16->addWidget(lbl_GameView_aCloseMostRecentZoneView, 5, 0, 1, 1);
GameView_aCloseMostRecentZoneView = new SequenceEdit("Player/aCloseMostRecentZoneView", groupBox_16);
GameView_aCloseMostRecentZoneView->setObjectName("GameView_aCloseMostRecentZoneView");
gridLayout_16->addWidget(GameView_aCloseMostRecentZoneView, 5, 1, 1, 1);
gridLayout_20->addWidget(groupBox_16, 0, 2, 1, 1);
groupBox_17 = new QGroupBox(tab_3);
groupBox_17->setObjectName("groupBox_17");
gridLayout_18 = new QGridLayout(groupBox_17);
gridLayout_18->setObjectName("gridLayout_18");
DeckViewContainer_loadRemoteButton = new SequenceEdit("DeckViewContainer/loadRemoteButton", groupBox_17);
DeckViewContainer_loadRemoteButton->setObjectName("DeckViewContainer_loadRemoteButton");
gridLayout_18->addWidget(DeckViewContainer_loadRemoteButton, 2, 1, 1, 1);
DeckViewContainer_loadLocalButton = new SequenceEdit("DeckViewContainer/loadLocalButton", groupBox_17);
DeckViewContainer_loadLocalButton->setObjectName("DeckViewContainer_loadLocalButton");
gridLayout_18->addWidget(DeckViewContainer_loadLocalButton, 0, 1, 1, 1);
lbl_DeckViewContainer_loadRemoteButton = new QLabel(groupBox_17);
lbl_DeckViewContainer_loadRemoteButton->setObjectName("lbl_DeckViewContainer_loadRemoteButton");
gridLayout_18->addWidget(lbl_DeckViewContainer_loadRemoteButton, 2, 0, 1, 1);
lbl_DeckViewContainer_loadLocalButton = new QLabel(groupBox_17);
lbl_DeckViewContainer_loadLocalButton->setObjectName("lbl_DeckViewContainer_loadLocalButton");
gridLayout_18->addWidget(lbl_DeckViewContainer_loadLocalButton, 0, 0, 1, 1);
gridLayout_20->addWidget(groupBox_17, 1, 0, 1, 1);
groupBox_18 = new QGroupBox(tab_3);
groupBox_18->setObjectName("groupBox_18");
gridLayout_19 = new QGridLayout(groupBox_18);
gridLayout_19->setObjectName("gridLayout_19");
lbl_Player_aDrawArrow = new QLabel(groupBox_18);
lbl_Player_aDrawArrow->setObjectName("lbl_Player_aDrawArrow"); lbl_Player_aDrawArrow->setObjectName("lbl_Player_aDrawArrow");
gridLayout_19->addWidget(lbl_Player_aDrawArrow, 0, 0, 1, 1); gridLayout_gameplay->addWidget(lbl_Player_aDrawArrow, 0, 0, 1, 1);
Player_aDrawArrow = new SequenceEdit("Player/aDrawArrow", groupBox_18); Player_aDrawArrow = new SequenceEdit("Player/aDrawArrow", groupBox_gameplay);
Player_aDrawArrow->setObjectName("Player_aDrawArrow"); Player_aDrawArrow->setObjectName("Player_aDrawArrow");
gridLayout_19->addWidget(Player_aDrawArrow, 0, 1, 1, 1); gridLayout_gameplay->addWidget(Player_aDrawArrow, 0, 1, 1, 1);
lbl_TabGame_aLeaveGame = new QLabel(groupBox_18); lbl_TabGame_aRemoveLocalArrows = new QLabel(groupBox_gameplay);
lbl_TabGame_aLeaveGame->setObjectName("lbl_TabGame_aLeaveGame");
gridLayout_19->addWidget(lbl_TabGame_aLeaveGame, 0, 2, 1, 1);
TabGame_aLeaveGame = new SequenceEdit("Player/aLeaveGame", groupBox_18);
TabGame_aLeaveGame->setObjectName("TabGame_aLeaveGame");
gridLayout_19->addWidget(TabGame_aLeaveGame, 0, 3, 1, 1);
lbl_TabGame_aRemoveLocalArrows = new QLabel(groupBox_18);
lbl_TabGame_aRemoveLocalArrows->setObjectName("lbl_TabGame_aRemoveLocalArrows"); lbl_TabGame_aRemoveLocalArrows->setObjectName("lbl_TabGame_aRemoveLocalArrows");
gridLayout_19->addWidget(lbl_TabGame_aRemoveLocalArrows, 1, 0, 1, 1); gridLayout_gameplay->addWidget(lbl_TabGame_aRemoveLocalArrows, 1, 0, 1, 1);
TabGame_aRemoveLocalArrows = new SequenceEdit("Player/aRemoveLocalArrows", groupBox_18); TabGame_aRemoveLocalArrows = new SequenceEdit("Player/aRemoveLocalArrows", groupBox_gameplay);
TabGame_aRemoveLocalArrows->setObjectName("TabGame_aRemoveLocalArrows"); TabGame_aRemoveLocalArrows->setObjectName("TabGame_aRemoveLocalArrows");
gridLayout_19->addWidget(TabGame_aRemoveLocalArrows, 1, 1, 1, 1); gridLayout_gameplay->addWidget(TabGame_aRemoveLocalArrows, 1, 1, 1, 1);
lbl_TabGame_aConcede = new QLabel(groupBox_18); lbl_TabGame_aConcede = new QLabel(groupBox_gameplay);
lbl_TabGame_aConcede->setObjectName("lbl_TabGame_aConcede"); lbl_TabGame_aConcede->setObjectName("lbl_TabGame_aConcede");
gridLayout_19->addWidget(lbl_TabGame_aConcede, 1, 2, 1, 1); gridLayout_gameplay->addWidget(lbl_TabGame_aConcede, 2, 0, 1, 1);
TabGame_aConcede = new SequenceEdit("Player/aConcede", groupBox_18); TabGame_aConcede = new SequenceEdit("Player/aConcede", groupBox_gameplay);
TabGame_aConcede->setObjectName("TabGame_aConcede"); TabGame_aConcede->setObjectName("TabGame_aConcede");
gridLayout_19->addWidget(TabGame_aConcede, 1, 3, 1, 1); gridLayout_gameplay->addWidget(TabGame_aConcede, 2, 1, 1, 1);
lbl_Player_aRollDie = new QLabel(groupBox_18); lbl_TabGame_aLeaveGame = new QLabel(groupBox_gameplay);
lbl_TabGame_aLeaveGame->setObjectName("lbl_TabGame_aLeaveGame");
gridLayout_gameplay->addWidget(lbl_TabGame_aLeaveGame, 3, 0, 1, 1);
TabGame_aLeaveGame = new SequenceEdit("Player/aLeaveGame", groupBox_gameplay);
TabGame_aLeaveGame->setObjectName("TabGame_aLeaveGame");
gridLayout_gameplay->addWidget(TabGame_aLeaveGame, 3, 1, 1, 1);
lbl_Player_aRollDie = new QLabel(groupBox_gameplay);
lbl_Player_aRollDie->setObjectName("lbl_Player_aRollDie"); lbl_Player_aRollDie->setObjectName("lbl_Player_aRollDie");
gridLayout_19->addWidget(lbl_Player_aRollDie, 2, 0, 1, 1); gridLayout_gameplay->addWidget(lbl_Player_aRollDie, 4, 0, 1, 1);
Player_aRollDie = new SequenceEdit("Player/aRollDie", groupBox_18); Player_aRollDie = new SequenceEdit("Player/aRollDie", groupBox_gameplay);
Player_aRollDie->setObjectName("Player_aRollDie"); Player_aRollDie->setObjectName("Player_aRollDie");
gridLayout_19->addWidget(Player_aRollDie, 2, 1, 1, 1); gridLayout_gameplay->addWidget(Player_aRollDie, 4, 1, 1, 1);
lbl_TabGame_aRotateViewCW = new QLabel(groupBox_18); lbl_Player_aShuffle = new QLabel(groupBox_gameplay);
lbl_TabGame_aRotateViewCW->setObjectName("lbl_TabGame_aRotateViewCW");
gridLayout_19->addWidget(lbl_TabGame_aRotateViewCW, 2, 2, 1, 1);
TabGame_aRotateViewCW = new SequenceEdit("Player/aRotateViewCW", groupBox_18);
TabGame_aRotateViewCW->setObjectName("TabGame_aRotateViewCW");
gridLayout_19->addWidget(TabGame_aRotateViewCW, 2, 3, 1, 1);
lbl_Player_aShuffle = new QLabel(groupBox_18);
lbl_Player_aShuffle->setObjectName("lbl_Player_aShuffle"); lbl_Player_aShuffle->setObjectName("lbl_Player_aShuffle");
gridLayout_19->addWidget(lbl_Player_aShuffle, 3, 0, 1, 1); gridLayout_gameplay->addWidget(lbl_Player_aShuffle, 5, 0, 1, 1);
Player_aShuffle = new SequenceEdit("Player/aShuffle", groupBox_18); Player_aShuffle = new SequenceEdit("Player/aShuffle", groupBox_gameplay);
Player_aShuffle->setObjectName("Player_aShuffle"); Player_aShuffle->setObjectName("Player_aShuffle");
gridLayout_19->addWidget(Player_aShuffle, 3, 1, 1, 1); gridLayout_gameplay->addWidget(Player_aShuffle, 5, 1, 1, 1);
lbl_TabGame_aRotateViewCCW = new QLabel(groupBox_18); lbl_TabGame_aRotateViewCW = new QLabel(groupBox_gameplay);
lbl_TabGame_aRotateViewCW->setObjectName("lbl_TabGame_aRotateViewCW");
gridLayout_gameplay->addWidget(lbl_TabGame_aRotateViewCW, 6, 0, 1, 1);
TabGame_aRotateViewCW = new SequenceEdit("Player/aRotateViewCW", groupBox_gameplay);
TabGame_aRotateViewCW->setObjectName("TabGame_aRotateViewCW");
gridLayout_gameplay->addWidget(TabGame_aRotateViewCW, 6, 1, 1, 1);
lbl_TabGame_aRotateViewCCW = new QLabel(groupBox_gameplay);
lbl_TabGame_aRotateViewCCW->setObjectName("lbl_TabGame_aRotateViewCCW"); lbl_TabGame_aRotateViewCCW->setObjectName("lbl_TabGame_aRotateViewCCW");
gridLayout_19->addWidget(lbl_TabGame_aRotateViewCCW, 3, 2, 1, 1); gridLayout_gameplay->addWidget(lbl_TabGame_aRotateViewCCW, 7, 0, 1, 1);
TabGame_aRotateViewCCW = new SequenceEdit("Player/aRotateViewCCW", groupBox_18); TabGame_aRotateViewCCW = new SequenceEdit("Player/aRotateViewCCW", groupBox_gameplay);
TabGame_aRotateViewCCW->setObjectName("TabGame_aRotateViewCCW"); TabGame_aRotateViewCCW->setObjectName("TabGame_aRotateViewCCW");
gridLayout_19->addWidget(TabGame_aRotateViewCCW, 3, 3, 1, 1); gridLayout_gameplay->addWidget(TabGame_aRotateViewCCW, 7, 1, 1, 1);
gridLayout_20->addWidget(groupBox_18, 1, 1, 1, 2); gridLayout_20->addWidget(groupBox_gameplay, 0, 0, 1, 1);
groupBox_14 = new QGroupBox(tab_3); groupBox_moveCard = new QGroupBox(tab_3);
groupBox_14->setObjectName("groupBox_14"); groupBox_moveCard->setObjectName("groupBox_moveCard");
gridLayout_14 = new QGridLayout(groupBox_14); gridLayout_moveCard = new QGridLayout(groupBox_moveCard);
gridLayout_14->setObjectName("gridLayout_14"); gridLayout_moveCard->setObjectName("gridLayout_moveCard");
lbl_Player_aMulligan = new QLabel(groupBox_14); lbl_Player_aMoveToBottomLibrary = new QLabel(groupBox_moveCard);
lbl_Player_aMoveToBottomLibrary->setObjectName("lbl_Player_aMoveToBottomLibrary");
gridLayout_moveCard->addWidget(lbl_Player_aMoveToBottomLibrary, 0, 0, 1, 1);
Player_aMoveToBottomLibrary = new SequenceEdit("Player/aMoveToBottomLibrary", groupBox_moveCard);
Player_aMoveToBottomLibrary->setObjectName("Player_aMoveToBottomLibrary");
gridLayout_moveCard->addWidget(Player_aMoveToBottomLibrary, 0, 1, 1, 1);
lbl_Player_aMoveToTopLibrary = new QLabel(groupBox_moveCard);
lbl_Player_aMoveToTopLibrary->setObjectName("lbl_Player_aMoveToTopLibrary");
gridLayout_moveCard->addWidget(lbl_Player_aMoveToTopLibrary, 1, 0, 1, 1);
Player_aMoveToTopLibrary = new SequenceEdit("Player/aMoveToTopLibrary", groupBox_moveCard);
Player_aMoveToTopLibrary->setObjectName("Player_aMoveToTopLibrary");
gridLayout_moveCard->addWidget(Player_aMoveToTopLibrary, 1, 1, 1, 1);
lbl_Player_aMoveToGraveyard = new QLabel(groupBox_moveCard);
lbl_Player_aMoveToGraveyard->setObjectName("lbl_Player_aMoveToGraveyard");
gridLayout_moveCard->addWidget(lbl_Player_aMoveToGraveyard, 2, 0, 1, 1);
Player_aMoveToGraveyard = new SequenceEdit("Player/aMoveToGraveyard", groupBox_moveCard);
Player_aMoveToGraveyard->setObjectName("Player_aMoveToGraveyard");
gridLayout_moveCard->addWidget(Player_aMoveToGraveyard, 2, 1, 1, 1);
lbl_Player_aMoveToExile = new QLabel(groupBox_moveCard);
lbl_Player_aMoveToExile->setObjectName("lbl_Player_aMoveToExile");
gridLayout_moveCard->addWidget(lbl_Player_aMoveToExile, 3, 0, 1, 1);
Player_aMoveToExile = new SequenceEdit("Player/aMoveToExile", groupBox_moveCard);
Player_aMoveToExile->setObjectName("Player_aMoveToExile");
gridLayout_moveCard->addWidget(Player_aMoveToExile, 3, 1, 1, 1);
lbl_Player_aMoveToHand = new QLabel(groupBox_moveCard);
lbl_Player_aMoveToHand->setObjectName("lbl_Player_aMoveToHand");
gridLayout_moveCard->addWidget(lbl_Player_aMoveToHand, 4, 0, 1, 1);
Player_aMoveToHand = new SequenceEdit("Player/aMoveToHand", groupBox_moveCard);
Player_aMoveToHand->setObjectName("Player_aMoveToHand");
gridLayout_moveCard->addWidget(Player_aMoveToHand, 4, 1, 1, 1);
lbl_Player_aMoveTopToPlayFaceDown = new QLabel(groupBox_moveCard);
lbl_Player_aMoveTopToPlayFaceDown->setObjectName("lbl_Player_aMoveTopToPlayFaceDown");
gridLayout_moveCard->addWidget(lbl_Player_aMoveTopToPlayFaceDown, 5, 0, 1, 1);
Player_aMoveTopToPlayFaceDown = new SequenceEdit("Player/aMoveTopToPlayFaceDown", groupBox_moveCard);
Player_aMoveTopToPlayFaceDown->setObjectName("Player_aMoveTopToPlayFaceDown");
gridLayout_moveCard->addWidget(Player_aMoveTopToPlayFaceDown, 5, 1, 1, 1);
gridLayout_20->addWidget(groupBox_moveCard, 0, 1, 1, 1);
groupBox_view = new QGroupBox(tab_3);
groupBox_view->setObjectName("groupBox_view");
gridLayout_view = new QGridLayout(groupBox_view);
gridLayout_view->setObjectName("gridLayout_view");
lbl_Player_aViewGraveyard = new QLabel(groupBox_view);
lbl_Player_aViewGraveyard->setObjectName("lbl_Player_aViewGraveyard");
gridLayout_view->addWidget(lbl_Player_aViewGraveyard, 0, 0, 1, 1);
Player_aViewGraveyard = new SequenceEdit("Player/aViewGraveyard", groupBox_view);
Player_aViewGraveyard->setObjectName("Player_aViewGraveyard");
gridLayout_view->addWidget(Player_aViewGraveyard, 0, 1, 1, 1);
lbl_Player_aViewLibrary = new QLabel(groupBox_view);
lbl_Player_aViewLibrary->setObjectName("lbl_Player_aViewLibrary");
gridLayout_view->addWidget(lbl_Player_aViewLibrary, 1, 0, 1, 1);
Player_aViewLibrary = new SequenceEdit("Player/aViewLibrary", groupBox_view);
Player_aViewLibrary->setObjectName("Player_aViewLibrary");
gridLayout_view->addWidget(Player_aViewLibrary, 1, 1, 1, 1);
lbl_Player_aViewTopCards = new QLabel(groupBox_view);
lbl_Player_aViewTopCards->setObjectName("lbl_Player_aViewTopCards");
gridLayout_view->addWidget(lbl_Player_aViewTopCards, 2, 0, 1, 1);
Player_aViewTopCards = new SequenceEdit("Player/aViewTopCards", groupBox_view);
Player_aViewTopCards->setObjectName("Player_aViewTopCards");
gridLayout_view->addWidget(Player_aViewTopCards, 2, 1, 1, 1);
lbl_Player_aViewSideboard = new QLabel(groupBox_view);
lbl_Player_aViewSideboard->setObjectName("lbl_Player_aViewSideboard");
gridLayout_view->addWidget(lbl_Player_aViewSideboard, 3, 0, 1, 1);
Player_aViewSideboard = new SequenceEdit("Player/aViewSideboard", groupBox_view);
Player_aViewSideboard->setObjectName("Player_aViewSideboard");
gridLayout_view->addWidget(Player_aViewSideboard, 3, 1, 1, 1);
lbl_Player_aViewRfg = new QLabel(groupBox_view);
lbl_Player_aViewRfg->setObjectName("lbl_Player_aViewRfg");
gridLayout_view->addWidget(lbl_Player_aViewRfg, 4, 0, 1, 1);
Player_aViewRfg = new SequenceEdit("Player/aViewRfg", groupBox_view);
Player_aViewRfg->setObjectName("Player_aViewRfg");
gridLayout_view->addWidget(Player_aViewRfg, 4, 1, 1, 1);
lbl_GameView_aCloseMostRecentZoneView = new QLabel(groupBox_view);
lbl_GameView_aCloseMostRecentZoneView->setObjectName("lbl_GameView_aCloseMostRecentZoneView");
gridLayout_view->addWidget(lbl_GameView_aCloseMostRecentZoneView, 5, 0, 1, 1);
GameView_aCloseMostRecentZoneView = new SequenceEdit("Player/aCloseMostRecentZoneView", groupBox_view);
GameView_aCloseMostRecentZoneView->setObjectName("GameView_aCloseMostRecentZoneView");
gridLayout_view->addWidget(GameView_aCloseMostRecentZoneView, 5, 1, 1, 1);
gridLayout_20->addWidget(groupBox_view, 0, 2, 1, 1);
groupBox_draw = new QGroupBox(tab_3);
groupBox_draw->setObjectName("groupBox_draw");
gridLayout_draw = new QGridLayout(groupBox_draw);
gridLayout_draw->setObjectName("gridLayout_draw");
lbl_Player_aMulligan = new QLabel(groupBox_draw);
lbl_Player_aMulligan->setObjectName("lbl_Player_aMulligan"); lbl_Player_aMulligan->setObjectName("lbl_Player_aMulligan");
gridLayout_14->addWidget(lbl_Player_aMulligan, 4, 0, 1, 1); gridLayout_draw->addWidget(lbl_Player_aMulligan, 4, 0, 1, 1);
Player_aMulligan = new SequenceEdit("Player/aMulligan", groupBox_14); Player_aMulligan = new SequenceEdit("Player/aMulligan", groupBox_draw);
Player_aMulligan->setObjectName("Player_aMulligan"); Player_aMulligan->setObjectName("Player_aMulligan");
gridLayout_14->addWidget(Player_aMulligan, 4, 1, 1, 1); gridLayout_draw->addWidget(Player_aMulligan, 4, 1, 1, 1);
lbl_Player_aDrawCard = new QLabel(groupBox_14); lbl_Player_aDrawCard = new QLabel(groupBox_draw);
lbl_Player_aDrawCard->setObjectName("lbl_Player_aDrawCard"); lbl_Player_aDrawCard->setObjectName("lbl_Player_aDrawCard");
gridLayout_14->addWidget(lbl_Player_aDrawCard, 0, 0, 1, 1); gridLayout_draw->addWidget(lbl_Player_aDrawCard, 0, 0, 1, 1);
Player_aDrawCard = new SequenceEdit("Player/aDrawCard", groupBox_14); Player_aDrawCard = new SequenceEdit("Player/aDrawCard", groupBox_draw);
Player_aDrawCard->setObjectName("Player_aDrawCard"); Player_aDrawCard->setObjectName("Player_aDrawCard");
gridLayout_14->addWidget(Player_aDrawCard, 0, 1, 1, 1); gridLayout_draw->addWidget(Player_aDrawCard, 0, 1, 1, 1);
lbl_Player_aDrawCards = new QLabel(groupBox_14); lbl_Player_aDrawCards = new QLabel(groupBox_draw);
lbl_Player_aDrawCards->setObjectName("lbl_Player_aDrawCards"); lbl_Player_aDrawCards->setObjectName("lbl_Player_aDrawCards");
gridLayout_14->addWidget(lbl_Player_aDrawCards, 1, 0, 1, 1); gridLayout_draw->addWidget(lbl_Player_aDrawCards, 1, 0, 1, 1);
Player_aDrawCards = new SequenceEdit("Player/aDrawCards", groupBox_14); Player_aDrawCards = new SequenceEdit("Player/aDrawCards", groupBox_draw);
Player_aDrawCards->setObjectName("Player_aDrawCards"); Player_aDrawCards->setObjectName("Player_aDrawCards");
gridLayout_14->addWidget(Player_aDrawCards, 1, 1, 1, 1); gridLayout_draw->addWidget(Player_aDrawCards, 1, 1, 1, 1);
lbl_Player_aUndoDraw = new QLabel(groupBox_14); lbl_Player_aUndoDraw = new QLabel(groupBox_draw);
lbl_Player_aUndoDraw->setObjectName("lbl_Player_aUndoDraw"); lbl_Player_aUndoDraw->setObjectName("lbl_Player_aUndoDraw");
gridLayout_14->addWidget(lbl_Player_aUndoDraw, 2, 0, 1, 1); gridLayout_draw->addWidget(lbl_Player_aUndoDraw, 2, 0, 1, 1);
Player_aUndoDraw = new SequenceEdit("Player/aUndoDraw", groupBox_14); Player_aUndoDraw = new SequenceEdit("Player/aUndoDraw", groupBox_draw);
Player_aUndoDraw->setObjectName("Player_aUndoDraw"); Player_aUndoDraw->setObjectName("Player_aUndoDraw");
gridLayout_14->addWidget(Player_aUndoDraw, 2, 1, 1, 1); gridLayout_draw->addWidget(Player_aUndoDraw, 2, 1, 1, 1);
lbl_Player_aAlwaysRevealTopCard = new QLabel(groupBox_14); lbl_Player_aAlwaysRevealTopCard = new QLabel(groupBox_draw);
lbl_Player_aAlwaysRevealTopCard->setObjectName("lbl_Player_aAlwaysRevealTopCard"); lbl_Player_aAlwaysRevealTopCard->setObjectName("lbl_Player_aAlwaysRevealTopCard");
gridLayout_14->addWidget(lbl_Player_aAlwaysRevealTopCard, 3, 0, 1, 1); gridLayout_draw->addWidget(lbl_Player_aAlwaysRevealTopCard, 3, 0, 1, 1);
Player_aAlwaysRevealTopCard = new SequenceEdit("Player/aAlwaysRevealTopCard", groupBox_14); Player_aAlwaysRevealTopCard = new SequenceEdit("Player/aAlwaysRevealTopCard", groupBox_draw);
Player_aAlwaysRevealTopCard->setObjectName("Player_aAlwaysRevealTopCard"); Player_aAlwaysRevealTopCard->setObjectName("Player_aAlwaysRevealTopCard");
gridLayout_14->addWidget(Player_aAlwaysRevealTopCard, 3, 1, 1, 1); gridLayout_draw->addWidget(Player_aAlwaysRevealTopCard, 3, 1, 1, 1);
gridLayout_20->addWidget(groupBox_14, 0, 0, 1, 1); gridLayout_20->addWidget(groupBox_draw, 1, 0, 1, 1);
groupBox_moveDeck = new QGroupBox(tab_3);
groupBox_moveDeck->setObjectName("groupBox_moveDeck");
gridLayout_moveDeck = new QGridLayout(groupBox_moveDeck);
gridLayout_moveDeck->setObjectName("gridLayout_moveDeck");
lbl_Player_aMoveTopCardToGraveyard = new QLabel(groupBox_moveDeck);
lbl_Player_aMoveTopCardToGraveyard->setObjectName("lbl_Player_aMoveTopCardToGraveyard");
gridLayout_moveDeck->addWidget(lbl_Player_aMoveTopCardToGraveyard, 0, 0, 1, 1);
Player_aMoveTopCardToGraveyard = new SequenceEdit("Player/aMoveTopCardToGraveyard", groupBox_moveDeck);
Player_aMoveTopCardToGraveyard->setObjectName("Player_aMoveTopCardToGraveyard");
gridLayout_moveDeck->addWidget(Player_aMoveTopCardToGraveyard, 0, 1, 1, 1);
lbl_Player_aMoveTopCardsToGraveyard = new QLabel(groupBox_moveDeck);
lbl_Player_aMoveTopCardsToGraveyard->setObjectName("lbl_Player_aMoveTopCardsToGraveyard");
gridLayout_moveDeck->addWidget(lbl_Player_aMoveTopCardsToGraveyard, 1, 0, 1, 1);
Player_aMoveTopCardsToGraveyard = new SequenceEdit("Player/aMoveTopCardsToGraveyard", groupBox_moveDeck);
Player_aMoveTopCardsToGraveyard->setObjectName("Player_aMoveTopCardsToGraveyard");
gridLayout_moveDeck->addWidget(Player_aMoveTopCardsToGraveyard, 1, 1, 1, 1);
lbl_Player_aMoveTopCardToExile = new QLabel(groupBox_moveDeck);
lbl_Player_aMoveTopCardToExile->setObjectName("lbl_Player_aMoveTopCardToExile");
gridLayout_moveDeck->addWidget(lbl_Player_aMoveTopCardToExile, 2, 0, 1, 1);
Player_aMoveTopCardToExile = new SequenceEdit("Player/aMoveTopCardToExile", groupBox_moveDeck);
Player_aMoveTopCardToExile->setObjectName("Player_aMoveTopCardToExile");
gridLayout_moveDeck->addWidget(Player_aMoveTopCardToExile, 2, 1, 1, 1);
lbl_Player_aMoveTopCardsToExile = new QLabel(groupBox_moveDeck);
lbl_Player_aMoveTopCardsToExile->setObjectName("lbl_Player_aMoveTopCardsToExile");
gridLayout_moveDeck->addWidget(lbl_Player_aMoveTopCardsToExile, 3, 0, 1, 1);
Player_aMoveTopCardsToExile = new SequenceEdit("Player/aMoveTopCardsToExile", groupBox_moveDeck);
Player_aMoveTopCardsToExile->setObjectName("Player_aMoveTopCardsToExile");
gridLayout_moveDeck->addWidget(Player_aMoveTopCardsToExile, 3, 1, 1, 1);
gridLayout_20->addWidget(groupBox_moveDeck, 1, 1, 1, 1);
groupBox_gameLobby = new QGroupBox(tab_3);
groupBox_gameLobby->setObjectName("groupBox_gameLobby");
gridLayout_gameLobby = new QGridLayout(groupBox_gameLobby);
gridLayout_gameLobby->setObjectName("gridLayout_gameLobby");
DeckViewContainer_loadRemoteButton = new SequenceEdit("DeckViewContainer/loadRemoteButton", groupBox_gameLobby);
DeckViewContainer_loadRemoteButton->setObjectName("DeckViewContainer_loadRemoteButton");
gridLayout_gameLobby->addWidget(DeckViewContainer_loadRemoteButton, 2, 1, 1, 1);
DeckViewContainer_loadLocalButton = new SequenceEdit("DeckViewContainer/loadLocalButton", groupBox_gameLobby);
DeckViewContainer_loadLocalButton->setObjectName("DeckViewContainer_loadLocalButton");
gridLayout_gameLobby->addWidget(DeckViewContainer_loadLocalButton, 0, 1, 1, 1);
lbl_DeckViewContainer_loadRemoteButton = new QLabel(groupBox_gameLobby);
lbl_DeckViewContainer_loadRemoteButton->setObjectName("lbl_DeckViewContainer_loadRemoteButton");
gridLayout_gameLobby->addWidget(lbl_DeckViewContainer_loadRemoteButton, 2, 0, 1, 1);
lbl_DeckViewContainer_loadLocalButton = new QLabel(groupBox_gameLobby);
lbl_DeckViewContainer_loadLocalButton->setObjectName("lbl_DeckViewContainer_loadLocalButton");
gridLayout_gameLobby->addWidget(lbl_DeckViewContainer_loadLocalButton, 0, 0, 1, 1);
gridLayout_20->addWidget(groupBox_gameLobby, 1, 2, 1, 1);
verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
gridLayout_20->addItem(verticalSpacer_3, 2, 1, 1, 1); gridLayout_20->addItem(verticalSpacer_3, 2, 1, 1, 1);
tabWidget->addTab(tab_3, QString()); tabWidget->addTab(tab_3, QString());
@ -1747,12 +1805,13 @@ public:
gridLayout_11->setSpacing(3); gridLayout_11->setSpacing(3);
gridLayout_12->setSpacing(3); gridLayout_12->setSpacing(3);
gridLayout_13->setSpacing(3); gridLayout_13->setSpacing(3);
gridLayout_14->setSpacing(3); gridLayout_moveDeck->setSpacing(3);
gridLayout_15->setSpacing(3); gridLayout_draw->setSpacing(3);
gridLayout_16->setSpacing(3); gridLayout_moveCard->setSpacing(3);
gridLayout_view->setSpacing(3);
gridLayout_gameLobby->setSpacing(3);
gridLayout_gameplay->setSpacing(3);
gridLayout_17->setSpacing(3); gridLayout_17->setSpacing(3);
gridLayout_18->setSpacing(3);
gridLayout_19->setSpacing(3);
gridLayout_20->setSpacing(3); gridLayout_20->setSpacing(3);
verticalLayout->setSpacing(3); verticalLayout->setSpacing(3);
@ -1893,24 +1952,29 @@ public:
lbl_Player_aSetAnnotation->setText(QApplication::translate("shortcutsTab", "Set annotation", 0)); lbl_Player_aSetAnnotation->setText(QApplication::translate("shortcutsTab", "Set annotation", 0));
tabWidget->setTabText(tabWidget->indexOf(tab_2), tabWidget->setTabText(tabWidget->indexOf(tab_2),
QApplication::translate("shortcutsTab", "Phases | P/T | Playing Area", 0)); QApplication::translate("shortcutsTab", "Phases | P/T | Playing Area", 0));
groupBox_15->setTitle(QApplication::translate("shortcutsTab", "Move card to", 0)); groupBox_moveCard->setTitle(QApplication::translate("shortcutsTab", "Move selected card to", 0));
lbl_Player_aMoveToBottomLibrary->setText(QApplication::translate("shortcutsTab", "Bottom library", 0)); lbl_Player_aMoveToBottomLibrary->setText(QApplication::translate("shortcutsTab", "Bottom library", 0));
lbl_Player_aMoveToTopLibrary->setText(QApplication::translate("shortcutsTab", "Top library", 0)); lbl_Player_aMoveToTopLibrary->setText(QApplication::translate("shortcutsTab", "Top library", 0));
lbl_Player_aMoveToGraveyard->setText(QApplication::translate("shortcutsTab", "Graveyard", 0)); lbl_Player_aMoveToGraveyard->setText(QApplication::translate("shortcutsTab", "Graveyard", 0));
lbl_Player_aMoveToExile->setText(QApplication::translate("shortcutsTab", "Exile", 0)); lbl_Player_aMoveToExile->setText(QApplication::translate("shortcutsTab", "Exile", 0));
lbl_Player_aMoveToHand->setText(QApplication::translate("shortcutsTab", "Hand", 0)); lbl_Player_aMoveToHand->setText(QApplication::translate("shortcutsTab", "Hand", 0));
lbl_Player_aMoveTopToPlayFaceDown->setText(QApplication::translate("shortcutsTab", "Play face down")); lbl_Player_aMoveTopToPlayFaceDown->setText(QApplication::translate("shortcutsTab", "Play face down"));
groupBox_16->setTitle(QApplication::translate("shortcutsTab", "View", 0)); groupBox_view->setTitle(QApplication::translate("shortcutsTab", "View", 0));
lbl_Player_aViewGraveyard->setText(QApplication::translate("shortcutsTab", "Graveyard", 0)); lbl_Player_aViewGraveyard->setText(QApplication::translate("shortcutsTab", "Graveyard", 0));
lbl_Player_aViewLibrary->setText(QApplication::translate("shortcutsTab", "Library", 0)); lbl_Player_aViewLibrary->setText(QApplication::translate("shortcutsTab", "Library", 0));
lbl_Player_aViewTopCards->setText(QApplication::translate("shortcutsTab", "Tops card of library", 0)); lbl_Player_aViewTopCards->setText(QApplication::translate("shortcutsTab", "Top cards of library", 0));
lbl_Player_aViewSideboard->setText(QApplication::translate("shortcutsTab", "Sideboard", 0)); lbl_Player_aViewSideboard->setText(QApplication::translate("shortcutsTab", "Sideboard", 0));
lbl_Player_aViewRfg->setText(QApplication::translate("shortcutsTab", "Exile", 0)); lbl_Player_aViewRfg->setText(QApplication::translate("shortcutsTab", "Exile", 0));
lbl_GameView_aCloseMostRecentZoneView->setText(QApplication::translate("shortcutsTab", "Close recent view", 0)); lbl_GameView_aCloseMostRecentZoneView->setText(QApplication::translate("shortcutsTab", "Close recent view", 0));
groupBox_17->setTitle(QApplication::translate("shortcutsTab", "Game Lobby", 0)); groupBox_moveDeck->setTitle(QApplication::translate("shortcutsTab", "Move top card to", 0));
lbl_Player_aMoveTopCardToGraveyard->setText(QApplication::translate("shortcutsTab", "Graveyard Once", 0));
lbl_Player_aMoveTopCardsToGraveyard->setText(QApplication::translate("shortcutsTab", "Graveyard Multiple", 0));
lbl_Player_aMoveTopCardToExile->setText(QApplication::translate("shortcutsTab", "Exile Once", 0));
lbl_Player_aMoveTopCardsToExile->setText(QApplication::translate("shortcutsTab", "Exile Multiple", 0));
groupBox_gameLobby->setTitle(QApplication::translate("shortcutsTab", "Game Lobby", 0));
lbl_DeckViewContainer_loadRemoteButton->setText(QApplication::translate("shortcutsTab", "Load remote deck", 0)); lbl_DeckViewContainer_loadRemoteButton->setText(QApplication::translate("shortcutsTab", "Load remote deck", 0));
lbl_DeckViewContainer_loadLocalButton->setText(QApplication::translate("shortcutsTab", "Load local deck", 0)); lbl_DeckViewContainer_loadLocalButton->setText(QApplication::translate("shortcutsTab", "Load local deck", 0));
groupBox_18->setTitle(QApplication::translate("shortcutsTab", "Gameplay", 0)); groupBox_gameplay->setTitle(QApplication::translate("shortcutsTab", "Gameplay", 0));
lbl_Player_aDrawArrow->setText(QApplication::translate("shortcutsTab", "Draw arrow", 0)); lbl_Player_aDrawArrow->setText(QApplication::translate("shortcutsTab", "Draw arrow", 0));
lbl_TabGame_aLeaveGame->setText(QApplication::translate("shortcutsTab", "Leave game", 0)); lbl_TabGame_aLeaveGame->setText(QApplication::translate("shortcutsTab", "Leave game", 0));
lbl_TabGame_aRemoveLocalArrows->setText(QApplication::translate("shortcutsTab", "Remove local arrows", 0)); lbl_TabGame_aRemoveLocalArrows->setText(QApplication::translate("shortcutsTab", "Remove local arrows", 0));
@ -1919,14 +1983,14 @@ public:
lbl_TabGame_aRotateViewCW->setText(QApplication::translate("shortcutsTab", "Rotate view CW", 0)); lbl_TabGame_aRotateViewCW->setText(QApplication::translate("shortcutsTab", "Rotate view CW", 0));
lbl_Player_aShuffle->setText(QApplication::translate("shortcutsTab", "Shuffle library", 0)); lbl_Player_aShuffle->setText(QApplication::translate("shortcutsTab", "Shuffle library", 0));
lbl_TabGame_aRotateViewCCW->setText(QApplication::translate("shortcutsTab", "Rotate view CCW", 0)); lbl_TabGame_aRotateViewCCW->setText(QApplication::translate("shortcutsTab", "Rotate view CCW", 0));
groupBox_14->setTitle(QApplication::translate("shortcutsTab", "Draw", 0)); groupBox_draw->setTitle(QApplication::translate("shortcutsTab", "Draw", 0));
lbl_Player_aMulligan->setText(QApplication::translate("shortcutsTab", "Mulligan", 0)); lbl_Player_aMulligan->setText(QApplication::translate("shortcutsTab", "Mulligan", 0));
lbl_Player_aDrawCard->setText(QApplication::translate("shortcutsTab", "Draw card", 0)); lbl_Player_aDrawCard->setText(QApplication::translate("shortcutsTab", "Draw card", 0));
lbl_Player_aDrawCards->setText(QApplication::translate("shortcutsTab", "Draw cards", 0)); lbl_Player_aDrawCards->setText(QApplication::translate("shortcutsTab", "Draw cards", 0));
lbl_Player_aUndoDraw->setText(QApplication::translate("shortcutsTab", "Undo draw", 0)); lbl_Player_aUndoDraw->setText(QApplication::translate("shortcutsTab", "Undo draw", 0));
lbl_Player_aAlwaysRevealTopCard->setText(QApplication::translate("shortcutsTab", "Always reveal top card", 0)); lbl_Player_aAlwaysRevealTopCard->setText(QApplication::translate("shortcutsTab", "Always reveal top card", 0));
tabWidget->setTabText(tabWidget->indexOf(tab_3), tabWidget->setTabText(tabWidget->indexOf(tab_3),
QApplication::translate("shortcutsTab", "Draw | Move | View | Gameplay", 0)); QApplication::translate("shortcutsTab", "Gameplay | Draw | Move | View", 0));
tabWidget->setTabText(tabWidget->indexOf(tab_4), QApplication::translate("shortcutsTab", "Counters", 0)); tabWidget->setTabText(tabWidget->indexOf(tab_4), QApplication::translate("shortcutsTab", "Counters", 0));
faqLabel->setText(QString("<a href='%1'>%2</a>") faqLabel->setText(QString("<a href='%1'>%2</a>")
.arg(WIKI) .arg(WIKI)

278
cockatrice/src/shortcutssettings.cpp
View file

@ -4,19 +4,18 @@
#include <QStringList> #include <QStringList>
#include <utility> #include <utility>
ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QObject(parent) ShortcutsSettings::ShortcutsSettings(const QString &settingsPath, QObject *parent) : QObject(parent)
{ {
this->settingsFilePath = std::move(settingsPath); shortCuts = defaultShortCuts;
this->settingsFilePath.append("shortcuts.ini"); settingsFilePath = settingsPath;
fillDefaultShorcuts(); settingsFilePath.append("shortcuts.ini");
shortCuts = QMap<QString, QList<QKeySequence>>(defaultShortCuts);
bool exists = QFile(settingsFilePath).exists(); bool exists = QFile(settingsFilePath).exists();
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat); QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
if (exists) { if (exists) {
shortCutsFile.beginGroup("Custom"); shortCutsFile.beginGroup(custom);
const QStringList customKeys = shortCutsFile.allKeys(); const QStringList customKeys = shortCutsFile.allKeys();
QMap<QString, QString> invalidItems; 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)) { if (shortCuts.contains(name)) {
return shortCuts.value(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) { for (int i = 0; i < Sequence.size(); ++i) {
stringSequence.append(Sequence.at(i).toString(QKeySequence::PortableText)); 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; QList<QKeySequence> SequenceList;
for (QStringList::const_iterator ss = Sequences.constBegin(); ss != Sequences.constEnd(); ++ss) { for (const QString &shortcut : stringSequence.split(sep)) {
SequenceList.append(QKeySequence(*ss, QKeySequence::PortableText)); SequenceList.append(QKeySequence(shortcut, QKeySequence::PortableText));
} }
return SequenceList; return SequenceList;
} }
void ShortcutsSettings::setShortcuts(QString name, QList<QKeySequence> Sequence) void ShortcutsSettings::setShortcuts(const QString &name, const QList<QKeySequence> &Sequence)
{ {
shortCuts[name] = Sequence; shortCuts[name] = Sequence;
QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat); QSettings shortCutsFile(settingsFilePath, QSettings::IniFormat);
shortCutsFile.beginGroup("Custom"); shortCutsFile.beginGroup(custom);
QString stringSequence = stringifySequence(Sequence); shortCutsFile.setValue(name, stringifySequence(Sequence));
shortCutsFile.setValue(name, stringSequence);
shortCutsFile.endGroup(); 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 the shortcut is not to be used in deck-editor then it doesn't matter
if (name.startsWith("Player")) { if (name.startsWith("Player")) {
return true; return true;
} }
QString checkSequence = Sequences.split(";").last(); QString checkSequence = Sequences.split(sep).last();
QStringList forbiddenKeys = (QStringList() << "Del" QStringList forbiddenKeys{"Del", "Backspace", "Down", "Up", "Left", "Right",
<< "Backspace" "Return", "Enter", "Menu", "Ctrl+Alt+-", "Ctrl+Alt+=", "Ctrl+Alt+[",
<< "Down" "Ctrl+Alt+]", "Tab", "Space", "Shift+S", "Shift+Left", "Shift+Right"};
<< "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); 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("/")); QString checkKey = name.left(name.indexOf("/"));
QList<QString> allKeys = shortCuts.keys(); QList<QString> allKeys = shortCuts.keys();
for (const auto &key : allKeys) { for (const auto &key : allKeys) {
if (key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow")) { if (key.startsWith(checkKey) || key.startsWith("MainWindow") || checkKey.startsWith("MainWindow")) {
QString storedSequence = stringifySequence(shortCuts.value(key)); QString storedSequence = stringifySequence(shortCuts.value(key));
QStringList stringSequences = storedSequence.split(";"); QStringList stringSequences = storedSequence.split(sep);
if (stringSequences.contains(checkSequence)) { if (stringSequences.contains(checkSequence)) {
return false; return false;
} }
@ -170,161 +178,3 @@ bool ShortcutsSettings::isValid(QString name, QString Sequences)
} }
return true; 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");
}

184
cockatrice/src/shortcutssettings.h
View file

@ -1,8 +1,8 @@
#ifndef SHORTCUTSSETTINGS_H #ifndef SHORTCUTSSETTINGS_H
#define SHORTCUTSSETTINGS_H #define SHORTCUTSSETTINGS_H
#include <QHash>
#include <QKeySequence> #include <QKeySequence>
#include <QMap>
#include <QObject> #include <QObject>
#include <QSettings> #include <QSettings>
@ -10,37 +10,185 @@ class ShortcutsSettings : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
ShortcutsSettings(QString settingsFilePath, QObject *parent = nullptr); ShortcutsSettings(const QString &settingsFilePath, QObject *parent = nullptr);
QList<QKeySequence> getShortcut(QString name); QList<QKeySequence> getDefaultShortcut(const QString &name) const;
QKeySequence getSingleShortcut(QString name); QList<QKeySequence> getShortcut(const QString &name) const;
QKeySequence getSingleShortcut(const QString &name) const;
QString getDefaultShortcutString(const QString &name) const;
QString getShortcutString(const QString &name) const;
QString getDefaultShortcutString(QString name); void setShortcuts(const QString &name, const QList<QKeySequence> &Sequence);
QString getShortcutString(QString name); void setShortcuts(const QString &name, const QKeySequence &Sequence);
void setShortcuts(const QString &name, const QString &Sequences);
void setShortcuts(QString name, QList<QKeySequence> Sequence); bool isKeyAllowed(const QString &name, const QString &Sequences) const;
void setShortcuts(QString name, QKeySequence Sequence); bool isValid(const QString &name, const QString &Sequences) const;
void setShortcuts(QString name, QString Sequences);
bool isKeyAllowed(QString name, QString Sequences);
bool isValid(QString name, QString Sequences);
void resetAllShortcuts(); void resetAllShortcuts();
void clearAllShortcuts(); void clearAllShortcuts();
signals: signals:
void shortCutchanged(); void shortCutChanged();
void allShortCutsReset(); void allShortCutsReset();
void allShortCutsClear(); void allShortCutsClear();
private: private:
const QChar sep = ';';
const QString custom = "Custom";
QString settingsFilePath; QString settingsFilePath;
QMap<QString, QList<QKeySequence>> shortCuts; QHash<QString, QList<QKeySequence>> shortCuts;
QMap<QString, QList<QKeySequence>> defaultShortCuts;
void fillDefaultShorcuts();
QString stringifySequence(QList<QKeySequence> Sequence) const; QString stringifySequence(const QList<QKeySequence> &Sequence) const;
QList<QKeySequence> parseSequenceString(QString stringSequence); QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
const QHash<QString, QList<QKeySequence>> defaultShortCuts{
{"MainWindow/aCheckCardUpdates", parseSequenceString("")},
{"MainWindow/aConnect", parseSequenceString("Ctrl+L")},
{"MainWindow/aDeckEditor", parseSequenceString("")},
{"MainWindow/aDisconnect", parseSequenceString("")},
{"MainWindow/aExit", parseSequenceString("")},
{"MainWindow/aFullScreen", parseSequenceString("Ctrl+F")},
{"MainWindow/aRegister", parseSequenceString("")},
{"MainWindow/aSettings", parseSequenceString("")},
{"MainWindow/aSinglePlayer", parseSequenceString("")},
{"MainWindow/aWatchReplay", parseSequenceString("")},
{"TabDeckEditor/aAnalyzeDeck", parseSequenceString("")},
{"TabDeckEditor/aClearFilterAll", parseSequenceString("")},
{"TabDeckEditor/aClearFilterOne", parseSequenceString("")},
{"TabDeckEditor/aClose", parseSequenceString("")},
{"TabDeckEditor/aDecrement", parseSequenceString("-")},
{"TabDeckEditor/aManageSets", parseSequenceString("")},
{"TabDeckEditor/aEditTokens", parseSequenceString("")},
{"TabDeckEditor/aExportDeckDecklist", parseSequenceString("")},
{"TabDeckEditor/aIncrement", parseSequenceString("+")},
{"TabDeckEditor/aLoadDeck", parseSequenceString("Ctrl+O")},
{"TabDeckEditor/aLoadDeckFromClipboard", parseSequenceString("Ctrl+Shift+V")},
{"TabDeckEditor/aNewDeck", parseSequenceString("Ctrl+N")},
{"TabDeckEditor/aOpenCustomFolder", parseSequenceString("")},
{"TabDeckEditor/aPrintDeck", parseSequenceString("Ctrl+P")},
{"TabDeckEditor/aRemoveCard", parseSequenceString("")},
{"TabDeckEditor/aResetLayout", parseSequenceString("")},
{"TabDeckEditor/aSaveDeck", parseSequenceString("Ctrl+S")},
{"TabDeckEditor/aSaveDeckAs", parseSequenceString("")},
{"TabDeckEditor/aSaveDeckToClipboard", parseSequenceString("Ctrl+Shift+C")},
{"TabDeckEditor/aSaveDeckToClipboardRaw", parseSequenceString("Ctrl+Shift+R")},
{"DeckViewContainer/loadLocalButton", parseSequenceString("Ctrl+O")},
{"DeckViewContainer/loadRemoteButton", parseSequenceString("Ctrl+Alt+O")},
{"Player/aSet", parseSequenceString("Ctrl+L")},
{"Player/aAlwaysRevealTopCard", parseSequenceString("Ctrl+N")},
{"Player/aCloseMostRecentZoneView", parseSequenceString("Esc")},
{"Player/aDrawCard", parseSequenceString("Ctrl+D")},
{"Player/aDrawCards", parseSequenceString("Ctrl+E")},
{"Player/aDec", parseSequenceString("F11")},
{"Player/aInc", parseSequenceString("F12")},
{"Player/aMoveTopCardToGraveyard", parseSequenceString("")},
{"Player/aMoveTopCardsToGraveyard", parseSequenceString("Ctrl+Shift+M")},
{"Player/aMoveTopCardToExile", parseSequenceString("")},
{"Player/aMoveTopCardsToExile", parseSequenceString("")},
{"Player/aMoveTopToPlayFaceDown", parseSequenceString("Ctrl+Shift+E")},
{"Player/aMulligan", parseSequenceString("Ctrl+M")},
{"Player/aPeek", parseSequenceString("")},
{"Player/aPlay", parseSequenceString("")},
{"Player/aResetLayout", parseSequenceString("")},
{"Player/aRollDie", parseSequenceString("Ctrl+I")},
{"Player/aShuffle", parseSequenceString("Ctrl+S")},
{"Player/aUndoDraw", parseSequenceString("Ctrl+Shift+D")},
{"Player/aUntapAll", parseSequenceString("Ctrl+U")},
{"Player/aViewGraveyard", parseSequenceString("F4")},
{"Player/aViewLibrary", parseSequenceString("F3")},
{"Player/aViewRfg", parseSequenceString("")},
{"Player/aViewSideboard", parseSequenceString("Ctrl+F3")},
{"Player/aViewTopCards", parseSequenceString("Ctrl+W")},
{"Player/aAttach", parseSequenceString("Ctrl+Alt+A")},
{"Player/aClone", parseSequenceString("Ctrl+J")},
{"Player/aCreateAnotherToken", parseSequenceString("Ctrl+G")},
{"Player/aCreateToken", parseSequenceString("Ctrl+T")},
{"Player/aCreateRelatedTokens", parseSequenceString("Ctrl+Shift+T")},
{"Player/aDoesntUntap", parseSequenceString("")},
{"Player/aDrawArrow", parseSequenceString("")},
{"Player/aFlip", parseSequenceString("")},
{"Player/aMoveToBottomLibrary", parseSequenceString("")},
{"Player/aMoveToExile", parseSequenceString("")},
{"Player/aMoveToGraveyard", parseSequenceString("Ctrl+Del")},
{"Player/aMoveToHand", parseSequenceString("")},
{"Player/aMoveToTopLibrary", parseSequenceString("")},
{"Player/aSetAnnotation", parseSequenceString("")},
{"Player/aTap", parseSequenceString("")},
{"Player/aUnattach", parseSequenceString("")},
{"Player/aCCGreen", parseSequenceString("")},
{"Player/aCCRed", parseSequenceString("")},
{"Player/aCCYellow", parseSequenceString("")},
{"Player/aRCGreen", parseSequenceString("")},
{"Player/aRCRed", parseSequenceString("")},
{"Player/aRCYellow", parseSequenceString("")},
{"Player/aSCGreen", parseSequenceString("")},
{"Player/aSCRed", parseSequenceString("")},
{"Player/aSCYellow", parseSequenceString("")},
{"Player/aDecP", parseSequenceString("Ctrl+-")},
{"Player/aDecPT", parseSequenceString("Ctrl+Alt+-")},
{"Player/aDecT", parseSequenceString("Alt+-")},
{"Player/aIncP", parseSequenceString("Ctrl++")},
{"Player/aIncPT", parseSequenceString("Ctrl+Alt++")},
{"Player/aIncT", parseSequenceString("Alt++")},
{"Player/aSetPT", parseSequenceString("Ctrl+P")},
{"Player/aResetPT", parseSequenceString("Ctrl+Alt+0")},
{"Player/aConcede", parseSequenceString("F2")},
{"Player/aLeaveGame", parseSequenceString("Ctrl+Q")},
{"Player/aNextPhase", parseSequenceString("Ctrl+Space;Tab")},
{"Player/aNextTurn", parseSequenceString("Ctrl+Return;Ctrl+Enter")},
{"Player/aRemoveLocalArrows", parseSequenceString("Ctrl+R")},
{"Player/aRotateViewCCW", parseSequenceString("")},
{"Player/aRotateViewCW", parseSequenceString("")},
{"Player/phase0", parseSequenceString("F5")},
{"Player/phase1", parseSequenceString("")},
{"Player/phase10", parseSequenceString("F10")},
{"Player/phase2", parseSequenceString("F6")},
{"Player/phase3", parseSequenceString("F7")},
{"Player/phase4", parseSequenceString("F8")},
{"Player/phase5", parseSequenceString("")},
{"Player/phase6", parseSequenceString("")},
{"Player/phase7", parseSequenceString("")},
{"Player/phase8", parseSequenceString("")},
{"Player/phase9", parseSequenceString("F9")},
{"Player/aDecCounter_w", parseSequenceString("")},
{"Player/aIncCounter_w", parseSequenceString("")},
{"Player/aSetCounter_w", parseSequenceString("")},
{"Player/aDecCounter_u", parseSequenceString("")},
{"Player/aIncCounter_u", parseSequenceString("")},
{"Player/aSetCounter_u", parseSequenceString("")},
{"Player/aDecCounter_b", parseSequenceString("")},
{"Player/aIncCounter_b", parseSequenceString("")},
{"Player/aSetCounter_b", parseSequenceString("")},
{"Player/aDecCounter_r", parseSequenceString("")},
{"Player/aIncCounter_r", parseSequenceString("")},
{"Player/aSetCounter_r", parseSequenceString("")},
{"Player/aDecCounter_g", parseSequenceString("")},
{"Player/aIncCounter_g", parseSequenceString("")},
{"Player/aSetCounter_g", parseSequenceString("")},
{"Player/aDecCounter_x", parseSequenceString("")},
{"Player/aIncCounter_x", parseSequenceString("")},
{"Player/aSetCounter_x", parseSequenceString("")},
{"Player/aDecCounter_storm", parseSequenceString("")},
{"Player/aIncCounter_storm", parseSequenceString("")},
{"Player/aSetCounter_storm", parseSequenceString("")},
{"tab_room/aClearChat", parseSequenceString("F12")},
{"DlgLoadDeckFromClipboard/refreshButton", parseSequenceString("F5")}};
}; };
#endif // SHORTCUTSSETTINGS_H #endif // SHORTCUTSSETTINGS_H

2
cockatrice/src/tab_deck_editor.cpp
View file

@ -590,7 +590,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
this->installEventFilter(this); this->installEventFilter(this);
retranslateUi(); retranslateUi();
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
QTimer::singleShot(0, this, SLOT(loadLayout())); QTimer::singleShot(0, this, SLOT(loadLayout()));

6
cockatrice/src/tab_game.cpp
View file

@ -130,7 +130,7 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
setLayout(deckViewLayout); setLayout(deckViewLayout);
retranslateUi(); retranslateUi();
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
} }
@ -375,7 +375,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
createReplayMenuItems(); createReplayMenuItems();
createViewMenuItems(); createViewMenuItems();
retranslateUi(); retranslateUi();
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
messageLog->logReplayStarted(gameInfo.game_id()); messageLog->logReplayStarted(gameInfo.game_id());
@ -414,7 +414,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
createMenuItems(); createMenuItems();
createViewMenuItems(); createViewMenuItems();
retranslateUi(); retranslateUi();
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
// append game to rooms game list for others to see // append game to rooms game list for others to see

2
cockatrice/src/window_main.cpp
View file

@ -811,7 +811,7 @@ MainWindow::MainWindow(QWidget *parent)
createTrayIcon(); createTrayIcon();
} }
connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()), this, SLOT(refreshShortcuts())); connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
connect(db, SIGNAL(cardDatabaseLoadingFailed()), this, SLOT(cardDatabaseLoadingFailed())); connect(db, SIGNAL(cardDatabaseLoadingFailed()), this, SLOT(cardDatabaseLoadingFailed()));