diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index e0511f2f1..6bba8f4e9 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -60,9 +60,9 @@ PlayerMenu::PlayerMenu(Player *_player) : player(_player) utilityMenu = new UtilityMenu(player, playerMenu); } else { - countersMenu = nullptr; sideboardMenu = nullptr; customZonesMenu = nullptr; + countersMenu = nullptr; utilityMenu = nullptr; } @@ -101,13 +101,6 @@ void PlayerMenu::setMenusForGraphicItems() } } -void PlayerMenu::refreshShortcuts() -{ - if (shortcutsActive) { - setShortcutsActive(); - } -} - void PlayerMenu::addPlayer(Player *playerToAdd) { if (playerToAdd == nullptr || playerToAdd == player) { @@ -214,27 +207,54 @@ QMenu *PlayerMenu::updateCardMenu(const CardItem *card) void PlayerMenu::retranslateUi() { playerMenu->setTitle(tr("Player \"%1\"").arg(player->getPlayerInfo()->getName())); + + if (handMenu) { + handMenu->retranslateUi(); + } + if (libraryMenu) { + libraryMenu->retranslateUi(); + } + graveMenu->retranslateUi(); rfgMenu->retranslateUi(); - if (player->getPlayerInfo()->getLocalOrJudge()) { - handMenu->retranslateUi(); - libraryMenu->retranslateUi(); + if (sideboardMenu) { sideboardMenu->retranslateUi(); - utilityMenu->retranslateUi(); - countersMenu->setTitle(tr("&Counters")); - customZonesMenu->retranslateUi(); - - for (auto &allPlayersAction : allPlayersActions) { - allPlayersAction->setText(tr("&All players")); - } } - if (player->getPlayerInfo()->getLocal()) { + if (countersMenu) { + countersMenu->setTitle(tr("&Counters")); + } + + if (customZonesMenu) { + customZonesMenu->retranslateUi(); + } + + QMapIterator counterIterator(player->getCounters()); + while (counterIterator.hasNext()) { + counterIterator.next().value()->retranslateUi(); + } + + if (utilityMenu) { + utilityMenu->retranslateUi(); + } + + for (auto &allPlayersAction : allPlayersActions) { + allPlayersAction->setText(tr("&All players")); + } + + if (sayMenu) { sayMenu->setTitle(tr("S&ay")); } } +void PlayerMenu::refreshShortcuts() +{ + if (shortcutsActive) { + setShortcutsActive(); + } +} + void PlayerMenu::setShortcutsActive() { shortcutsActive = true; @@ -246,22 +266,45 @@ void PlayerMenu::setShortcutsActive() libraryMenu->setShortcutsActive(); } graveMenu->setShortcutsActive(); - if (utilityMenu) { - utilityMenu->setShortcutsActive(); + // No shortcuts for RfgMenu yet + + if (sideboardMenu) { + sideboardMenu->setShortcutsActive(); } QMapIterator counterIterator(player->getCounters()); while (counterIterator.hasNext()) { counterIterator.next().value()->setShortcutsActive(); } + + if (utilityMenu) { + utilityMenu->setShortcutsActive(); + } } void PlayerMenu::setShortcutsInactive() { shortcutsActive = false; + if (handMenu) { + handMenu->setShortcutsInactive(); + } + if (libraryMenu) { + libraryMenu->setShortcutsInactive(); + } + graveMenu->setShortcutsInactive(); + // No shortcuts for RfgMenu yet + + if (sideboardMenu) { + sideboardMenu->setShortcutsInactive(); + } + QMapIterator counterIterator(player->getCounters()); while (counterIterator.hasNext()) { counterIterator.next().value()->setShortcutsInactive(); } + + if (utilityMenu) { + utilityMenu->setShortcutsInactive(); + } } \ No newline at end of file