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

token creation context menu improvements (#2999)

Browse source
This commit is contained in:
tooomm 2018-01-10 19:32:29 +01:00 committed by Zach H
parent d19744236e
commit 7efab80d9b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/player.cpp
View file

@ -2674,9 +2674,9 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu) {
cardMenu->addSeparator(); cardMenu->addSeparator();
QAction *createRelatedCards; QAction *createRelatedCards;
if (relatedCards.at(0)->getDoesAttach()) { if (relatedCards.at(0)->getDoesAttach()) {
createRelatedCards = new QAction(tr("Token: ") + tr("Attach to ") + relatedCards.at(0)->getName(), this); createRelatedCards = new QAction(tr("Token: ") + tr("Attach to ") + "\"" + relatedCards.at(0)->getName() + "\"", this);
} else } else
createRelatedCards = new QAction(tr("Token: ") + (relatedCards.at(0)->getIsVariable() ? "X " : QString(relatedCards.at(0)->getDefaultCount() == 1 ? QString() : QString::number(relatedCards.at(0)->getDefaultCount()) + " ")) + relatedCards.at(0)->getName(), this); createRelatedCards = new QAction(tr("Token: ") + (relatedCards.at(0)->getIsVariable() ? "X " : QString(relatedCards.at(0)->getDefaultCount() == 1 ? QString() : QString::number(relatedCards.at(0)->getDefaultCount()) + "x ")) + relatedCards.at(0)->getName(), this);
connect(createRelatedCards, SIGNAL(triggered()), this, SLOT(actCreateAllRelatedCards())); connect(createRelatedCards, SIGNAL(triggered()), this, SLOT(actCreateAllRelatedCards()));
if (shortcutsActive) { if (shortcutsActive) {
createRelatedCards->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aCreateRelatedTokens")); createRelatedCards->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aCreateRelatedTokens"));
@ -2692,9 +2692,9 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu) {
QString cardName = cardRelation->getName(); QString cardName = cardRelation->getName();
QAction *createRelated; QAction *createRelated;
if (cardRelation->getDoesAttach()) if (cardRelation->getDoesAttach())
createRelated = new QAction(tr("Token: ") + tr("Attach to ") + cardName, this); createRelated = new QAction(tr("Token: ") + tr("Attach to ") + "\"" + cardName + "\"", this);
else else
createRelated = new QAction(tr("Token: ") + (cardRelation->getIsVariable() ? "X " : QString(cardRelation->getDefaultCount() == 1 ? QString() : QString::number(cardRelation->getDefaultCount()) + " ")) + cardName, this); createRelated = new QAction(tr("Token: ") + (cardRelation->getIsVariable() ? "X " : QString(cardRelation->getDefaultCount() == 1 ? QString() : QString::number(cardRelation->getDefaultCount()) + "x ")) + cardName, this);
createRelated->setData(QVariant(i)); createRelated->setData(QVariant(i));
connect(createRelated, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard())); connect(createRelated, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
cardMenu->addAction(createRelated); cardMenu->addAction(createRelated);
@ -2787,4 +2787,4 @@ void Player::setLastToken(CardInfo *cardInfo)
lastTokenDestroy = true; lastTokenDestroy = true;
aCreateAnotherToken->setText(tr("C&reate another %1 token").arg(lastTokenName)); aCreateAnotherToken->setText(tr("C&reate another %1 token").arg(lastTokenName));
aCreateAnotherToken->setEnabled(true); aCreateAnotherToken->setEnabled(true);
} }