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

fix typo in shortcut name (#3509)

Browse source 
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
This commit is contained in:
ebbit1q 2019-01-19 11:15:22 +01:00 committed by Zach H
parent 41bfbf2e83
commit 1c6b43c545
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/player.cpp
View file

@ -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"));

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

@ -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));