Skip to content
GitLab
Commit 7accc70e authored by Zach's avatar Zach
Browse files

Merge pull request #958 from poixen/additional_separators 

Updated context menus
parents 5117c0e6 1b165bde
Hide whitespace changes
Inline Side-by-side
cockatrice/src/player.cpp
View file @ 7accc70e
...@@ -254,7 +254,9 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare ...@@ -254,7 +254,9 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
moveHandMenu = handMenu->addMenu(QString()); moveHandMenu = handMenu->addMenu(QString());
moveHandMenu->addAction(aMoveHandToTopLibrary); moveHandMenu->addAction(aMoveHandToTopLibrary);
moveHandMenu->addAction(aMoveHandToBottomLibrary); moveHandMenu->addAction(aMoveHandToBottomLibrary);
moveHandMenu->addSeparator();
moveHandMenu->addAction(aMoveHandToGrave); moveHandMenu->addAction(aMoveHandToGrave);
moveHandMenu->addSeparator();
moveHandMenu->addAction(aMoveHandToRfg); moveHandMenu->addAction(aMoveHandToRfg);
hand->setMenu(handMenu); hand->setMenu(handMenu);
...@@ -272,11 +274,13 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare ...@@ -272,11 +274,13 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
playerLists.append(mRevealTopCard = libraryMenu->addMenu(QString())); playerLists.append(mRevealTopCard = libraryMenu->addMenu(QString()));
libraryMenu->addAction(aAlwaysRevealTopCard); libraryMenu->addAction(aAlwaysRevealTopCard);
libraryMenu->addSeparator(); libraryMenu->addSeparator();
libraryMenu->addAction(aMoveTopCardsToGrave);
libraryMenu->addAction(aMoveTopCardsToExile);
libraryMenu->addAction(aMoveTopCardToBottom); libraryMenu->addAction(aMoveTopCardToBottom);
libraryMenu->addAction(aMoveBottomCardToGrave); libraryMenu->addAction(aMoveBottomCardToGrave);
libraryMenu->addSeparator(); libraryMenu->addSeparator();
libraryMenu->addAction(aMoveTopCardsToGrave);
libraryMenu->addSeparator();
libraryMenu->addAction(aMoveTopCardsToExile);
libraryMenu->addSeparator();
libraryMenu->addAction(aOpenDeckInDeckEditor); libraryMenu->addAction(aOpenDeckInDeckEditor);
deck->setMenu(libraryMenu, aDrawCard); deck->setMenu(libraryMenu, aDrawCard);
} else { } else {
...@@ -297,14 +301,18 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare ...@@ -297,14 +301,18 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
moveGraveMenu = graveMenu->addMenu(QString()); moveGraveMenu = graveMenu->addMenu(QString());
moveGraveMenu->addAction(aMoveGraveToTopLibrary); moveGraveMenu->addAction(aMoveGraveToTopLibrary);
moveGraveMenu->addAction(aMoveGraveToBottomLibrary); moveGraveMenu->addAction(aMoveGraveToBottomLibrary);
moveGraveMenu->addSeparator();
moveGraveMenu->addAction(aMoveGraveToHand); moveGraveMenu->addAction(aMoveGraveToHand);
moveGraveMenu->addSeparator();
moveGraveMenu->addAction(aMoveGraveToRfg); moveGraveMenu->addAction(aMoveGraveToRfg);
rfgMenu->addSeparator(); rfgMenu->addSeparator();
moveRfgMenu = rfgMenu->addMenu(QString()); moveRfgMenu = rfgMenu->addMenu(QString());
moveRfgMenu->addAction(aMoveRfgToTopLibrary); moveRfgMenu->addAction(aMoveRfgToTopLibrary);
moveRfgMenu->addAction(aMoveRfgToBottomLibrary); moveRfgMenu->addAction(aMoveRfgToBottomLibrary);
moveRfgMenu->addSeparator();
moveRfgMenu->addAction(aMoveRfgToHand); moveRfgMenu->addAction(aMoveRfgToHand);
moveRfgMenu->addSeparator();
moveRfgMenu->addAction(aMoveRfgToGrave); moveRfgMenu->addAction(aMoveRfgToGrave);
sbMenu = playerMenu->addMenu(QString()); sbMenu = playerMenu->addMenu(QString());
...@@ -683,20 +691,20 @@ void Player::retranslateUi() ...@@ -683,20 +691,20 @@ void Player::retranslateUi()
aSetPT->setShortcut(tr("Ctrl+P")); aSetPT->setShortcut(tr("Ctrl+P"));
aSetAnnotation->setText(tr("&Set annotation...")); aSetAnnotation->setText(tr("&Set annotation..."));
QStringList counterColors; QStringList counterColors;
counterColors.append(tr("red")); counterColors.append(tr("Red"));
counterColors.append(tr("yellow")); counterColors.append(tr("Yellow"));
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("&Add counter (%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("&Remove counter (%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("&Set counters (%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"));
aMoveToBottomLibrary->setText(tr("&bottom of library")); aMoveToBottomLibrary->setText(tr("&Bottom of library"));
aMoveToGraveyard->setText(tr("&graveyard")); aMoveToGraveyard->setText(tr("&Graveyard"));
aMoveToGraveyard->setShortcut(tr("Ctrl+Del")); aMoveToGraveyard->setShortcut(tr("Ctrl+Del"));
aMoveToExile->setText(tr("&exile")); aMoveToExile->setText(tr("&Exile"));
QMapIterator<QString, CardZone *> zoneIterator(zones); QMapIterator<QString, CardZone *> zoneIterator(zones);
while (zoneIterator.hasNext()) while (zoneIterator.hasNext())
...@@ -2181,6 +2189,7 @@ void Player::updateCardMenu(CardItem *card) ...@@ -2181,6 +2189,7 @@ void Player::updateCardMenu(CardItem *card)
moveMenu->addAction(aMoveToBottomLibrary); moveMenu->addAction(aMoveToBottomLibrary);
moveMenu->addSeparator(); moveMenu->addSeparator();
moveMenu->addAction(aMoveToGraveyard); moveMenu->addAction(aMoveToGraveyard);
moveMenu->addSeparator();
moveMenu->addAction(aMoveToExile); moveMenu->addAction(aMoveToExile);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment