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

Enable tear-off on menus. (#3772)

Browse source
This commit is contained in:
Rob Blanckaert 2019-07-11 19:53:43 -07:00 committed by Zach H
parent a3a1e20074
commit 2ef3e6fc93
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/abstractcounter.cpp
View file

@ -31,6 +31,7 @@ AbstractCounter::AbstractCounter(Player *_player,
if (player->getLocalOrJudge()) { if (player->getLocalOrJudge()) {
menu = new QMenu(name); menu = new QMenu(name);
menu->setTearOffEnabled(true);
aSet = new QAction(this); aSet = new QAction(this);
connect(aSet, SIGNAL(triggered()), this, SLOT(setCounter())); connect(aSet, SIGNAL(triggered()), this, SLOT(setCounter()));
menu->addAction(aSet); menu->addAction(aSet);

8
cockatrice/src/player.cpp
View file

@ -243,9 +243,11 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
playerMenu = new QMenu(QString()); playerMenu = new QMenu(QString());
table->setMenu(playerMenu); table->setMenu(playerMenu);
playerMenu->setTearOffEnabled(true);
if (local || judge) { if (local || judge) {
handMenu = playerMenu->addMenu(QString()); handMenu = playerMenu->addMenu(QString());
handMenu->setTearOffEnabled(true);
handMenu->addAction(aViewHand); handMenu->addAction(aViewHand);
playerLists.append(mRevealHand = handMenu->addMenu(QString())); playerLists.append(mRevealHand = handMenu->addMenu(QString()));
playerLists.append(mRevealRandomHandCard = handMenu->addMenu(QString())); playerLists.append(mRevealRandomHandCard = handMenu->addMenu(QString()));
@ -253,6 +255,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
handMenu->addAction(aMulligan); handMenu->addAction(aMulligan);
handMenu->addSeparator(); handMenu->addSeparator();
moveHandMenu = handMenu->addMenu(QString()); moveHandMenu = handMenu->addMenu(QString());
moveHandMenu->setTearOffEnabled(true);
moveHandMenu->addAction(aMoveHandToTopLibrary); moveHandMenu->addAction(aMoveHandToTopLibrary);
moveHandMenu->addAction(aMoveHandToBottomLibrary); moveHandMenu->addAction(aMoveHandToBottomLibrary);
moveHandMenu->addSeparator(); moveHandMenu->addSeparator();
@ -262,6 +265,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
hand->setMenu(handMenu); hand->setMenu(handMenu);
libraryMenu = playerMenu->addMenu(QString()); libraryMenu = playerMenu->addMenu(QString());
libraryMenu->setTearOffEnabled(true);
libraryMenu->addAction(aDrawCard); libraryMenu->addAction(aDrawCard);
libraryMenu->addAction(aDrawCards); libraryMenu->addAction(aDrawCards);
libraryMenu->addAction(aUndoDraw); libraryMenu->addAction(aUndoDraw);
@ -292,6 +296,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
} }
graveMenu = playerMenu->addMenu(QString()); graveMenu = playerMenu->addMenu(QString());
graveMenu->setTearOffEnabled(true);
graveMenu->addAction(aViewGraveyard); graveMenu->addAction(aViewGraveyard);
if (local || judge) { if (local || judge) {
@ -305,12 +310,14 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
grave->setMenu(graveMenu, aViewGraveyard); grave->setMenu(graveMenu, aViewGraveyard);
rfgMenu = playerMenu->addMenu(QString()); rfgMenu = playerMenu->addMenu(QString());
rfgMenu->setTearOffEnabled(true);
rfgMenu->addAction(aViewRfg); rfgMenu->addAction(aViewRfg);
rfg->setMenu(rfgMenu, aViewRfg); rfg->setMenu(rfgMenu, aViewRfg);
if (local || judge) { if (local || judge) {
graveMenu->addSeparator(); graveMenu->addSeparator();
moveGraveMenu = graveMenu->addMenu(QString()); moveGraveMenu = graveMenu->addMenu(QString());
moveGraveMenu->setTearOffEnabled(true);
moveGraveMenu->addAction(aMoveGraveToTopLibrary); moveGraveMenu->addAction(aMoveGraveToTopLibrary);
moveGraveMenu->addAction(aMoveGraveToBottomLibrary); moveGraveMenu->addAction(aMoveGraveToBottomLibrary);
moveGraveMenu->addSeparator(); moveGraveMenu->addSeparator();
@ -320,6 +327,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
rfgMenu->addSeparator(); rfgMenu->addSeparator();
moveRfgMenu = rfgMenu->addMenu(QString()); moveRfgMenu = rfgMenu->addMenu(QString());
moveRfgMenu->setTearOffEnabled(true);
moveRfgMenu->addAction(aMoveRfgToTopLibrary); moveRfgMenu->addAction(aMoveRfgToTopLibrary);
moveRfgMenu->addAction(aMoveRfgToBottomLibrary); moveRfgMenu->addAction(aMoveRfgToBottomLibrary);
moveRfgMenu->addSeparator(); moveRfgMenu->addSeparator();

2
cockatrice/src/tab_game.cpp
View file

@ -1382,6 +1382,8 @@ void TabGame::createMenuItems()
aCloseReplay = nullptr; aCloseReplay = nullptr;
phasesMenu = new QMenu(this); phasesMenu = new QMenu(this);
phasesMenu->setTearOffEnabled(true);
for (int i = 0; i < phasesToolbar->phaseCount(); ++i) { for (int i = 0; i < phasesToolbar->phaseCount(); ++i) {
QAction *temp = new QAction(QString(), this); QAction *temp = new QAction(QString(), this);
connect(temp, SIGNAL(triggered()), this, SLOT(actPhaseAction())); connect(temp, SIGNAL(triggered()), this, SLOT(actPhaseAction()));