diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui index 0ea2d2f6..6b42066c 100644 --- a/src/gui/qt/gamelobbydialog.ui +++ b/src/gui/qt/gamelobbydialog.ui @@ -223,13 +223,20 @@ 0 - + - Join &any game + &Join Game - :/gfx/transform-rotate.png:/gfx/transform-rotate.png + :/gfx/go-next-view.png:/gfx/go-next-view.png + + + + + + + true @@ -260,17 +267,6 @@ - - - - &Join Game - - - - :/gfx/go-next-view.png:/gfx/go-next-view.png - - - @@ -533,7 +529,7 @@ 200 - + 4 @@ -957,9 +953,7 @@ comboBox_nickListFilter comboBox_gameListFilter treeView_GameList - pushButton_joinAnyGame pushButton_CreateGame - pushButton_JoinGame textBrowser_ChatDisplay lineEdit_ChatInput treeWidget_connectedPlayers diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 5c4de2e3..69633b2f 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -86,8 +86,10 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) //HTML stuff QString pokerthDotNet("http://www.pokerth.net"); QString clickToRanking(QString("%1").arg(tr("Click here to view the online rankings"))); + QString clickToSpectate(QString("%1").arg(tr("Spectate"))); label_pokerthDotNet->setText(pokerthDotNet); label_rankings->setText(clickToRanking); + label_spectate->setText(clickToSpectate); waitStartGameMsgBoxTimer = new QTimer(this); waitStartGameMsgBoxTimer->setSingleShot(true); @@ -219,7 +221,6 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) connect( pushButton_CreateGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); connect( pushButton_JoinGame, SIGNAL( clicked() ), this, SLOT( joinGame() ) ); - connect( pushButton_joinAnyGame, SIGNAL( clicked() ), this, SLOT( joinAnyGame() ) ); connect( pushButton_StartGame, SIGNAL( clicked() ), this, SLOT( startGame() ) ); connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) ); connect( pushButton_Leave, SIGNAL( clicked() ), this, SLOT( leaveGame() ) ); @@ -414,37 +415,6 @@ void gameLobbyDialogImpl::joinGame() } } -void gameLobbyDialogImpl::joinAnyGame() -{ - - if(comboBox_gameListFilter->currentIndex() != 3 && comboBox_gameListFilter->currentIndex() != 0 && comboBox_gameListFilter->currentIndex() != 5) comboBox_gameListFilter->setCurrentIndex(0); - - bool found = false; - - int it = 0; - int gameToJoinId = 0; - int mostConnectedPlayers = 0; - - while (myGameListModel->item(it)) { - - int players = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",0,0).toInt(); - int maxPlayers = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",1,1).toInt(); - if (myGameListModel->item(it, 2)->data(16) == "open" && myGameListModel->item(it, 4)->data(16) == "nonpriv" && players < maxPlayers) { - if(players > mostConnectedPlayers) { - mostConnectedPlayers = players; - gameToJoinId = it; - } - found = true; - } - it++; - } - - if(found) { - treeView_GameList->setCurrentIndex(myGameListSortFilterProxyModel->mapFromSource(myGameListModel->item(gameToJoinId)->index())); - joinGame(); - } -} - void gameLobbyDialogImpl::refresh(int actionID) { @@ -773,9 +743,6 @@ void gameLobbyDialogImpl::refreshGameStats() label_openGamesCounter->setText(" | "+tr("running games: %1").arg(runningGamesCounter)); label_runningGamesCounter->setText(" | "+tr("open games: %1").arg(openGamesCounter)); - //refresh joinAnyGameButton state - joinAnyGameButtonRefresh(); - } void gameLobbyDialogImpl::refreshPlayerStats() @@ -910,8 +877,6 @@ void gameLobbyDialogImpl::clearDialog() pushButton_CreateGame->show(); pushButton_JoinGame->show(); pushButton_JoinGame->setEnabled(false); - pushButton_joinAnyGame->show(); - pushButton_joinAnyGame->setEnabled(false); QStringList headerList; headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P") << tr("Time"); @@ -1245,7 +1210,6 @@ void gameLobbyDialogImpl::joinedGameDialogUpdate() treeWidget_connectedPlayers->clear(); pushButton_CreateGame->hide(); pushButton_JoinGame->hide(); - pushButton_joinAnyGame->hide(); pushButton_Leave->show(); pushButton_Leave->setEnabled(true); @@ -1315,8 +1279,6 @@ void gameLobbyDialogImpl::leftGameDialogUpdate() pushButton_CreateGame->show(); pushButton_JoinGame->show(); pushButton_JoinGame->setEnabled(false); - pushButton_joinAnyGame->show(); - joinAnyGameButtonRefresh(); lineEdit_ChatInput->setFocus(); } @@ -1502,26 +1464,6 @@ void gameLobbyDialogImpl::hideWaitStartGameMsgBox() waitRejoinStartGameMsgBox->hide(); } -void gameLobbyDialogImpl::joinAnyGameButtonRefresh() -{ - - int openNonPrivateNonFullGamesCounter = 0; - - int it = 0; - while (myGameListModel->item(it)) { - - int players = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",0,0).toInt(); - int maxPlayers = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",1,1).toInt(); - if (myGameListModel->item(it, 2)->data(16) == "open" && myGameListModel->item(it, 4)->data(16) == "nonpriv" && players < maxPlayers) { - openNonPrivateNonFullGamesCounter++; - } - ++it; - } - - if(openNonPrivateNonFullGamesCounter) pushButton_joinAnyGame->setEnabled(true); - else pushButton_joinAnyGame->setEnabled(false); -} - void gameLobbyDialogImpl::reject() { myStartWindow->show(); diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h index dbf6b3f6..a564a349 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h @@ -84,7 +84,6 @@ public slots: void createGame(); void joinGame(); - void joinAnyGame(); void gameSelected(const QModelIndex &); void updateGameItem(QList , unsigned gameId); void addGame(unsigned gameId); @@ -131,7 +130,6 @@ public slots: void showWaitStartGameMsgBox(); void hideWaitStartGameMsgBox(); void stopWaitStartGameMsgBoxTimer(); - void joinAnyGameButtonRefresh(); void reject(); void closeEvent(QCloseEvent *event); void accept(); diff --git a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui index dffffa8b..0eac1e19 100644 --- a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui +++ b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui @@ -63,7 +63,16 @@ Games - + + 0 + + + 0 + + + 0 + + 0 @@ -306,11 +315,20 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 - + 0 @@ -327,11 +345,18 @@ QObject {font: bold 20px} - Join &any game + &Join Game - :/gfx/transform-rotate.png:/gfx/transform-rotate.png + :/gfx/go-next-view.png:/gfx/go-next-view.png + + + + + + + true @@ -374,32 +399,6 @@ - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QObject {font: bold 20px} - - - &Join Game - - - - :/gfx/go-next-view.png:/gfx/go-next-view.png - - - @@ -465,10 +464,19 @@ Game Info - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -481,7 +489,16 @@ Players - + + 0 + + + 0 + + + 0 + + 0 @@ -533,7 +550,16 @@ Spectators - + + 0 + + + 0 + + + 0 + + 0 @@ -577,20 +603,29 @@ 0 0 - 288 - 195 + 292 + 199 + + 4 + + + 4 + + + 4 + + + 4 + - -1 + 6 2 - - 4 - @@ -858,7 +893,16 @@ Lobby-Chat - + + 0 + + + 0 + + + 0 + + 0 @@ -1159,9 +1203,7 @@ p, li { white-space: pre-wrap; } - pushButton_joinAnyGame pushButton_CreateGame - pushButton_JoinGame textBrowser_ChatDisplay lineEdit_ChatInput treeWidget_connectedPlayers