From 39635708382c7a314fb4ea26e1a337f7059825a1 Mon Sep 17 00:00:00 2001 From: John Hill Date: Sun, 6 Aug 2017 18:09:25 -0700 Subject: [PATCH] Mana counter shortcut (#2821) --- cockatrice/src/abstractcounter.cpp | 17 +- cockatrice/src/abstractcounter.h | 6 +- cockatrice/src/counter_general.cpp | 4 +- cockatrice/src/counter_general.h | 2 +- cockatrice/src/player.cpp | 2 +- cockatrice/src/sequenceEdit/ui_shortcutstab.h | 302 +++++++++++++++++- cockatrice/src/shortcutssettings.cpp | 30 ++ 7 files changed, 342 insertions(+), 21 deletions(-) diff --git a/cockatrice/src/abstractcounter.cpp b/cockatrice/src/abstractcounter.cpp index 1ff3bcce..8f40ad2f 100644 --- a/cockatrice/src/abstractcounter.cpp +++ b/cockatrice/src/abstractcounter.cpp @@ -9,8 +9,8 @@ #include "pb/command_inc_counter.pb.h" #include "pb/command_set_counter.pb.h" -AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name, bool _shownInCounterArea, int _value, QGraphicsItem *parent) - : QGraphicsItem(parent), player(_player), id(_id), name(_name), value(_value), hovered(false), aDec(0), aInc(0), dialogSemaphore(false), deleteAfterDialog(false), shownInCounterArea(_shownInCounterArea) +AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name, bool _shownInCounterArea, int _value, bool _useNameForShortcut, QGraphicsItem *parent) + : QGraphicsItem(parent), player(_player), id(_id), name(_name), value(_value), useNameForShortcut(_useNameForShortcut), hovered(false), aDec(0), aInc(0), dialogSemaphore(false), deleteAfterDialog(false), shownInCounterArea(_shownInCounterArea) { setAcceptHoverEvents(true); @@ -23,9 +23,9 @@ AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name, menu->addAction(aSet); menu->addSeparator(); for (int i = 10; i >= -10; --i) - if (i == 0) + if (i == 0) { menu->addSeparator(); - else { + } else { QAction *aIncrement = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this); if (i == -1) aDec = aIncrement; @@ -36,7 +36,7 @@ AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name, menu->addAction(aIncrement); } } else - menu = 0; + menu = nullptr; connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts())); refreshShortcuts(); @@ -70,13 +70,18 @@ void AbstractCounter::setShortcutsActive() aSet->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSet")); aDec->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDec")); aInc->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aInc")); + } else if (useNameForShortcut) { + shortcutActive = true; + aSet->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSetCounter_" + name)); + aDec->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecCounter_" + name)); + aInc->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aIncCounter_" + name)); } } void AbstractCounter::setShortcutsInactive() { shortcutActive = false; - if (name == "life") { + if (name == "life" || useNameForShortcut) { aSet->setShortcut(QKeySequence()); aDec->setShortcut(QKeySequence()); aInc->setShortcut(QKeySequence()); diff --git a/cockatrice/src/abstractcounter.h b/cockatrice/src/abstractcounter.h index f5a04e9d..1e201f0c 100644 --- a/cockatrice/src/abstractcounter.h +++ b/cockatrice/src/abstractcounter.h @@ -15,7 +15,7 @@ protected: int id; QString name; int value; - bool hovered; + bool useNameForShortcut, hovered; void mousePressEvent(QGraphicsSceneMouseEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event); @@ -30,7 +30,7 @@ private slots: void incrementCounter(); void setCounter(); public: - AbstractCounter(Player *_player, int _id, const QString &_name, bool _shownInCounterArea, int _value, QGraphicsItem *parent = 0); + AbstractCounter(Player *_player, int _id, const QString &_name, bool _shownInCounterArea, int _value, bool _useNameForShortcut = false, QGraphicsItem *parent = 0); ~AbstractCounter(); QMenu *getMenu() const { return menu; } @@ -42,7 +42,7 @@ public: int getValue() const { return value; } void setValue(int _value); void delCounter(); - + void setShortcutsActive(); void setShortcutsInactive(); bool shortcutActive; diff --git a/cockatrice/src/counter_general.cpp b/cockatrice/src/counter_general.cpp index e282f1bd..72748b73 100644 --- a/cockatrice/src/counter_general.cpp +++ b/cockatrice/src/counter_general.cpp @@ -2,8 +2,8 @@ #include "pixmapgenerator.h" #include -GeneralCounter::GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, QGraphicsItem *parent) - : AbstractCounter(_player, _id, _name, true, _value, parent), color(_color), radius(_radius) +GeneralCounter::GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, bool useNameForShortcut, QGraphicsItem *parent) + : AbstractCounter(_player, _id, _name, true, _value, useNameForShortcut, parent), color(_color), radius(_radius) { setCacheMode(DeviceCoordinateCache); } diff --git a/cockatrice/src/counter_general.h b/cockatrice/src/counter_general.h index 2808b654..aaf6a8e6 100644 --- a/cockatrice/src/counter_general.h +++ b/cockatrice/src/counter_general.h @@ -9,7 +9,7 @@ private: QColor color; int radius; public: - GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, QGraphicsItem *parent = 0); + GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, bool useNameForShortcut = false, QGraphicsItem *parent = 0); QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); }; diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 54d3ae7b..47d2ce29 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1926,7 +1926,7 @@ AbstractCounter *Player::addCounter(int counterId, const QString &name, QColor c if (name == "life") c = playerTarget->addCounter(counterId, name, value); else - c = new GeneralCounter(this, counterId, name, color, radius, value, this); + c = new GeneralCounter(this, counterId, name, color, radius, value, true, this); counters.insert(counterId, c); if (countersMenu) countersMenu->addMenu(c->getMenu()); diff --git a/cockatrice/src/sequenceEdit/ui_shortcutstab.h b/cockatrice/src/sequenceEdit/ui_shortcutstab.h index 5058c862..ef5a66ee 100644 --- a/cockatrice/src/sequenceEdit/ui_shortcutstab.h +++ b/cockatrice/src/sequenceEdit/ui_shortcutstab.h @@ -89,7 +89,7 @@ public: QLabel *lbl_TabDeckEditor_aSaveDeckToClipboard; SequenceEdit *TabDeckEditor_aSaveDeckToClipboard; QGroupBox *groupBox_3; - QHBoxLayout *horizontalLayout; + QGridLayout *counterLayout; QGroupBox *groupBox_4; QGridLayout *gridLayout_4; QLabel *lbl_abstractCounter_sSet; @@ -122,6 +122,70 @@ public: SequenceEdit *Player_aCCYellow; QLabel *lbl_Player_aRCYellow; SequenceEdit *Player_aRCYellow; + + QGroupBox *groupBox_counterStorm; + QGridLayout *gridLayout_Storm; + QLabel *lbl_Player_aSetCStorm; + SequenceEdit *Player_aSetCStorm; + QLabel *lbl_Player_aIncCStorm; + SequenceEdit *Player_aIncCStorm; + QLabel *lbl_Player_aDecCStorm; + SequenceEdit *Player_aDecCStorm; + + QGroupBox *groupBox_counterW;//W Counter + QGridLayout *gridLayout_W; + QLabel *lbl_Player_aSetCW; + SequenceEdit *Player_aSetCW; + QLabel *lbl_Player_aIncCW; + SequenceEdit *Player_aIncCW; + QLabel *lbl_Player_aDecCW; + SequenceEdit *Player_aDecCW; + + QGroupBox *groupBox_counterU;//U Counter + QGridLayout *gridLayout_U; + QLabel *lbl_Player_aSetCU; + SequenceEdit *Player_aSetCU; + QLabel *lbl_Player_aIncCU; + SequenceEdit *Player_aIncCU; + QLabel *lbl_Player_aDecCU; + SequenceEdit *Player_aDecCU; + + QGroupBox *groupBox_counterB;//B Counter + QGridLayout *gridLayout_B; + QLabel *lbl_Player_aSetCB; + SequenceEdit *Player_aSetCB; + QLabel *lbl_Player_aIncCB; + SequenceEdit *Player_aIncCB; + QLabel *lbl_Player_aDecCB; + SequenceEdit *Player_aDecCB; + + QGroupBox *groupBox_counterR;//R Counter + QGridLayout *gridLayout_R; + QLabel *lbl_Player_aSetCR; + SequenceEdit *Player_aSetCR; + QLabel *lbl_Player_aIncCR; + SequenceEdit *Player_aIncCR; + QLabel *lbl_Player_aDecCR; + SequenceEdit *Player_aDecCR; + + QGroupBox *groupBox_counterG;//G Counter + QGridLayout *gridLayout_G; + QLabel *lbl_Player_aSetCG; + SequenceEdit *Player_aSetCG; + QLabel *lbl_Player_aIncCG; + SequenceEdit *Player_aIncCG; + QLabel *lbl_Player_aDecCG; + SequenceEdit *Player_aDecCG; + + QGroupBox *groupBox_counterX;//X Counter + QGridLayout *gridLayout_X; + QLabel *lbl_Player_aSetCX; + SequenceEdit *Player_aSetCX; + QLabel *lbl_Player_aIncCX; + SequenceEdit *Player_aIncCX; + QLabel *lbl_Player_aDecCX; + SequenceEdit *Player_aDecCX; + QSpacerItem *verticalSpacer; QWidget *tab_2; QGridLayout *gridLayout_17; @@ -583,8 +647,8 @@ public: groupBox_3 = new QGroupBox(tab); groupBox_3->setObjectName("groupBox_3"); - horizontalLayout = new QHBoxLayout(groupBox_3); - horizontalLayout->setObjectName("horizontalLayout"); + counterLayout = new QGridLayout(groupBox_3); + counterLayout->setObjectName("counterLayout"); groupBox_4 = new QGroupBox(groupBox_3); groupBox_4->setObjectName("groupBox_4"); gridLayout_4 = new QGridLayout(groupBox_4); @@ -619,7 +683,7 @@ public: gridLayout_4->addWidget(abstractCounter_aDec, 2, 1, 1, 1); - horizontalLayout->addWidget(groupBox_4); + counterLayout->addWidget(groupBox_4, 0, 0, 1, 1); groupBox_5 = new QGroupBox(groupBox_3); groupBox_5->setObjectName("groupBox_5"); @@ -655,7 +719,7 @@ public: gridLayout_6->addWidget(Player_aRCRed, 2, 1, 1, 1); - horizontalLayout->addWidget(groupBox_5); + counterLayout->addWidget(groupBox_5, 0, 1, 1, 1); groupBox_6 = new QGroupBox(groupBox_3); groupBox_6->setObjectName("groupBox_6"); @@ -691,7 +755,7 @@ public: gridLayout_7->addWidget(Player_aRCGreen, 2, 1, 1, 1); - horizontalLayout->addWidget(groupBox_6); + counterLayout->addWidget(groupBox_6, 0, 2, 1, 1); groupBox_7 = new QGroupBox(groupBox_3); groupBox_7->setObjectName("groupBox_7"); @@ -727,7 +791,196 @@ public: gridLayout_8->addWidget(Player_aRCYellow, 2, 1, 1, 1); - horizontalLayout->addWidget(groupBox_7); + counterLayout->addWidget(groupBox_7, 0, 3, 1, 1); + + groupBox_counterStorm = new QGroupBox(groupBox_3); + groupBox_counterStorm->setObjectName("groupBox_counterStorm"); + gridLayout_Storm = new QGridLayout(groupBox_counterStorm); + gridLayout_Storm->setObjectName("gridLayout_Storm"); + lbl_Player_aSetCStorm = new QLabel(groupBox_counterStorm); + lbl_Player_aSetCStorm->setObjectName("lbl_Player_aSetCStorm"); + gridLayout_Storm->addWidget(lbl_Player_aSetCStorm, 0, 0, 1, 1); + Player_aSetCStorm = new SequenceEdit("Player/aSetCounter_storm", groupBox_counterStorm); + Player_aSetCStorm->setObjectName("Player_aSetCStorm"); + gridLayout_Storm->addWidget(Player_aSetCStorm, 0, 1, 1, 1); + + lbl_Player_aIncCStorm = new QLabel(groupBox_counterStorm); + lbl_Player_aIncCStorm->setObjectName("lbl_Player_aIncCStorm"); + gridLayout_Storm->addWidget(lbl_Player_aIncCStorm, 1, 0, 1, 1); + Player_aIncCStorm = new SequenceEdit("Player/aIncCounter_storm", groupBox_counterStorm); + Player_aIncCStorm->setObjectName("Player_aIncCStorm"); + gridLayout_Storm->addWidget(Player_aIncCStorm, 1, 1, 1, 1); + + lbl_Player_aDecCStorm = new QLabel(groupBox_counterStorm); + lbl_Player_aDecCStorm->setObjectName("lbl_Player_aDecCStorm"); + gridLayout_Storm->addWidget(lbl_Player_aDecCStorm, 2, 0, 1, 1); + Player_aDecCStorm = new SequenceEdit("Player/aDecCounter_storm", groupBox_counterStorm); + Player_aDecCStorm->setObjectName("Player_aDecCStorm"); + gridLayout_Storm->addWidget(Player_aDecCStorm, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterStorm, 1, 0, 1, 1); + + groupBox_counterW = new QGroupBox(groupBox_3); + groupBox_counterW->setObjectName("groupBox_counterW"); + gridLayout_W = new QGridLayout(groupBox_counterW); + gridLayout_W->setObjectName("gridLayout_W"); + lbl_Player_aSetCW = new QLabel(groupBox_counterW); + lbl_Player_aSetCW->setObjectName("lbl_Player_aSetCW"); + gridLayout_W->addWidget(lbl_Player_aSetCW, 0, 0, 1, 1); + Player_aSetCW = new SequenceEdit("Player/aSetCounter_w", groupBox_counterW); + Player_aSetCW->setObjectName("Player_aSetCW"); + gridLayout_W->addWidget(Player_aSetCW, 0, 1, 1, 1); + + lbl_Player_aIncCW = new QLabel(groupBox_counterW); + lbl_Player_aIncCW->setObjectName("lbl_Player_aIncCW"); + gridLayout_W->addWidget(lbl_Player_aIncCW, 1, 0, 1, 1); + Player_aIncCW = new SequenceEdit("Player/aIncCounter_w", groupBox_counterW); + Player_aIncCW->setObjectName("Player_aIncCW"); + gridLayout_W->addWidget(Player_aIncCW, 1, 1, 1, 1); + + lbl_Player_aDecCW = new QLabel(groupBox_counterW); + lbl_Player_aDecCW->setObjectName("lbl_Player_aDecCW"); + gridLayout_W->addWidget(lbl_Player_aDecCW, 2, 0, 1, 1); + Player_aDecCW = new SequenceEdit("Player/aDecCounter_w", groupBox_counterW); + Player_aDecCW->setObjectName("Player_aDecCW"); + gridLayout_W->addWidget(Player_aDecCW, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterW, 1, 1, 1, 1); + + groupBox_counterU = new QGroupBox(groupBox_3); + groupBox_counterU->setObjectName("groupBox_counterU"); + gridLayout_U = new QGridLayout(groupBox_counterU); + gridLayout_U->setObjectName("gridLayout_U"); + lbl_Player_aSetCU = new QLabel(groupBox_counterU); + lbl_Player_aSetCU->setObjectName("lbl_Player_aSetCU"); + gridLayout_U->addWidget(lbl_Player_aSetCU, 0, 0, 1, 1); + Player_aSetCU = new SequenceEdit("Player/aSetCounter_u", groupBox_counterU); + Player_aSetCU->setObjectName("Player_aSetCU"); + gridLayout_U->addWidget(Player_aSetCU, 0, 1, 1, 1); + + lbl_Player_aIncCU = new QLabel(groupBox_counterU); + lbl_Player_aIncCU->setObjectName("lbl_Player_aIncCU"); + gridLayout_U->addWidget(lbl_Player_aIncCU, 1, 0, 1, 1); + Player_aIncCU = new SequenceEdit("Player/aIncCounter_u", groupBox_counterU); + Player_aIncCU->setObjectName("Player_aIncCU"); + gridLayout_U->addWidget(Player_aIncCU, 1, 1, 1, 1); + + lbl_Player_aDecCU = new QLabel(groupBox_counterU); + lbl_Player_aDecCU->setObjectName("lbl_Player_aDecCU"); + gridLayout_U->addWidget(lbl_Player_aDecCU, 2, 0, 1, 1); + Player_aDecCU = new SequenceEdit("Player/aDecCounter_u", groupBox_counterU); + Player_aDecCU->setObjectName("Player_aDecCU"); + gridLayout_U->addWidget(Player_aDecCU, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterU, 1, 2, 1, 1); + + groupBox_counterB = new QGroupBox(groupBox_3); + groupBox_counterB->setObjectName("groupBox_counterB"); + gridLayout_B = new QGridLayout(groupBox_counterB); + gridLayout_B->setObjectName("gridLayout_B"); + lbl_Player_aSetCB = new QLabel(groupBox_counterB); + lbl_Player_aSetCB->setObjectName("lbl_Player_aSetCB"); + gridLayout_B->addWidget(lbl_Player_aSetCB, 0, 0, 1, 1); + Player_aSetCB = new SequenceEdit("Player/aSetCounter_b", groupBox_counterB); + Player_aSetCB->setObjectName("Player_aSetCB"); + gridLayout_B->addWidget(Player_aSetCB, 0, 1, 1, 1); + + lbl_Player_aIncCB = new QLabel(groupBox_counterB); + lbl_Player_aIncCB->setObjectName("lbl_Player_aIncCB"); + gridLayout_B->addWidget(lbl_Player_aIncCB, 1, 0, 1, 1); + Player_aIncCB = new SequenceEdit("Player/aIncCounter_b", groupBox_counterB); + Player_aIncCB->setObjectName("Player_aIncCB"); + gridLayout_B->addWidget(Player_aIncCB, 1, 1, 1, 1); + + lbl_Player_aDecCB = new QLabel(groupBox_counterB); + lbl_Player_aDecCB->setObjectName("lbl_Player_aDecCB"); + gridLayout_B->addWidget(lbl_Player_aDecCB, 2, 0, 1, 1); + Player_aDecCB = new SequenceEdit("Player/aDecCounter_b", groupBox_counterB); + Player_aDecCB->setObjectName("Player_aDecCB"); + gridLayout_B->addWidget(Player_aDecCB, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterB, 1, 3, 1, 1); + + groupBox_counterR = new QGroupBox(groupBox_3); + groupBox_counterR->setObjectName("groupBox_counterR"); + gridLayout_R = new QGridLayout(groupBox_counterR); + gridLayout_R->setObjectName("gridLayout_R"); + lbl_Player_aSetCR = new QLabel(groupBox_counterR); + lbl_Player_aSetCR->setObjectName("lbl_Player_aSetCR"); + gridLayout_R->addWidget(lbl_Player_aSetCR, 0, 0, 1, 1); + Player_aSetCR = new SequenceEdit("Player/aSetCounter_r", groupBox_counterR); + Player_aSetCR->setObjectName("Player_aSetCR"); + gridLayout_R->addWidget(Player_aSetCR, 0, 1, 1, 1); + + lbl_Player_aIncCR = new QLabel(groupBox_counterR); + lbl_Player_aIncCR->setObjectName("lbl_Player_aIncCR"); + gridLayout_R->addWidget(lbl_Player_aIncCR, 1, 0, 1, 1); + Player_aIncCR = new SequenceEdit("Player/aIncCounter_r", groupBox_counterR); + Player_aIncCR->setObjectName("Player_aIncCR"); + gridLayout_R->addWidget(Player_aIncCR, 1, 1, 1, 1); + + lbl_Player_aDecCR = new QLabel(groupBox_counterR); + lbl_Player_aDecCR->setObjectName("lbl_Player_aDecCR"); + gridLayout_R->addWidget(lbl_Player_aDecCR, 2, 0, 1, 1); + Player_aDecCR = new SequenceEdit("Player/aDecCounter_r", groupBox_counterR); + Player_aDecCR->setObjectName("Player_aDecCR"); + gridLayout_R->addWidget(Player_aDecCR, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterR, 2, 0, 1, 1); + + groupBox_counterG = new QGroupBox(groupBox_3); + groupBox_counterG->setObjectName("groupBox_counterG"); + gridLayout_G = new QGridLayout(groupBox_counterG); + gridLayout_G->setObjectName("gridLayout_G"); + lbl_Player_aSetCG = new QLabel(groupBox_counterG); + lbl_Player_aSetCG->setObjectName("lbl_Player_aSetCG"); + gridLayout_G->addWidget(lbl_Player_aSetCG, 0, 0, 1, 1); + Player_aSetCG = new SequenceEdit("Player/aSetCounter_g", groupBox_counterG); + Player_aSetCG->setObjectName("Player_aSetCG"); + gridLayout_G->addWidget(Player_aSetCG, 0, 1, 1, 1); + + lbl_Player_aIncCG = new QLabel(groupBox_counterG); + lbl_Player_aIncCG->setObjectName("lbl_Player_aIncCG"); + gridLayout_G->addWidget(lbl_Player_aIncCG, 1, 0, 1, 1); + Player_aIncCG = new SequenceEdit("Player/aIncCounter_g", groupBox_counterG); + Player_aIncCG->setObjectName("Player_aIncCG"); + gridLayout_G->addWidget(Player_aIncCG, 1, 1, 1, 1); + + lbl_Player_aDecCG = new QLabel(groupBox_counterG); + lbl_Player_aDecCG->setObjectName("lbl_Player_aDecCG"); + gridLayout_G->addWidget(lbl_Player_aDecCG, 2, 0, 1, 1); + Player_aDecCG = new SequenceEdit("Player/aDecCounter_g", groupBox_counterG); + Player_aDecCG->setObjectName("Player_aDecCG"); + gridLayout_G->addWidget(Player_aDecCG, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterG, 2, 1, 1, 1); + + groupBox_counterX = new QGroupBox(groupBox_3); + groupBox_counterX->setObjectName("groupBox_counterX"); + gridLayout_X = new QGridLayout(groupBox_counterX); + gridLayout_X->setObjectName("gridLayout_X"); + lbl_Player_aSetCX = new QLabel(groupBox_counterX); + lbl_Player_aSetCX->setObjectName("lbl_Player_aSetCX"); + gridLayout_X->addWidget(lbl_Player_aSetCX, 0, 0, 1, 1); + Player_aSetCX = new SequenceEdit("Player/aSetCounter_x", groupBox_counterX); + Player_aSetCX->setObjectName("Player_aSetCX"); + gridLayout_X->addWidget(Player_aSetCX, 0, 1, 1, 1); + + lbl_Player_aIncCX = new QLabel(groupBox_counterX); + lbl_Player_aIncCX->setObjectName("lbl_Player_aIncCX"); + gridLayout_X->addWidget(lbl_Player_aIncCX, 1, 0, 1, 1); + Player_aIncCX = new SequenceEdit("Player/aIncCounter_x", groupBox_counterX); + Player_aIncCX->setObjectName("Player_aIncCX"); + gridLayout_X->addWidget(Player_aIncCX, 1, 1, 1, 1); + + lbl_Player_aDecCX = new QLabel(groupBox_counterX); + lbl_Player_aDecCX->setObjectName("lbl_Player_aDecCX"); + gridLayout_X->addWidget(lbl_Player_aDecCX, 2, 0, 1, 1); + Player_aDecCX = new SequenceEdit("Player/aDecCounter_x", groupBox_counterX); + Player_aDecCX->setObjectName("Player_aDecCX"); + gridLayout_X->addWidget(Player_aDecCX, 2, 1, 1, 1); + + counterLayout->addWidget(groupBox_counterX, 2, 2, 1, 1); verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); @@ -1463,7 +1716,7 @@ public: gridLayout_20->setSpacing(3); verticalLayout->setSpacing(3); - horizontalLayout->setSpacing(3); + counterLayout->setSpacing(3); QMetaObject::connectSlotsByName(shortcutsTab); retranslateUi(shortcutsTab); } // setupUi @@ -1514,6 +1767,39 @@ public: lbl_Player_aCCGreen->setText(QApplication::translate("shortcutsTab", "Add", 0)); lbl_Player_aRCGreen->setText(QApplication::translate("shortcutsTab", "Remove", 0)); groupBox_7->setTitle(QApplication::translate("shortcutsTab", "Yellow", 0)); + lbl_Player_aSCYellow->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aCCYellow->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aRCYellow->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + + groupBox_counterStorm->setTitle(QApplication::translate("shortcutsTab", "Storm", 0)); + lbl_Player_aSetCStorm->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCStorm->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCStorm->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + groupBox_counterW->setTitle(QApplication::translate("shortcutsTab", "W", 0)); + lbl_Player_aSetCW->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCW->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCW->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + groupBox_counterU->setTitle(QApplication::translate("shortcutsTab", "U", 0)); + lbl_Player_aSetCU->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCU->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCU->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + groupBox_counterB->setTitle(QApplication::translate("shortcutsTab", "B", 0)); + lbl_Player_aSetCB->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCB->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCB->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + groupBox_counterR->setTitle(QApplication::translate("shortcutsTab", "R", 0)); + lbl_Player_aSetCR->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCR->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCR->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + groupBox_counterG->setTitle(QApplication::translate("shortcutsTab", "G", 0)); + lbl_Player_aSetCG->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCG->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCG->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + groupBox_counterX->setTitle(QApplication::translate("shortcutsTab", "X", 0)); + lbl_Player_aSetCX->setText(QApplication::translate("shortcutsTab", "Set", 0)); + lbl_Player_aIncCX->setText(QApplication::translate("shortcutsTab", "Add", 0)); + lbl_Player_aDecCX->setText(QApplication::translate("shortcutsTab", "Remove", 0)); + lbl_Player_aSCYellow->setText(QApplication::translate("shortcutsTab", "Set", 0)); lbl_Player_aCCYellow->setText(QApplication::translate("shortcutsTab", "Add", 0)); lbl_Player_aRCYellow->setText(QApplication::translate("shortcutsTab", "Remove", 0)); diff --git a/cockatrice/src/shortcutssettings.cpp b/cockatrice/src/shortcutssettings.cpp index c7b5171b..911bab29 100644 --- a/cockatrice/src/shortcutssettings.cpp +++ b/cockatrice/src/shortcutssettings.cpp @@ -242,6 +242,36 @@ void ShortcutsSettings::fillDefaultShorcuts() 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("");