diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index e161787ef..391870ab4 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -169,7 +169,6 @@ void TabGame::connectToGameEventHandler() void TabGame::connectMessageLogToGameEventHandler() { - // connect(game->getGameEventHandler(), &GameEventHandler:: , messageLog, &MessageLogWidget::); connect(game->getGameEventHandler(), &GameEventHandler::gameFlooded, messageLog, &MessageLogWidget::logGameFlooded); connect(game->getGameEventHandler(), &GameEventHandler::containerProcessingStarted, messageLog, &MessageLogWidget::containerProcessingStarted); @@ -366,7 +365,7 @@ void TabGame::retranslateUi() QMapIterator i(game->getPlayerManager()->getPlayers()); while (i.hasNext()) - i.next().value()->retranslateUi(); + i.next().value()->getGraphicsItem()->retranslateUi(); QMapIterator j(deckViewContainers); while (j.hasNext()) j.next().value()->playerDeckView->retranslateUi(); diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 58c5ed5f7..7e1824b18 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -71,19 +71,6 @@ Player::~Player() delete getPlayerInfo()->userInfo; } -void Player::retranslateUi() -{ - QMapIterator zoneIterator(zones); - while (zoneIterator.hasNext()) { - emit zoneIterator.next().value()->retranslateUi(); - } - - QMapIterator counterIterator(counters); - while (counterIterator.hasNext()) { - counterIterator.next().value()->retranslateUi(); - } -} - void Player::clear() { clearArrows(); diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 6382eb79b..6598b4a04 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -76,7 +76,6 @@ public slots: public: Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, Game *_parent); ~Player() override; - void retranslateUi(); void initializeZones(); void updateZones(); diff --git a/cockatrice/src/game/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp index d1c278e8d..9b9a6c66c 100644 --- a/cockatrice/src/game/player/player_graphics_item.cpp +++ b/cockatrice/src/game/player/player_graphics_item.cpp @@ -24,7 +24,23 @@ PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player) updateBoundingRect(); rearrangeZones(); - // retranslateUi(); + retranslateUi(); +} + +void PlayerGraphicsItem::retranslateUi() +{ + player->getPlayerMenu()->retranslateUi(); + + QMapIterator zoneIterator(player->getZones()); + while (zoneIterator.hasNext()) { + emit zoneIterator.next().value()->retranslateUi(); + } + + QMapIterator counterIterator(player->getCounters()); + while (counterIterator.hasNext()) { + counterIterator.next().value()->retranslateUi(); + } + } void PlayerGraphicsItem::onPlayerActiveChanged(bool _active) diff --git a/cockatrice/src/game/player/player_graphics_item.h b/cockatrice/src/game/player/player_graphics_item.h index dc4dba237..9609e6b4a 100644 --- a/cockatrice/src/game/player/player_graphics_item.h +++ b/cockatrice/src/game/player/player_graphics_item.h @@ -91,6 +91,7 @@ public: public slots: void onPlayerActiveChanged(bool _active); + void retranslateUi(); signals: void sizeChanged();