diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index 4e832cf0..e00c9a96 100644 --- a/cockatrice/src/gameselector.cpp +++ b/cockatrice/src/gameselector.cpp @@ -36,7 +36,6 @@ GameSelector::GameSelector(AbstractClient *_client, { gameListView = new QTreeView; gameListModel = new GamesModel(_rooms, _gameTypes, this); - filteredGamesLabel = new QLabel; if (showFilters) { gameListProxyModel = new GamesProxyModel(this, tabSupervisor); gameListProxyModel->setSourceModel(gameListModel); @@ -90,7 +89,6 @@ GameSelector::GameSelector(AbstractClient *_client, if (showFilters) { buttonLayout->addWidget(filterButton); buttonLayout->addWidget(clearFilterButton); - buttonLayout->addWidget(filteredGamesLabel); } buttonLayout->addStretch(); if (room) @@ -133,7 +131,7 @@ void GameSelector::processAddToListEvent(const Event_AddToList &event) if (event.list_name() == "ignore") { gameListProxyModel->refresh(); } - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::processRemoveFromListEvent(const Event_RemoveFromList &event) @@ -141,7 +139,7 @@ void GameSelector::processRemoveFromListEvent(const Event_RemoveFromList &event) if (event.list_name() == "ignore") { gameListProxyModel->refresh(); } - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::actSetFilter() @@ -163,7 +161,7 @@ void GameSelector::actSetFilter() gameListProxyModel->setMaxPlayersFilter(dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax()); gameListProxyModel->saveFilterParameters(gameTypeMap); - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::actClearFilter() @@ -173,7 +171,7 @@ void GameSelector::actClearFilter() gameListProxyModel->resetFilterParameters(); gameListProxyModel->saveFilterParameters(gameTypeMap); - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::actCreate() @@ -185,7 +183,7 @@ void GameSelector::actCreate() DlgCreateGame dlg(room, room->getGameTypes(), this); dlg.exec(); - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::checkResponse(const Response &response) @@ -267,7 +265,6 @@ void GameSelector::actJoin() void GameSelector::retranslateUi() { - setTitle(tr("Games")); filterButton->setText(tr("&Filter games")); clearFilterButton->setText(tr("C&lear filter")); if (createButton) @@ -275,13 +272,13 @@ void GameSelector::retranslateUi() joinButton->setText(tr("&Join")); spectateButton->setText(tr("J&oin as spectator")); - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::processGameInfo(const ServerInfo_Game &info) { gameListModel->updateGameList(info); - setFilteredGamesLabel(); + updateTitle(); } void GameSelector::actSelectedGameChanged(const QModelIndex ¤t, const QModelIndex & /* previous */) @@ -296,11 +293,13 @@ void GameSelector::actSelectedGameChanged(const QModelIndex ¤t, const QMod joinButton->setEnabled(game.player_count() < game.max_players() || overrideRestrictions); } -void GameSelector::setFilteredGamesLabel() +void GameSelector::updateTitle() { if (showFilters) { const int totalGames = gameListModel->rowCount(); const int shownGames = totalGames - gameListProxyModel->getNumFilteredGames(); - filteredGamesLabel->setText(tr("Games shown: %1 / %2").arg(shownGames).arg(totalGames)); + setTitle(tr("Games shown: %1 / %2").arg(shownGames).arg(totalGames)); + } else { + setTitle(tr("Games")); } } diff --git a/cockatrice/src/gameselector.h b/cockatrice/src/gameselector.h index e2624512..e04ec905 100644 --- a/cockatrice/src/gameselector.h +++ b/cockatrice/src/gameselector.h @@ -45,11 +45,10 @@ private: GamesModel *gameListModel; GamesProxyModel *gameListProxyModel; QPushButton *filterButton, *clearFilterButton, *createButton, *joinButton, *spectateButton; - QLabel *filteredGamesLabel; const bool showFilters; GameTypeMap gameTypeMap; - void setFilteredGamesLabel(); + void updateTitle(); public: GameSelector(AbstractClient *_client,