From 1c6b43c545edffd8d6d0036573955b31096af528 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sat, 19 Jan 2019 11:15:22 +0100 Subject: [PATCH] fix typo in shortcut name (#3509) In #3439 the shortcuts got some overhaul but this shortcut wasn't correctly renamed. This fix will clear users' original shortcut for increasing toughness. An improvement over the current state of it not working at all and being unable to set to the default shortcut. Fixes #3506 --- cockatrice/src/player.cpp | 2 +- cockatrice/src/sequenceEdit/ui_shortcutstab.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 95a55152..1b1386b3 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -763,7 +763,7 @@ void Player::setShortcutsActive() aAttach->setShortcuts(shortcuts.getShortcut("Player/aAttach")); aUnattach->setShortcuts(shortcuts.getShortcut("Player/aUnattach")); aDrawArrow->setShortcuts(shortcuts.getShortcut("Player/aDrawArrow")); - aIncP->setShortcuts(shortcuts.getShortcut("Player/IncP")); + aIncP->setShortcuts(shortcuts.getShortcut("Player/aIncP")); aDecP->setShortcuts(shortcuts.getShortcut("Player/aDecP")); aIncT->setShortcuts(shortcuts.getShortcut("Player/aIncT")); aDecT->setShortcuts(shortcuts.getShortcut("Player/aDecT")); diff --git a/cockatrice/src/sequenceEdit/ui_shortcutstab.h b/cockatrice/src/sequenceEdit/ui_shortcutstab.h index 69b1a0af..3a826e94 100644 --- a/cockatrice/src/sequenceEdit/ui_shortcutstab.h +++ b/cockatrice/src/sequenceEdit/ui_shortcutstab.h @@ -217,8 +217,8 @@ public: QGridLayout *gridLayout_10; QLabel *lbl_Player_aDecP; SequenceEdit *Player_aDecP; - SequenceEdit *Player_IncP; - QLabel *lbl_Player_IncP; + SequenceEdit *Player_aIncP; + QLabel *lbl_Player_aIncP; QGroupBox *groupBox_8; QGridLayout *gridLayout_5; QLabel *lbl_TabGame_phase0; @@ -1121,15 +1121,15 @@ public: gridLayout_10->addWidget(Player_aDecP, 1, 1, 1, 1); - Player_IncP = new SequenceEdit("Player/IncP", groupBox_10); - Player_IncP->setObjectName("Player_IncP"); + Player_aIncP = new SequenceEdit("Player/aIncP", groupBox_10); + Player_aIncP->setObjectName("Player_aIncP"); - gridLayout_10->addWidget(Player_IncP, 0, 1, 1, 1); + gridLayout_10->addWidget(Player_aIncP, 0, 1, 1, 1); - lbl_Player_IncP = new QLabel(groupBox_10); - lbl_Player_IncP->setObjectName("lbl_Player_IncP"); + lbl_Player_aIncP = new QLabel(groupBox_10); + lbl_Player_aIncP->setObjectName("lbl_Player_aIncP"); - gridLayout_10->addWidget(lbl_Player_IncP, 0, 0, 1, 1); + gridLayout_10->addWidget(lbl_Player_aIncP, 0, 0, 1, 1); verticalLayout->addWidget(groupBox_10); @@ -1920,7 +1920,7 @@ public: lbl_Player_aIncT->setText(QApplication::translate("shortcutsTab", "Add (+0/+1)", 0)); groupBox_10->setTitle(QApplication::translate("shortcutsTab", "Power", 0)); lbl_Player_aDecP->setText(QApplication::translate("shortcutsTab", "Remove (-1/-0)", 0)); - lbl_Player_IncP->setText(QApplication::translate("shortcutsTab", "Add (+1/+0)", 0)); + lbl_Player_aIncP->setText(QApplication::translate("shortcutsTab", "Add (+1/+0)", 0)); groupBox_8->setTitle(QApplication::translate("shortcutsTab", "Game Phases", 0)); lbl_TabGame_phase0->setText(QApplication::translate("shortcutsTab", "Untap", 0)); lbl_TabGame_phase1->setText(QApplication::translate("shortcutsTab", "Upkeep", 0));