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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/carditem.cpp
View file

@ -26,9 +26,6 @@ CardItem::CardItem(Player *_owner, const QString &_name, int _cardid, bool _reve
cardMenu = new QMenu; cardMenu = new QMenu;
ptMenu = new QMenu; ptMenu = new QMenu;
moveMenu = new QMenu; moveMenu = new QMenu;
addCounterMenu = new QMenu;
removeCounterMenu = new QMenu;
setCounterMenu = new QMenu;
retranslateUi(); retranslateUi();
emit updateCardMenu(this); emit updateCardMenu(this);
@ -44,9 +41,6 @@ CardItem::~CardItem()
delete cardMenu; delete cardMenu;
delete ptMenu; delete ptMenu;
delete moveMenu; delete moveMenu;
delete addCounterMenu;
delete removeCounterMenu;
delete setCounterMenu;
deleteDragItem(); deleteDragItem();
} }
@ -88,9 +82,6 @@ void CardItem::retranslateUi()
{ {
moveMenu->setTitle(tr("&Move to")); moveMenu->setTitle(tr("&Move to"));
ptMenu->setTitle(tr("&Power / toughness")); ptMenu->setTitle(tr("&Power / toughness"));
addCounterMenu->setTitle(tr("Add Counter"));
removeCounterMenu->setTitle(tr("Remove Counter"));
setCounterMenu->setTitle(tr("Set Counters"));
} }
void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

5
cockatrice/src/carditem.h
View file

@ -32,7 +32,7 @@ private:
CardItem *attachedTo; CardItem *attachedTo;
QList<CardItem *> attachedCards; QList<CardItem *> attachedCards;
QMenu *cardMenu, *ptMenu, *moveMenu, *addCounterMenu, *removeCounterMenu, *setCounterMenu; QMenu *cardMenu, *ptMenu, *moveMenu;
void prepareDelete(); void prepareDelete();
public slots: public slots:
@ -75,9 +75,6 @@ public:
QMenu *getCardMenu() const { return cardMenu; } QMenu *getCardMenu() const { return cardMenu; }
QMenu *getPTMenu() const { return ptMenu; } QMenu *getPTMenu() const { return ptMenu; }
QMenu *getMoveMenu() const { return moveMenu; } QMenu *getMoveMenu() const { return moveMenu; }
QMenu *getAddCounterMenu() const { return addCounterMenu; }
QMenu *getRemoveCounterMenu() const { return removeCounterMenu; }
QMenu *getSetCounterMenu() const { return setCounterMenu; }
bool animationEvent(); bool animationEvent();
CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown); CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);

21
cockatrice/src/player.cpp
View file

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