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

Tokens in sub menu (#2320)

Browse source
This commit is contained in:
Zach H 2016-12-17 13:05:29 -05:00 committed by GitHub
parent 04779c2a77
commit 3d0600b516
2 changed files with 123 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@ mysql.cnf
.DS_Store .DS_Store
.idea/ .idea/
*.aps *.aps
cmake-build-debug/

21
cockatrice/src/player.cpp
View file

@ -1104,7 +1104,8 @@ void Player::actCreateRelatedCard()
QAction *action = static_cast<QAction *>(sender()); QAction *action = static_cast<QAction *>(sender());
// removes p/t from tokens (and leading space)) // removes p/t from tokens (and leading space))
QStringList spaces = action->text().split(" "); // Added split for "Token:" due to change in PR fixing #2317
QStringList spaces = action->text().split(tr("Token: "))[1].split(" ");
if (spaces.at(0).indexOf("/") != -1) // Strip space from creatures if (spaces.at(0).indexOf("/") != -1) // Strip space from creatures
spaces.removeFirst(); spaces.removeFirst();
CardInfo *cardInfo = db->getCard(spaces.join(" ")); CardInfo *cardInfo = db->getCard(spaces.join(" "));
@ -2350,16 +2351,17 @@ void Player::updateCardMenu(CardItem *card)
QStringList reverserelatedCards2Me = card->getInfo()->getReverseRelatedCards2Me(); QStringList reverserelatedCards2Me = card->getInfo()->getReverseRelatedCards2Me();
if(relatedCards.size() || reverserelatedCards2Me.size()) if(relatedCards.size() || reverserelatedCards2Me.size())
{ {
QMenu * createRelatedCardMenu = cardMenu->addMenu(tr("Cr&eate related card")); cardMenu->addSeparator();
for (int i = 0; i < relatedCards.size(); ++i) { for (int i = 0; i < relatedCards.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(relatedCards.at(i)); QAction *a = new QAction(tr("Token: ") + relatedCards.at(i), this);
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard())); connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
cardMenu->addAction(a);
} }
for (int i = 0; i < reverserelatedCards2Me.size(); ++i) { for (int i = 0; i < reverserelatedCards2Me.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(reverserelatedCards2Me.at(i)); QAction *a = new QAction(tr("Token: ") + reverserelatedCards2Me.at(i), this);
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard())); connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
cardMenu->addAction(a);
} }
} }
} }
@ -2392,16 +2394,17 @@ void Player::updateCardMenu(CardItem *card)
QStringList reverserelatedCards2Me = card->getInfo()->getReverseRelatedCards2Me(); QStringList reverserelatedCards2Me = card->getInfo()->getReverseRelatedCards2Me();
if(relatedCards.size() || reverserelatedCards2Me.size()) if(relatedCards.size() || reverserelatedCards2Me.size())
{ {
QMenu * createRelatedCardMenu = cardMenu->addMenu(tr("Cr&eate related card")); cardMenu->addSeparator();
for (int i = 0; i < relatedCards.size(); ++i) { for (int i = 0; i < relatedCards.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(relatedCards.at(i)); QAction *a = new QAction(tr("Token: ") + relatedCards.at(i), this);
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard())); connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
cardMenu->addAction(a);
} }
for (int i = 0; i < reverserelatedCards2Me.size(); ++i) { for (int i = 0; i < reverserelatedCards2Me.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(reverserelatedCards2Me.at(i)); QAction *a = new QAction(tr("Token: ") + reverserelatedCards2Me.at(i), this);
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard())); connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
cardMenu->addAction(a);
} }
} }
} }