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

Resurrect 2655 (#4136)

Browse source 
* fix #2640

* clangify

Co-authored-by: Fabio Bas <ctrlaltca@gmail.com>
This commit is contained in:
ebbit1q 2020-11-23 02:23:18 +01:00 committed by GitHub
parent 8441cb7ba9
commit 0d842b5a35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/player.cpp
View file

@ -359,6 +359,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
aCreateAnotherToken->setEnabled(false); aCreateAnotherToken->setEnabled(false);
createPredefinedTokenMenu = new QMenu(QString()); createPredefinedTokenMenu = new QMenu(QString());
createPredefinedTokenMenu->setEnabled(false);
playerMenu->addSeparator(); playerMenu->addSeparator();
countersMenu = playerMenu->addMenu(QString()); countersMenu = playerMenu->addMenu(QString());
@ -380,6 +381,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
if (local || judge) { if (local || judge) {
aCardMenu = new QAction(this); aCardMenu = new QAction(this);
aCardMenu->setEnabled(false);
playerMenu->addSeparator(); playerMenu->addSeparator();
playerMenu->addAction(aCardMenu); playerMenu->addAction(aCardMenu);
} else { } else {
@ -921,6 +923,7 @@ void Player::initSayMenu()
sayMenu->clear(); sayMenu->clear();
int count = SettingsCache::instance().messages().getCount(); int count = SettingsCache::instance().messages().getCount();
sayMenu->setEnabled(count > 0);
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), this); auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), this);
@ -938,10 +941,14 @@ void Player::setDeck(const DeckLoader &_deck)
aOpenDeckInDeckEditor->setEnabled(deck); aOpenDeckInDeckEditor->setEnabled(deck);
createPredefinedTokenMenu->clear(); createPredefinedTokenMenu->clear();
createPredefinedTokenMenu->setEnabled(false);
predefinedTokens.clear(); predefinedTokens.clear();
InnerDecklistNode *tokenZone = dynamic_cast<InnerDecklistNode *>(deck->getRoot()->findChild(DECK_ZONE_TOKENS)); InnerDecklistNode *tokenZone = dynamic_cast<InnerDecklistNode *>(deck->getRoot()->findChild(DECK_ZONE_TOKENS));
if (tokenZone) if (tokenZone) {
if (tokenZone->size() > 0)
createPredefinedTokenMenu->setEnabled(true);
for (int i = 0; i < tokenZone->size(); ++i) { for (int i = 0; i < tokenZone->size(); ++i) {
const QString tokenName = tokenZone->at(i)->getName(); const QString tokenName = tokenZone->at(i)->getName();
predefinedTokens.append(tokenName); predefinedTokens.append(tokenName);
@ -951,6 +958,7 @@ void Player::setDeck(const DeckLoader &_deck)
} }
connect(a, SIGNAL(triggered()), this, SLOT(actCreatePredefinedToken())); connect(a, SIGNAL(triggered()), this, SLOT(actCreatePredefinedToken()));
} }
}
} }
void Player::actViewLibrary() void Player::actViewLibrary()
@ -3230,6 +3238,7 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu)
void Player::setCardMenu(QMenu *menu) void Player::setCardMenu(QMenu *menu)
{ {
if (aCardMenu) { if (aCardMenu) {
aCardMenu->setEnabled(menu != nullptr);
aCardMenu->setMenu(menu); aCardMenu->setMenu(menu);
} }
} }