Internet game lobby dialog shows now overview of games and whether they are private. Now showing connection progress before the internet game lobby.

This commit is contained in:
lotodore
2007-09-04 12:44:11 +00:00
parent b0ef569da0
commit 9ed217609b
15 changed files with 105 additions and 40 deletions
+18 -10
View File
@@ -658,8 +658,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
connect(this, SIGNAL(signalNetClientPlayerChanged(unsigned, QString)), myGameLobbyDialog, SLOT(updatePlayer(unsigned, QString)));
connect(this, SIGNAL(signalNetClientPlayerLeft(unsigned, QString)), myGameLobbyDialog, SLOT(removePlayer(unsigned, QString)));
connect(this, SIGNAL(signalNetClientGameListNew(unsigned, QString)), myGameLobbyDialog, SLOT(addGame(unsigned, QString)));
connect(this, SIGNAL(signalNetClientGameListRemove(unsigned, QString)), myGameLobbyDialog, SLOT(removeGame(unsigned, QString)));
connect(this, SIGNAL(signalNetClientGameListNew(unsigned)), myGameLobbyDialog, SLOT(addGame(unsigned)));
connect(this, SIGNAL(signalNetClientGameListRemove(unsigned)), myGameLobbyDialog, SLOT(removeGame(unsigned)));
connect(this, SIGNAL(signalNetClientGameListPlayerJoined(unsigned, unsigned)), myGameLobbyDialog, SLOT(gameAddPlayer(unsigned, unsigned)));
connect(this, SIGNAL(signalNetClientGameListPlayerLeft(unsigned, unsigned)), myGameLobbyDialog, SLOT(gameRemovePlayer(unsigned, unsigned)));
@@ -833,18 +833,26 @@ void mainWindowImpl::callGameLobbyDialog() {
// Start client for dedicated server.
mySession->startInternetClient();
myGameLobbyDialog->exec();
//Dialog mit Statusbalken
myConnectToServerDialog->exec();
if (myGameLobbyDialog->result() == QDialog::Accepted)
{
if(myGameLobbyDialog->getCurrentGameName() != "") {
myStartNetworkGameDialog->setWindowTitle(myGameLobbyDialog->getCurrentGameName());
}
showNetworkStartDialog();
if (myConnectToServerDialog->result() == QDialog::Rejected ) {
mySession->terminateNetworkClient();
}
else
{
mySession->terminateNetworkClient();
myGameLobbyDialog->exec();
if (myGameLobbyDialog->result() == QDialog::Accepted)
{
if(myGameLobbyDialog->getCurrentGameName() != "")
myStartNetworkGameDialog->setWindowTitle(myGameLobbyDialog->getCurrentGameName());
showNetworkStartDialog();
}
else
{
mySession->terminateNetworkClient();
}
}
}