jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Condensed Card Counter Context Menu" (#2433)

Browse source
This commit is contained in:
Zach H 2017-03-02 17:47:15 -05:00 • committed by GitHub
parent 2bad56f6b6
commit cf08d1d267
3 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cockatrice/src/player.cpp
View file

@ -699,13 +699,13 @@ void Player::retranslateUi()
counterColors.append(tr("Green"));
for (int i = 0; i < aAddCounter.size(); ++i){
aAddCounter[i]->setText(tr("%1").arg(counterColors[i]));
aAddCounter[i]->setText(tr("&Add counter (%1)").arg(counterColors[i]));
}
for (int i = 0; i < aRemoveCounter.size(); ++i){
aRemoveCounter[i]->setText(tr("%1").arg(counterColors[i]));
aRemoveCounter[i]->setText(tr("&Remove counter (%1)").arg(counterColors[i]));
}
for (int i = 0; i < aSetCounter.size(); ++i){
aSetCounter[i]->setText(tr("%1...").arg(counterColors[i]));
aSetCounter[i]->setText(tr("&Set counters (%1)...").arg(counterColors[i]));
}
aMoveToTopLibrary->setText(tr("&Top of library"));
@ -2330,9 +2330,6 @@ void Player::updateCardMenu(const CardItem *card)
QMenu *cardMenu = card->getCardMenu();
QMenu *ptMenu = card->getPTMenu();
QMenu *moveMenu = card->getMoveMenu();
QMenu *addCounterMenu = card->getAddCounterMenu();
QMenu *removeCounterMenu = card->getRemoveCounterMenu();
QMenu *setCountersMenu = card->getSetCounterMenu();
cardMenu->clear();
@ -2399,15 +2396,11 @@ void Player::updateCardMenu(const CardItem *card)
cardMenu->addMenu(moveMenu);
for (int i = 0; i < aAddCounter.size(); ++i) {
addCounterMenu->addAction(aAddCounter[i]);
removeCounterMenu->addAction(aRemoveCounter[i]);
setCountersMenu->addAction(aSetCounter[i]);
cardMenu->addSeparator();
cardMenu->addAction(aAddCounter[i]);
cardMenu->addAction(aRemoveCounter[i]);
cardMenu->addAction(aSetCounter[i]);
}
cardMenu->addSeparator();
cardMenu->addMenu(addCounterMenu);
cardMenu->addMenu(removeCounterMenu);
cardMenu->addMenu(setCountersMenu);
cardMenu->addSeparator();
} else if (card->getZone()->getName() == "stack") {
cardMenu->addAction(aDrawArrow);