jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-26 16:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove untap option, combine w/ tap (#2964)

Browse source
This commit is contained in:
Zach H 2017-12-17 17:31:31 -05:00 • committed by GitHub
parent 7e80f4b4ae
commit 297f1f2555
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -245,7 +245,6 @@ public:
QGridLayout *gridLayout_13;
QLabel *lbl_Player_aTap;
SequenceEdit *Player_aTap;
QLabel *lbl_Player_aUntap;
SequenceEdit *Player_aUntap;
QLabel *lbl_Player_aUntapAll;
SequenceEdit *Player_aUntapAll;
@ -1247,16 +1246,6 @@ public:
gridLayout_13->addWidget(Player_aTap, 0, 1, 1, 1);
lbl_Player_aUntap = new QLabel(groupBox_13);
lbl_Player_aUntap->setObjectName("lbl_Player_aUntap");
gridLayout_13->addWidget(lbl_Player_aUntap, 1, 0, 1, 1);
Player_aUntap = new SequenceEdit("Player/aUntap",groupBox_13);
Player_aUntap->setObjectName("Player_aUntap");
gridLayout_13->addWidget(Player_aUntap, 1, 1, 1, 1);
lbl_Player_aUntapAll = new QLabel(groupBox_13);
lbl_Player_aUntapAll->setObjectName("lbl_Player_aUntapAll");
@ -1843,8 +1832,7 @@ public:
lbl_TabGame_aNextPhase->setText(QApplication::translate("shortcutsTab", "Next phase", 0));
lbl_TabGame_aNextTurn->setText(QApplication::translate("shortcutsTab", "Next turn", 0));
groupBox_13->setTitle(QApplication::translate("shortcutsTab", "Playing Area", 0));
lbl_Player_aTap->setText(QApplication::translate("shortcutsTab", "Tap Card", 0));
lbl_Player_aUntap->setText(QApplication::translate("shortcutsTab", "Untap Card", 0));
lbl_Player_aTap->setText(QApplication::translate("shortcutsTab", "Tap / Untap Card", 0));
lbl_Player_aUntapAll->setText(QApplication::translate("shortcutsTab", "Untap all", 0));
lbl_Player_aDoesntUntap->setText(QApplication::translate("shortcutsTab", "Toggle untap", 0));
lbl_Player_aFlip->setText(QApplication::translate("shortcutsTab", "Flip card", 0));