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

Merge pull request #597 from ideocl4st/tweak-hand-context-menu

Browse source 
Submenus for moving all cards in a zone to another
This commit is contained in:
Gavin Bisesi 2015-01-26 20:33:17 -05:00
commit 62c4c0f4eb
2 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
cockatrice/src/player.cpp
View file

@ -245,14 +245,16 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
if (local) { if (local) {
handMenu = playerMenu->addMenu(QString()); handMenu = playerMenu->addMenu(QString());
handMenu->addAction(aMulligan);
handMenu->addAction(aMoveHandToTopLibrary);
handMenu->addAction(aMoveHandToBottomLibrary);
handMenu->addAction(aMoveHandToGrave);
handMenu->addAction(aMoveHandToRfg);
handMenu->addSeparator();
playerLists.append(mRevealHand = handMenu->addMenu(QString())); playerLists.append(mRevealHand = handMenu->addMenu(QString()));
playerLists.append(mRevealRandomHandCard = handMenu->addMenu(QString())); playerLists.append(mRevealRandomHandCard = handMenu->addMenu(QString()));
handMenu->addSeparator();
handMenu->addAction(aMulligan);
handMenu->addSeparator();
moveHandMenu = handMenu->addMenu(QString());
moveHandMenu->addAction(aMoveHandToTopLibrary);
moveHandMenu->addAction(aMoveHandToBottomLibrary);
moveHandMenu->addAction(aMoveHandToGrave);
moveHandMenu->addAction(aMoveHandToRfg);
hand->setMenu(handMenu); hand->setMenu(handMenu);
libraryMenu = playerMenu->addMenu(QString()); libraryMenu = playerMenu->addMenu(QString());
@ -268,12 +270,13 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
playerLists.append(mRevealLibrary = libraryMenu->addMenu(QString())); playerLists.append(mRevealLibrary = libraryMenu->addMenu(QString()));
playerLists.append(mRevealTopCard = libraryMenu->addMenu(QString())); playerLists.append(mRevealTopCard = libraryMenu->addMenu(QString()));
libraryMenu->addAction(aAlwaysRevealTopCard); libraryMenu->addAction(aAlwaysRevealTopCard);
libraryMenu->addAction(aOpenDeckInDeckEditor);
libraryMenu->addSeparator(); libraryMenu->addSeparator();
libraryMenu->addAction(aMoveTopCardsToGrave); libraryMenu->addAction(aMoveTopCardsToGrave);
libraryMenu->addAction(aMoveTopCardsToExile); libraryMenu->addAction(aMoveTopCardsToExile);
libraryMenu->addAction(aMoveTopCardToBottom); libraryMenu->addAction(aMoveTopCardToBottom);
libraryMenu->addAction(aMoveBottomCardToGrave); libraryMenu->addAction(aMoveBottomCardToGrave);
libraryMenu->addSeparator();
libraryMenu->addAction(aOpenDeckInDeckEditor);
deck->setMenu(libraryMenu, aDrawCard); deck->setMenu(libraryMenu, aDrawCard);
} else { } else {
handMenu = 0; handMenu = 0;
@ -290,16 +293,18 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
if (local) { if (local) {
graveMenu->addSeparator(); graveMenu->addSeparator();
graveMenu->addAction(aMoveGraveToTopLibrary); moveGraveMenu = graveMenu->addMenu(QString());
graveMenu->addAction(aMoveGraveToBottomLibrary); moveGraveMenu->addAction(aMoveGraveToTopLibrary);
graveMenu->addAction(aMoveGraveToHand); moveGraveMenu->addAction(aMoveGraveToBottomLibrary);
graveMenu->addAction(aMoveGraveToRfg); moveGraveMenu->addAction(aMoveGraveToHand);
moveGraveMenu->addAction(aMoveGraveToRfg);
rfgMenu->addSeparator(); rfgMenu->addSeparator();
rfgMenu->addAction(aMoveRfgToTopLibrary); moveRfgMenu = rfgMenu->addMenu(QString());
rfgMenu->addAction(aMoveRfgToBottomLibrary); moveRfgMenu->addAction(aMoveRfgToTopLibrary);
rfgMenu->addAction(aMoveRfgToHand); moveRfgMenu->addAction(aMoveRfgToBottomLibrary);
rfgMenu->addAction(aMoveRfgToGrave); moveRfgMenu->addAction(aMoveRfgToHand);
moveRfgMenu->addAction(aMoveRfgToGrave);
sbMenu = playerMenu->addMenu(QString()); sbMenu = playerMenu->addMenu(QString());
sbMenu->addAction(aViewSideboard); sbMenu->addAction(aViewSideboard);
@ -585,22 +590,28 @@ void Player::retranslateUi()
rfgMenu->setTitle(tr("&Exile")); rfgMenu->setTitle(tr("&Exile"));
if (local) { if (local) {
aMoveHandToTopLibrary->setText(tr("Move to &top of library")); moveHandMenu->setTitle(tr("&Move hand to..."));
aMoveHandToBottomLibrary->setText(tr("Move to &bottom of library")); aMoveHandToTopLibrary->setText(tr("&Top of library"));
aMoveHandToGrave->setText(tr("Move to &graveyard")); aMoveHandToBottomLibrary->setText(tr("&Bottom of library"));
aMoveHandToRfg->setText(tr("Move to &exile")); aMoveHandToGrave->setText(tr("&Graveyard"));
aMoveGraveToTopLibrary->setText(tr("Move to &top of library")); aMoveHandToRfg->setText(tr("&Exile"));
aMoveGraveToBottomLibrary->setText(tr("Move to &bottom of library"));
aMoveGraveToHand->setText(tr("Move to &hand")); moveGraveMenu->setTitle(tr("&Move graveyard to..."));
aMoveGraveToRfg->setText(tr("Move to &exile")); aMoveGraveToTopLibrary->setText(tr("&Top of library"));
aMoveRfgToTopLibrary->setText(tr("Move to &top of library")); aMoveGraveToBottomLibrary->setText(tr("&Bottom of library"));
aMoveRfgToBottomLibrary->setText(tr("Move to &bottom of library")); aMoveGraveToHand->setText(tr("&Hand"));
aMoveRfgToHand->setText(tr("Move to &hand")); aMoveGraveToRfg->setText(tr("&Exile"));
aMoveRfgToGrave->setText(tr("Move to &graveyard"));
moveRfgMenu->setTitle(tr("&Move exile to..."));
aMoveRfgToTopLibrary->setText(tr("&Top of library"));
aMoveRfgToBottomLibrary->setText(tr("&Bottom of library"));
aMoveRfgToHand->setText(tr("&Hand"));
aMoveRfgToGrave->setText(tr("&Graveyard"));
aViewLibrary->setText(tr("&View library")); aViewLibrary->setText(tr("&View library"));
aViewTopCards->setText(tr("View &top cards of library...")); aViewTopCards->setText(tr("View &top cards of library..."));
mRevealLibrary->setTitle(tr("Reveal &library to")); mRevealLibrary->setTitle(tr("Reveal &library to..."));
mRevealTopCard->setTitle(tr("Reveal t&op card to")); mRevealTopCard->setTitle(tr("Reveal t&op card to..."));
aAlwaysRevealTopCard->setText(tr("&Always reveal top card")); aAlwaysRevealTopCard->setText(tr("&Always reveal top card"));
aOpenDeckInDeckEditor->setText(tr("O&pen deck in deck editor")); aOpenDeckInDeckEditor->setText(tr("O&pen deck in deck editor"));
aViewSideboard->setText(tr("&View sideboard")); aViewSideboard->setText(tr("&View sideboard"));
@ -615,8 +626,8 @@ void Player::retranslateUi()
aMoveBottomCardToGrave->setText(tr("Put bottom card &in graveyard")); aMoveBottomCardToGrave->setText(tr("Put bottom card &in graveyard"));
handMenu->setTitle(tr("&Hand")); handMenu->setTitle(tr("&Hand"));
mRevealHand->setTitle(tr("&Reveal to")); mRevealHand->setTitle(tr("&Reveal hand to..."));
mRevealRandomHandCard->setTitle(tr("Reveal r&andom card to")); mRevealRandomHandCard->setTitle(tr("Reveal r&andom card to..."));
sbMenu->setTitle(tr("&Sideboard")); sbMenu->setTitle(tr("&Sideboard"));
libraryMenu->setTitle(tr("&Library")); libraryMenu->setTitle(tr("&Library"));
countersMenu->setTitle(tr("&Counters")); countersMenu->setTitle(tr("&Counters"));

2
cockatrice/src/player.h
View file

@ -159,7 +159,7 @@ private slots:
private: private:
TabGame *game; TabGame *game;
QMenu *playerMenu, *handMenu, *graveMenu, *rfgMenu, *libraryMenu, *sbMenu, *countersMenu, *sayMenu, *createPredefinedTokenMenu, QMenu *playerMenu, *handMenu, *moveHandMenu, *graveMenu, *moveGraveMenu, *rfgMenu, *moveRfgMenu, *libraryMenu, *sbMenu, *countersMenu, *sayMenu, *createPredefinedTokenMenu,
*mRevealLibrary, *mRevealTopCard, *mRevealHand, *mRevealRandomHandCard; *mRevealLibrary, *mRevealTopCard, *mRevealHand, *mRevealRandomHandCard;
QList<QMenu *> playerLists; QList<QMenu *> playerLists;
QList<QAction *> allPlayersActions; QList<QAction *> allPlayersActions;