From 2748799679f3a2b6bd8894a946da16ef206f37f5 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Wed, 17 Sep 2008 21:50:51 +0000
Subject: [PATCH] next steps startwindow-integration --> UNSTABLE

---
 .../93dec21823a314fb8ef2261b7aa75ae5.png      | Bin 5458 -> 0 bytes
 .../d90bd3fbbe3671ebac5f9f223d0c6d65.png      | Bin 5266 -> 0 bytes
 src/game_defs.h                               |   2 +-
 src/gui/qt/gametable/gametableimpl.cpp        | 430 +-----------------
 src/gui/qt/gametable/gametableimpl.h          |  67 +--
 src/gui/qt/guiwrapper.cpp                     |  10 +-
 .../selectavatardialogimpl.cpp                |   2 -
 src/gui/qt/startwindow.ui                     |  22 +-
 src/gui/qt/startwindow/startwindowimpl.cpp    | 357 ++++++++++++++-
 src/gui/qt/startwindow/startwindowimpl.h      |   9 +
 10 files changed, 393 insertions(+), 506 deletions(-)
 delete mode 100644 data/gfx/avatars/default/people/93dec21823a314fb8ef2261b7aa75ae5.png
 delete mode 100644 data/gfx/avatars/default/people/d90bd3fbbe3671ebac5f9f223d0c6d65.png

diff --git a/data/gfx/avatars/default/people/93dec21823a314fb8ef2261b7aa75ae5.png b/data/gfx/avatars/default/people/93dec21823a314fb8ef2261b7aa75ae5.png
deleted file mode 100644
index 15db27a3c7c9399fa49700a93fc6a59191adafd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5458
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
IM6N<$f}N9@s{jB1

diff --git a/data/gfx/avatars/default/people/d90bd3fbbe3671ebac5f9f223d0c6d65.png b/data/gfx/avatars/default/people/d90bd3fbbe3671ebac5f9f223d0c6d65.png
deleted file mode 100644
index e8b697cf1980c089d2c16425ef46c0ad90040c08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5266
zcmV;D6m9E?P)<h;3K|Lk000e1NJLTq001%o001%w0ssI2kzF6=000zONkl<ZScN@#
z*^;E`Z5@Db{g=!?D>JLQx@RRh^l)UEwn8E=6p}4o_yOebQ~2q8rI5ppFzp*VLMCN}
zESVgR#94Z}r@JaEw}1Ioz!yy!4}icy1P*Wx@ZbLFAD0}7>rK->>$+{*q_8M!K2XxH
z*X`!!6v7u@f5|ES^Y4A~gBR~N)@f($uyS1ws7lI`6S1(eL_~;EnM*1q)skv0974_+
z08kM#ROV7jjPY>3X3nXkQn`RS#{Ao-^S8&7?|dmmBVsC<n3)+7MUaekjYp5yoboij
zdi~w$?c--Z{N#gY_o~(yV+Fz45Nf3ia6tef0z@e_)ylaD7nF)3N<a{mQVb{}rDSH7
zDpEyj5>^bFAxjYvAtLRp)>=e#EO}a@Q&6}9ksv5-NU2fkFsy$0SAPw;{+mDf<NeJI
z#|XxuB4Ci1Sr$=|0T7WD7=<aN5)(6{0Ft0EfPm6O3I%E|AgD+yA`#R%0Ai^ETx;Q!
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
Yf0(-P_KM7A?EnA(07*qoM6N<$g6Yk1`Tzg`

diff --git a/src/game_defs.h b/src/game_defs.h
index 55537bb2..ceb01902 100644
--- a/src/game_defs.h
+++ b/src/game_defs.h
@@ -33,7 +33,7 @@
 #define POKERTH_VERSION			((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR)
 
 #define POKERTH_BETA_REVISION	0
-#define POKERTH_BETA_RELEASE_STRING	"0.6.2"
+#define POKERTH_BETA_RELEASE_STRING	"0.6.3"
 
 enum ServerNetworkMode {
 	NETWORK_MODE_TCP = 1,
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 76c895fd..bf70ef40 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -19,20 +19,8 @@
  ***************************************************************************/
 #include "gametableimpl.h"
 
-#include "newgamedialogimpl.h"
-#include "aboutpokerthimpl.h"
 #include "mymessagedialogimpl.h"
 #include "settingsdialogimpl.h"
-#include "selectavatardialogimpl.h"
-#include "joinnetworkgamedialogimpl.h"
-#include "connecttoserverdialogimpl.h"
-#include "createnetworkgamedialogimpl.h"
-#include "startnetworkgamedialogimpl.h"
-#include "changehumanplayernamedialogimpl.h"
-#include "changecompleteblindsdialogimpl.h"
-#include "gamelobbydialogimpl.h"
-#include "timeoutmsgboximpl.h"
-#include "lobbychat.h"
 #include "startwindowimpl.h"
 
 #include "startsplash.h"
@@ -472,17 +460,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
         }
 
 // 	Dialogs
-// 	myNewGameDialog = boost::shared_ptr<newGameDialogImpl>(new newGameDialogImpl(this, myConfig));
-// // 	mySelectAvatarDialog = boost::shared_ptr<selectAvatarDialogImpl>(new selectAvatarDialogImpl(this, myConfig));
-// // // 	mySettingsDialog = boost::shared_ptr<settingsDialogImpl>(new settingsDialogImpl(this, myConfig, mySelectAvatarDialog.get()));	
-// // 	myChangeHumanPlayerNameDialog = boost::shared_ptr<changeHumanPlayerNameDialogImpl>(new changeHumanPlayerNameDialogImpl(this, myConfig));
-// // 	myJoinNetworkGameDialog = boost::shared_ptr<joinNetworkGameDialogImpl>(new joinNetworkGameDialogImpl(this, myConfig));
-// // 	myConnectToServerDialog = boost::shared_ptr<connectToServerDialogImpl>(new connectToServerDialogImpl(this));
-// // 	myStartNetworkGameDialog = boost::shared_ptr<startNetworkGameDialogImpl>(new startNetworkGameDialogImpl(this, myConfig));
-// // 	myCreateNetworkGameDialog = boost::shared_ptr<createNetworkGameDialogImpl>(new createNetworkGameDialogImpl(this, myConfig));
-	
-	myTimeoutDialog.reset(new timeoutMsgBoxImpl(this));
-
 	myChat = new Chat(this, myConfig);
 
 	lineEdit_ChatInput->installEventFilter(this);
@@ -558,9 +535,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 
 	//Nachrichten Thread-Save
 	connect(this, SIGNAL(signalInitGui(int)), this, SLOT(initGui(int)));
-
-// 	connect(this, SIGNAL(signalShowClientDialog()), this, SLOT(showClientDialog()));
-
 	connect(this, SIGNAL(signalRefreshSet()), this, SLOT(refreshSet()));
 	connect(this, SIGNAL(signalRefreshCash()), this, SLOT(refreshCash()));
 	connect(this, SIGNAL(signalRefreshAction(int, int)), this, SLOT(refreshAction(int, int)));
@@ -572,26 +546,19 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalRefreshButton()), this, SLOT(refreshButton()));
 	connect(this, SIGNAL(signalRefreshGameLabels(int)), this, SLOT(refreshGameLabels(int)));
 	connect(this, SIGNAL(signalSetPlayerAvatar(int, QString)), this, SLOT(setPlayerAvatar(int, QString))); 
-// 	connect(this, SIGNAL(signalSetPlayerAvatar(int, QString)), myGameLobbyDialog.get(), SLOT(refreshConnectedPlayerAvatars())); 
-
 	connect(this, SIGNAL(signalGuiUpdateDone()), this, SLOT(guiUpdateDone()));
-
 	connect(this, SIGNAL(signalMeInAction()), this, SLOT(meInAction()));
 	connect(this, SIGNAL(signalDisableMyButtons()), this, SLOT(disableMyButtons()));
 	connect(this, SIGNAL(signalUpdateMyButtonsState()), this, SLOT(updateMyButtonsState()));
 	connect(this, SIGNAL(signalStartTimeoutAnimation(int, int)), this, SLOT(startTimeoutAnimation(int, int)));
 	connect(this, SIGNAL(signalStopTimeoutAnimation(int)), this, SLOT(stopTimeoutAnimation(int)));
-
 	connect(this, SIGNAL(signalDealBeRoCards(int)), this, SLOT(dealBeRoCards(int)));
 	connect(this, SIGNAL(signalDealHoleCards()), this, SLOT(dealHoleCards()));
 	connect(this, SIGNAL(signalDealFlopCards0()), this, SLOT(dealFlopCards0()));
 	connect(this, SIGNAL(signalDealTurnCards0()), this, SLOT(dealTurnCards0()));
 	connect(this, SIGNAL(signalDealRiverCards0()), this, SLOT(dealRiverCards0()));
-
 	connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation()));
-
 	connect(this, SIGNAL(signalBeRoAnimation2(int)), this, SLOT(beRoAnimation2(int)));
-
 	connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1()));
 	connect(this, SIGNAL(signalPreflopAnimation2()), this, SLOT(preflopAnimation2()));
 	connect(this, SIGNAL(signalFlopAnimation1()), this, SLOT(flopAnimation1()));
@@ -602,59 +569,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalRiverAnimation2()), this, SLOT(riverAnimation2()));
 	connect(this, SIGNAL(signalPostRiverAnimation1()), this, SLOT(postRiverAnimation1()));
 	connect(this, SIGNAL(signalPostRiverRunAnimation1()), this, SLOT(postRiverRunAnimation1()));
-
 	connect(this, SIGNAL(signalFlipHolecardsAllIn()), this, SLOT(flipHolecardsAllIn()));
-
 	connect(this, SIGNAL(signalNextRoundCleanGui()), this, SLOT(nextRoundCleanGui()));
 
-// 	connect(this, SIGNAL(signalNetClientConnect(int)), myConnectToServerDialog.get(), SLOT(refresh(int)));
-// 	connect(this, SIGNAL(signalNetClientGameInfo(int)), myStartNetworkGameDialog.get(), SLOT(refresh(int)));
-// 	connect(this, SIGNAL(signalNetClientGameInfo(int)), myGameLobbyDialog.get(), SLOT(refresh(int)));
-
-// 	connect(this, SIGNAL(signalNetClientSelfJoined(unsigned, QString, int)), myStartNetworkGameDialog.get(), SLOT(joinedNetworkGame(unsigned, QString, int)));
-// 	connect(this, SIGNAL(signalNetClientPlayerJoined(unsigned, QString, int)), myStartNetworkGameDialog.get(), SLOT(addConnectedPlayer(unsigned, QString, int)));
-// 	connect(this, SIGNAL(signalNetClientPlayerChanged(unsigned, QString)), myStartNetworkGameDialog.get(), SLOT(updatePlayer(unsigned, QString)));
-// 	connect(this, SIGNAL(signalNetClientPlayerLeft(unsigned, QString)), myStartNetworkGameDialog.get(), SLOT(removePlayer(unsigned, QString)));
-// 	connect(this, SIGNAL(signalNetClientNewGameAdmin(unsigned, QString)), myStartNetworkGameDialog.get(), SLOT(newGameAdmin(unsigned, QString)));
-// 	connect(this, SIGNAL(signalNetClientGameListNew(unsigned)), myStartNetworkGameDialog.get(), SLOT(gameCreated(unsigned)));
-
-// 	connect(this, SIGNAL(signalNetClientSelfJoined(unsigned, QString, int)), myGameLobbyDialog.get(), SLOT(joinedNetworkGame(unsigned, QString, int)));
-// 	connect(this, SIGNAL(signalNetClientPlayerJoined(unsigned, QString, int)), myGameLobbyDialog.get(), SLOT(addConnectedPlayer(unsigned, QString, int)));
-// 	connect(this, SIGNAL(signalNetClientPlayerChanged(unsigned, QString)), myGameLobbyDialog.get(), SLOT(updatePlayer(unsigned, QString)));
-// 	connect(this, SIGNAL(signalNetClientPlayerLeft(unsigned, QString)), myGameLobbyDialog.get(), SLOT(removePlayer(unsigned, QString)));
-// 	connect(this, SIGNAL(signalNetClientNewGameAdmin(unsigned, QString)), myGameLobbyDialog.get(), SLOT(newGameAdmin(unsigned, QString)));
-// 
-// 	connect(this, SIGNAL(signalNetClientGameListNew(unsigned)), myGameLobbyDialog.get(), SLOT(addGame(unsigned)));
-// 	connect(this, SIGNAL(signalNetClientGameListRemove(unsigned)), myGameLobbyDialog.get(), SLOT(removeGame(unsigned)));
-// 	connect(this, SIGNAL(signalNetClientGameListUpdateMode(unsigned, int)), myGameLobbyDialog.get(), SLOT(updateGameMode(unsigned, int)));
-// 	connect(this, SIGNAL(signalNetClientGameListUpdateAdmin(unsigned, unsigned)), myGameLobbyDialog.get(), SLOT(updateGameAdmin(unsigned, unsigned)));
-// 	connect(this, SIGNAL(signalNetClientGameListPlayerJoined(unsigned, unsigned)), myGameLobbyDialog.get(), SLOT(gameAddPlayer(unsigned, unsigned)));
-// 	connect(this, SIGNAL(signalNetClientGameListPlayerLeft(unsigned, unsigned)), myGameLobbyDialog.get(), SLOT(gameRemovePlayer(unsigned, unsigned)));
-// 	connect(this, SIGNAL(signalNetClientRemovedFromGame(int)), myGameLobbyDialog.get(), SLOT(removedFromGame(int)));
-// 	connect(this, SIGNAL(signalNetClientStatsUpdate(ServerStats)), myGameLobbyDialog.get(), SLOT(updateStats(ServerStats)));
-	connect(this, SIGNAL(signalNetClientShowTimeoutDialog(int, unsigned)), this, SLOT(showTimeoutDialog(int, unsigned)));
-
-	// Errors are handled globally, not within one dialog.
-	connect(this, SIGNAL(signalNetClientError(int, int)), this, SLOT(networkError(int, int)));
-	connect(this, SIGNAL(signalNetClientNotification(int)), this, SLOT(networkNotification(int)));
-	connect(this, SIGNAL(signalNetClientRemovedFromGame(int)), this, SLOT(networkNotification(int)));
-	connect(this, SIGNAL(signalNetServerError(int, int)), this, SLOT(networkError(int, int)));
-	connect(this, SIGNAL(signalNetClientGameStart(boost::shared_ptr<Game>)), this, SLOT(networkStart(boost::shared_ptr<Game>)));
-
-	//Chat Messages	
-// 	connect(this, SIGNAL(signalNetClientChatMsg(QString, QString)), myChat, SLOT(receiveMessage(QString, QString)));
-// 	connect(this, SIGNAL(signalNetClientChatMsg(QString, QString)), myStartNetworkGameDialog.get(), SLOT(receiveChatMsg(QString, QString)));
-
-// 	connect(this, SIGNAL(signalIrcConnect(QString)), myGameLobbyDialog->getLobbyChat(), SLOT(connected(QString)));
-// 	connect(this, SIGNAL(signalIrcSelfJoined(QString, QString)), myGameLobbyDialog->getLobbyChat(), SLOT(selfJoined(QString, QString)));
-// 	connect(this, SIGNAL(signalIrcPlayerJoined(QString)), myGameLobbyDialog->getLobbyChat(), SLOT(playerJoined(QString)));
-// 	connect(this, SIGNAL(signalIrcPlayerChanged(QString, QString)), myGameLobbyDialog->getLobbyChat(), SLOT(playerChanged(QString, QString)));
-// 	connect(this, SIGNAL(signalIrcPlayerKicked(QString, QString, QString)), myGameLobbyDialog->getLobbyChat(), SLOT(playerKicked(QString, QString, QString)));
-// 	connect(this, SIGNAL(signalIrcPlayerLeft(QString)), myGameLobbyDialog->getLobbyChat(), SLOT(playerLeft(QString)));
-// 	connect(this, SIGNAL(signalIrcChatMessage(QString, QString)), myGameLobbyDialog->getLobbyChat(), SLOT(displayMessage(QString, QString)));
-// 	connect(this, SIGNAL(signalIrcError(int)), myGameLobbyDialog->getLobbyChat(), SLOT(chatError(int)));
-// 	connect(this, SIGNAL(signalIrcServerError(int)), myGameLobbyDialog->getLobbyChat(), SLOT(chatServerError(int)));
-
 }
 
 gameTableImpl::~gameTableImpl() {
@@ -887,18 +804,6 @@ void gameTableImpl::refreshPlayerName() {
 	}
 }
 
-QStringList gameTableImpl::getPlayerNicksList() {
-
-	QStringList list;
-	PlayerListConstIterator it_c;
-	
-	for (it_c=mySession->getCurrentGame()->getSeatsList()->begin(); it_c!=mySession->getCurrentGame()->getSeatsList()->end(); it_c++) {
-		list << QString::fromUtf8((*it_c)->getMyName().c_str());		
-	}
-	
-	return list;
-}
-
 void gameTableImpl::refreshPlayerAvatar() {
 
 	QPixmap onePix = QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/misc/1px.png"));
@@ -1499,7 +1404,7 @@ void gameTableImpl::provideMyActions(int mode) {
 			if( currentHand->getSeatsList()->front()->getMyAction() != PLAYER_ACTION_FOLD ) {
 				pushButtonBetRaiseString = "Bet $"+QString::number(getMyBetAmount());
 				pushButtonCallCheckString = "Check"; 
-				if( currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = "Fold"; }
+				if( (currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND ) || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = "Fold"; }
 				else { pushButtonFoldString = "Check / Fold"; }
 			}
 			else {
@@ -2667,323 +2572,6 @@ void gameTableImpl::breakButtonClicked() {
 	}
 }
 
-void gameTableImpl::networkError(int errorID, int /*osErrorID*/) {
-
-	hideTimeoutDialog();
-	switch (errorID) {
-		case ERR_SOCK_SERVERADDR_NOT_SET:
-			{QMessageBox::warning(this, tr("Network Error"),
-				tr("Server address was not set."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_INVALID_PORT:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("An invalid port was set (ports 0-1023 are not allowed)."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_CREATION_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not create a socket for TCP communication."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_SET_ADDR_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not set the IP address."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_SET_PORT_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not set the port for this type of address."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_RESOLVE_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The server name could not be resolved."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_BIND_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Bind failed - please choose a different port."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_LISTEN_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal network error: \"listen\" failed."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_ACCEPT_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Server execution was terminated."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_CONNECT_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not connect to the server."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_CONNECT_TIMEOUT:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Connection timed out.\nPlease check the server address.\n\nIf the server is behind a NAT-Router, make sure port forwarding has been set up on server side."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_SELECT_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal network error: \"select\" failed."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_SEND_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal network error: \"send\" failed."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_RECV_FAILED: // Sometimes windows reports recv failed on close.
-		case ERR_SOCK_CONN_RESET:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Connection was closed by the server."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_CONN_EXISTS:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal network error: Duplicate TCP connection."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_INVALID_PACKET:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("An invalid network packet was received.\nPlease make sure that all players use the same version of PokerTH."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_INVALID_STATE:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal state error.\nPlease make sure that all players use the same version of PokerTH."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_INVALID_SERVERLIST_URL:
-		case ERR_SOCK_DOWNLOAD_INVALID_URL:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Invalid server list URL.\nPlease correct the address in the settings."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_OPEN_MD5_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not open the server list MD5 file.\nPlease make sure that the server list URL is correct."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_INVALID_SERVERLIST_MD5:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Synchronization of the PokerTH internet server list has failed.\nPlease make sure that the server list URL is correct."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_INVALID_SERVERLIST_XML:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The PokerTH internet server list contains invalid data.\nIf you use a custom server list, please make sure its format is correct."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_UNZIP_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not unzip the PokerTH internet server list."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_DOWNLOAD_INIT_FAILED:
-		case ERR_SOCK_DOWNLOAD_SELECT_FAILED:
-		case ERR_SOCK_DOWNLOAD_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not download the PokerTH internet server list.\nPlease make sure you are directly connected to the internet."),
-				QMessageBox::Close); }
-		break;
-		case ERR_SOCK_DOWNLOAD_OPEN_FAILED:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not open the target file when downloading the server list."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_VERSION_NOT_SUPPORTED:
-			{	QMessageBox msgBox(QMessageBox::Warning, tr("Network Error"),
-				tr("The PokerTH server does not support this version of the game.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
-				QMessageBox::Close, this); 
-				msgBox.setTextFormat(Qt::RichText);
-				msgBox.exec();
-			}
-		break;
-		case ERR_NET_SERVER_FULL:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Sorry, this server is already full."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_INVALID_PASSWORD:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Invalid password when joining the game.\nPlease reenter the password and try again."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_INVALID_PASSWORD_STR:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The password is too long. Please choose another one."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_PLAYER_NAME_IN_USE:
-			{ /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name."));
-			  myChangeHumanPlayerNameDialog->exec();*/ }
-		break;
-		case ERR_NET_INVALID_PLAYER_NAME:
-			{ /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one."));
-			  myChangeHumanPlayerNameDialog->exec();*/ }
-		break;
-		case ERR_NET_INVALID_GAME_NAME:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The game name is either too short or too long. Please choose another one."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_UNKNOWN_GAME:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The game could not be found."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_INVALID_CHAT_TEXT:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The chat text is invalid."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_UNKNOWN_PLAYER_ID:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The server referred to an unknown player. Aborting."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_NO_CURRENT_PLAYER:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal error: The current player could not be found."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_PLAYER_NOT_ACTIVE:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Internal error: The current player is not active."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_PLAYER_KICKED:
-			{ mySession->terminateNetworkClient();
-			  QMessageBox::warning(this, tr("Network Error"),
-				tr("You were kicked from the server."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_PLAYER_BANNED:
-		{ mySession->terminateNetworkClient();
-		  QMessageBox::warning(this, tr("Network Error"),
-			tr("You were temporarily banned from the server."),
-			QMessageBox::Close); }
-		break;
-		case ERR_NET_SESSION_TIMED_OUT:
-		{ mySession->terminateNetworkClient();
-		  QMessageBox::warning(this, tr("Network Error"),
-			tr("Your server connection timed out due to inactivity. You are very welcome to reconnect!"),
-			QMessageBox::Close); }
-		break;
-		case ERR_NET_INVALID_PLAYER_COUNT:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The client player count is invalid."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_TOO_MANY_MANUAL_BLINDS:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Too many manual blinds were set. Please reconfigure the manual blinds."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_INVALID_AVATAR_FILE:
-		case ERR_NET_WRONG_AVATAR_SIZE:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("An invalid avatar file was configured. Please choose a different avatar."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_AVATAR_TOO_LARGE:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The selected avatar file is too large. Please choose a different avatar."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_AVATAR_UPLOAD_BLOCKED:
-		{ QMessageBox::warning(this, tr("Network Error"),
-			tr("You cannot upload a new avatar file at this time. Please try again in a few seconds."),
-			QMessageBox::Close); }
-		break;
-		case ERR_NET_INVALID_REQUEST_ID:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("An internal avatar error occured. Please report this to an admin in the lobby chat."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_START_TIMEOUT:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not start game: Synchronization failed."),
-				QMessageBox::Close); }
-		break;
-		case ERR_NET_SERVER_MAINTENANCE:
-			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("The server is down for maintenance. Please try again later."),
-				QMessageBox::Close); }
-		break;
-		default:  { QMessageBox::warning(this, tr("Network Error"),
-				tr("An internal error occured."),
-				QMessageBox::Close); }
-	}
-	// close dialogs
-// 	myGameLobbyDialog->reject();
-// 	myConnectToServerDialog->reject();
-// 	myStartNetworkGameDialog->reject();
-}
-
-void gameTableImpl::networkNotification(int notificationId)
-{
-	hideTimeoutDialog();
-	switch (notificationId)
-	{
-		case NTF_NET_REMOVED_KICKED:
-			{ QMessageBox::warning(this, tr("Network Notification"),
-				tr("You were kicked from the game."),
-				QMessageBox::Close); }
-		break;
-		case NTF_NET_REMOVED_GAME_FULL:
-		case NTF_NET_JOIN_GAME_FULL:
-			{ QMessageBox::warning(this, tr("Network Notification"),
-				tr("Sorry, this game is already full."),
-				QMessageBox::Close); }
-		break;
-		case NTF_NET_REMOVED_ALREADY_RUNNING:
-		case NTF_NET_JOIN_ALREADY_RUNNING:
-			{ QMessageBox::warning(this, tr("Network Notification"),
-				tr("Unable to join - the server has already started the game."),
-				QMessageBox::Close); }
-		break;
-		case NTF_NET_REMOVED_TIMEOUT:
-		{ QMessageBox::warning(this, tr("Network Notification"),
-			tr("Your admin state timed out due to inactivity. Feel free to create a new game!"),
-			QMessageBox::Close); }
-		break;
-		case NTF_NET_JOIN_INVALID_PASSWORD:
-			{ QMessageBox::warning(this, tr("Network Notification"),
-				tr("Invalid password when joining the game.\nPlease reenter the password and try again."),
-				QMessageBox::Close); }
-		break;
-		case NTF_NET_NEW_RELEASE_AVAILABLE:
-			{	QMessageBox msgBox(QMessageBox::Information, tr("Network Notification"),
-				tr("A new release of PokerTH is available.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
-				QMessageBox::Close, this); 
-				msgBox.setTextFormat(Qt::RichText);
-				msgBox.exec();
-			}
-		break;
-		case NTF_NET_OUTDATED_BETA:
-			{	QMessageBox msgBox(QMessageBox::Information, tr("Network Notification"),
-				tr("This beta release of PokerTH is outdated.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
-				QMessageBox::Close, this); 
-				msgBox.setTextFormat(Qt::RichText);
-				msgBox.exec();
-			}
-		break;
-	}
-}
-
-void gameTableImpl::networkStart(boost::shared_ptr<Game> game)
-{
-	mySession->startClientGame(game);
-
-	//send playerNicksList to chat for nick-autocompletition
-	myChat->setPlayerNicksList(getPlayerNicksList());
-}
-
 void gameTableImpl::keyPressEvent ( QKeyEvent * event ) {
 
 // 	cout << event->key() << endl;
@@ -3447,19 +3035,3 @@ void gameTableImpl::leaveCurrentNetworkGame() {
 		}
 	}
 }
-
-
-void gameTableImpl::showTimeoutDialog(int msgID, unsigned duration) {
-
-	if(myTimeoutDialog->isHidden()) {
-		myTimeoutDialog->setMySession(mySession);
-		myTimeoutDialog->setMsgID((NetTimeoutReason)msgID);
-		myTimeoutDialog->setTimeoutDuration(duration);
-		myTimeoutDialog->show();
-		myTimeoutDialog->raise();
-		myTimeoutDialog->activateWindow();
-		myTimeoutDialog->startTimeout();
-	}
-}
-
-void gameTableImpl::hideTimeoutDialog() { myTimeoutDialog->hide(); }
diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h
index 6eb8c88b..26d3c586 100755
--- a/src/gui/qt/gametable/gametableimpl.h
+++ b/src/gui/qt/gametable/gametableimpl.h
@@ -37,21 +37,11 @@ class Game;
 
 class GuiInterface;
 class BoardInterface;
-// class HandInterface;
 class PlayerInterface;
 class MyCardsPixmapLabel;
 class MyAvatarLabel;
-class newGameDialogImpl;
+
 class settingsDialogImpl;
-class selectAvatarDialogImpl;
-class aboutPokerthImpl;
-class joinNetworkGameDialogImpl;
-class connectToServerDialogImpl;
-class createNetworkGameDialogImpl;
-class startNetworkGameDialogImpl;
-class changeHumanPlayerNameDialogImpl;
-class gameLobbyDialogImpl;
-class timeoutMsgBoxImpl;
 class startWindowImpl;
 
 class QColor;
@@ -74,7 +64,8 @@ public:
 	void setLog(Log* l) { myLog = l; }
 	
 	SDLPlayer* getMySDLPlayer() const { return mySDLPlayer; }
-	
+	Chat* getMyChat() const	{ return myChat; }
+		
 	void setSpeeds();
 
 signals:
@@ -129,38 +120,6 @@ signals:
 
 	void signalNextRoundCleanGui();
 
-	void signalNetClientConnect(int actionID);
-	void signalNetClientGameInfo(int actionID);
-	void signalNetClientError(int errorID, int osErrorID);
-	void signalNetClientNotification(int notificationId);
-	void signalNetClientStatsUpdate(ServerStats stats);
-	void signalNetClientShowTimeoutDialog(int, unsigned);
-	void signalNetClientRemovedFromGame(int notificationId);
-	void signalNetServerError(int errorID, int osErrorID);
-	void signalNetClientSelfJoined(unsigned playerId, QString playerName, int rights);
-	void signalNetClientPlayerJoined(unsigned playerId, QString playerName, int rights);
-	void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName);
-	void signalNetClientPlayerLeft(unsigned playerId, QString playerName);
-	void signalNetClientNewGameAdmin(unsigned playerId, QString playerName);
-	void signalNetClientGameListNew(unsigned gameId);
-	void signalNetClientGameListRemove(unsigned gameId);
-	void signalNetClientGameListUpdateMode(unsigned gameId, int mode);
-	void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
-	void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
-	void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
-	void signalNetClientGameStart(boost::shared_ptr<Game> game);
-	void signalNetClientChatMsg(QString nickName, QString msg);
-
-	void signalIrcConnect(QString server);
-	void signalIrcSelfJoined(QString nickName, QString channel);
-	void signalIrcPlayerJoined(QString nickName);
-	void signalIrcPlayerChanged(QString oldNick, QString newNick);
-	void signalIrcPlayerKicked(QString nickName, QString byWhom, QString reason);
-	void signalIrcPlayerLeft(QString nickName);
-	void signalIrcChatMessage(QString nickName, QString msg);
-	void signalIrcError(int errorCode);
-	void signalIrcServerError(int errorCode);
-
 public slots:
 
 	void initGui(int speed);
@@ -174,7 +133,6 @@ public slots:
 	void refreshGroupbox(int =-1, int =-1);
 	void refreshAll();
 	void refreshPlayerName();
-	QStringList getPlayerNicksList();
 	void refreshGameLabels(int);
 	void refreshButton();
 	void refreshPlayerAvatar();
@@ -299,10 +257,6 @@ public slots:
 	void tabSwitchAction();
 
 	void leaveCurrentNetworkGame();
-
-	void networkError(int, int);
-	void networkNotification(int);
-	void networkStart(boost::shared_ptr<Game> game);
 	
 	void localGameModification();
 	void networkGameModification();
@@ -322,11 +276,6 @@ public slots:
 	void showMaximized ();
 	void closeGameTable();
 
-	void showTimeoutDialog(int msgID, unsigned duration);
-	void hideTimeoutDialog();
-
-	Chat* getMyChat() const	{ return myChat; }
-	
 
 private: 
 
@@ -391,16 +340,6 @@ private:
 	QPixmap *flipside;
 
 // 	Dialogs
-// 	boost::shared_ptr<newGameDialogImpl> myNewGameDialog;
-// 	boost::shared_ptr<settingsDialogImpl> mySettingsDialog;
-// 	boost::shared_ptr<selectAvatarDialogImpl> mySelectAvatarDialog;
-// 	boost::shared_ptr<changeHumanPlayerNameDialogImpl> myChangeHumanPlayerNameDialog;
-// 	boost::shared_ptr<joinNetworkGameDialogImpl> myJoinNetworkGameDialog;
-// 	boost::shared_ptr<connectToServerDialogImpl> myConnectToServerDialog;
-// 	boost::shared_ptr<startNetworkGameDialogImpl> myStartNetworkGameDialog;
-// 	boost::shared_ptr<createNetworkGameDialogImpl> myCreateNetworkGameDialog;
-// 	boost::shared_ptr<gameLobbyDialogImpl> myGameLobbyDialog;
-	boost::shared_ptr<timeoutMsgBoxImpl> myTimeoutDialog;
 	startWindowImpl *myStartWindow;
 
 	//Sound
diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index 46d8f91e..da6a284f 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -119,14 +119,7 @@ void GuiWrapper::logPlayerWinGame(std::string playerName, int gameID) { myLog->s
 void GuiWrapper::flushLogAtGame(int gameID) { myLog->signalFlushLogAtGame(gameID); }
 void GuiWrapper::flushLogAtHand() { myLog->signalFlushLogAtHand(); }
 
-void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { myW->signalNetClientGameStart(game); }
-
-
-
-
 ////////// this is for startwindow ////////////////////
-
-
 void GuiWrapper::SignalNetClientConnect(int actionID) { myStartWindow->signalNetClientConnect(actionID); }
 void GuiWrapper::SignalNetClientGameInfo(int actionID) { myStartWindow->signalNetClientGameInfo(actionID); }
 void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myStartWindow->signalNetClientError(errorID, osErrorID); }
@@ -161,13 +154,14 @@ void GuiWrapper::SignalNetClientGameListUpdateMode(unsigned gameId, GameMode mod
 void GuiWrapper::SignalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId) {myStartWindow->signalNetClientGameListUpdateAdmin(gameId, adminPlayerId); }
 void GuiWrapper::SignalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId) { myStartWindow->signalNetClientGameListPlayerJoined(gameId, playerId); }
 void GuiWrapper::SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId) { myStartWindow->signalNetClientGameListPlayerLeft(gameId, playerId); }
+void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { myStartWindow->signalNetClientGameStart(game); }
 
 
 void GuiWrapper::SignalNetClientWaitDialog() { myStartWindow->signalShowClientDialog(); }
 void GuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { myStartWindow->signalNetClientChatMsg(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); }
 
 void GuiWrapper::SignalNetServerSuccess(int /*actionID*/) { }
-void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { myW->signalNetServerError(errorID, osErrorID); }
+void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { myStartWindow->signalNetServerError(errorID, osErrorID); }
 
 void GuiWrapper::SignalIrcConnect(const string &server) { myStartWindow->signalIrcConnect(QString::fromUtf8(server.c_str())); }
 void GuiWrapper::SignalIrcSelfJoined(const string &nickName, const string &channel) { myStartWindow->signalIrcSelfJoined(QString::fromUtf8(nickName.c_str()), QString::fromUtf8(channel.c_str())); }
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
index 08895a0b..7bbd065f 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -74,8 +74,6 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
 	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/14e3f39cc775608bcecf5597248b3558.png";
 	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/0c04318e6fa54534935e3e6cfe12c4a1.png";
 	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/6ecea83d9fac6b4cae97e2fccd09a5f6.png";
-	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/d90bd3fbbe3671ebac5f9f223d0c6d65.png";
-	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/93dec21823a314fb8ef2261b7aa75ae5.png";
 	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/74672ebfa2ab02968386c4e441a08668.png";
 	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/e54e67ebd5265cf549362a2cda5a999c.png";
 	peopleAvatarList << myAppDataPath +"gfx/avatars/default/people/da34195981d255656f39c05481de3b6a.png";	
diff --git a/src/gui/qt/startwindow.ui b/src/gui/qt/startwindow.ui
index eb44f9c8..6ed3a237 100644
--- a/src/gui/qt/startwindow.ui
+++ b/src/gui/qt/startwindow.ui
@@ -166,6 +166,9 @@
    <property name="text" >
     <string>Quit</string>
    </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
   </action>
   <action name="actionCreate_Network_Game" >
    <property name="text" >
@@ -179,5 +182,22 @@
   </action>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>actionQuit</sender>
+   <signal>triggered()</signal>
+   <receiver>startWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>221</x>
+     <y>168</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 357982b6..f211c568 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -19,6 +19,8 @@
  ***************************************************************************/
 #include "startwindowimpl.h"
 
+#include "playerinterface.h"
+
 #include <gamedata.h>
 #include <generic/serverguiwrapper.h>
 #include <net/socket_msg.h>
@@ -84,7 +86,6 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 	
 	myTimeoutDialog = new timeoutMsgBoxImpl(this);
 
-
 	connect( actionStart_Local_Game, SIGNAL( triggered() ), this, SLOT( callNewGameDialog() ) );
 	connect( pushButtonStart_Local_Game, SIGNAL( clicked() ), this, SLOT( callNewGameDialog() ) );
 	connect( actionInternet_Game, SIGNAL( triggered() ), this, SLOT( callGameLobbyDialog() ) );
@@ -129,6 +130,15 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 	connect(this, SIGNAL(signalNetClientChatMsg(QString, QString)), myStartNetworkGameDialog, SLOT(receiveChatMsg(QString, QString)));
 	connect(this, SIGNAL(signalNetClientChatMsg(QString, QString)), myGuiInterface->getMyW()->getMyChat(), SLOT(receiveMessage(QString, QString)));
 
+	connect(this, SIGNAL(signalNetClientShowTimeoutDialog(int, unsigned)), this, SLOT(showTimeoutDialog(int, unsigned)));
+
+	// Errors are handled globally, not within one dialog.
+	connect(this, SIGNAL(signalNetClientError(int, int)), this, SLOT(networkError(int, int)));
+	connect(this, SIGNAL(signalNetClientNotification(int)), this, SLOT(networkNotification(int)));
+	connect(this, SIGNAL(signalNetServerError(int, int)), this, SLOT(networkError(int, int)));
+	connect(this, SIGNAL(signalNetClientRemovedFromGame(int)), this, SLOT(networkNotification(int)));
+	connect(this, SIGNAL(signalNetClientGameStart(boost::shared_ptr<Game>)), this, SLOT(networkStart(boost::shared_ptr<Game>)));
+
 	connect(this, SIGNAL(signalIrcConnect(QString)), myGameLobbyDialog->getLobbyChat(), SLOT(connected(QString)));
 	connect(this, SIGNAL(signalIrcSelfJoined(QString, QString)), myGameLobbyDialog->getLobbyChat(), SLOT(selfJoined(QString, QString)));
 	connect(this, SIGNAL(signalIrcPlayerJoined(QString)), myGameLobbyDialog->getLobbyChat(), SLOT(playerJoined(QString)));
@@ -520,3 +530,348 @@ void startWindowImpl::callSettingsDialog() {
 		myGuiInterface->getMyW()->applySettings(mySettingsDialog);
 	}
 }
+
+void startWindowImpl::showTimeoutDialog(int msgID, unsigned duration) {
+
+	if(myTimeoutDialog->isHidden()) {
+		myTimeoutDialog->setMySession(mySession);
+		myTimeoutDialog->setMsgID((NetTimeoutReason)msgID);
+		myTimeoutDialog->setTimeoutDuration(duration);
+		myTimeoutDialog->show();
+		myTimeoutDialog->raise();
+		myTimeoutDialog->activateWindow();
+		myTimeoutDialog->startTimeout();
+	}
+}
+
+void startWindowImpl::hideTimeoutDialog() { myTimeoutDialog->hide(); }
+
+void startWindowImpl::networkError(int errorID, int /*osErrorID*/) {
+
+	hideTimeoutDialog();
+	switch (errorID) {
+		case ERR_SOCK_SERVERADDR_NOT_SET:
+			{QMessageBox::warning(this, tr("Network Error"),
+				tr("Server address was not set."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_INVALID_PORT:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("An invalid port was set (ports 0-1023 are not allowed)."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_CREATION_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not create a socket for TCP communication."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_SET_ADDR_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not set the IP address."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_SET_PORT_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not set the port for this type of address."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_RESOLVE_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The server name could not be resolved."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_BIND_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Bind failed - please choose a different port."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_LISTEN_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal network error: \"listen\" failed."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_ACCEPT_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Server execution was terminated."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_CONNECT_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not connect to the server."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_CONNECT_TIMEOUT:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Connection timed out.\nPlease check the server address.\n\nIf the server is behind a NAT-Router, make sure port forwarding has been set up on server side."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_SELECT_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal network error: \"select\" failed."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_SEND_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal network error: \"send\" failed."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_RECV_FAILED: // Sometimes windows reports recv failed on close.
+		case ERR_SOCK_CONN_RESET:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Connection was closed by the server."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_CONN_EXISTS:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal network error: Duplicate TCP connection."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_INVALID_PACKET:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("An invalid network packet was received.\nPlease make sure that all players use the same version of PokerTH."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_INVALID_STATE:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal state error.\nPlease make sure that all players use the same version of PokerTH."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_INVALID_SERVERLIST_URL:
+		case ERR_SOCK_DOWNLOAD_INVALID_URL:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Invalid server list URL.\nPlease correct the address in the settings."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_OPEN_MD5_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not open the server list MD5 file.\nPlease make sure that the server list URL is correct."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_INVALID_SERVERLIST_MD5:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Synchronization of the PokerTH internet server list has failed.\nPlease make sure that the server list URL is correct."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_INVALID_SERVERLIST_XML:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The PokerTH internet server list contains invalid data.\nIf you use a custom server list, please make sure its format is correct."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_UNZIP_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not unzip the PokerTH internet server list."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_DOWNLOAD_INIT_FAILED:
+		case ERR_SOCK_DOWNLOAD_SELECT_FAILED:
+		case ERR_SOCK_DOWNLOAD_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not download the PokerTH internet server list.\nPlease make sure you are directly connected to the internet."),
+				QMessageBox::Close); }
+		break;
+		case ERR_SOCK_DOWNLOAD_OPEN_FAILED:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not open the target file when downloading the server list."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_VERSION_NOT_SUPPORTED:
+			{	QMessageBox msgBox(QMessageBox::Warning, tr("Network Error"),
+				tr("The PokerTH server does not support this version of the game.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
+				QMessageBox::Close, this); 
+				msgBox.setTextFormat(Qt::RichText);
+				msgBox.exec();
+			}
+		break;
+		case ERR_NET_SERVER_FULL:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Sorry, this server is already full."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_INVALID_PASSWORD:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Invalid password when joining the game.\nPlease reenter the password and try again."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_INVALID_PASSWORD_STR:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The password is too long. Please choose another one."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_PLAYER_NAME_IN_USE:
+			{ /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name."));
+			  myChangeHumanPlayerNameDialog->exec();*/ }
+		break;
+		case ERR_NET_INVALID_PLAYER_NAME:
+			{ /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one."));
+			  myChangeHumanPlayerNameDialog->exec();*/ }
+		break;
+		case ERR_NET_INVALID_GAME_NAME:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The game name is either too short or too long. Please choose another one."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_UNKNOWN_GAME:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The game could not be found."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_INVALID_CHAT_TEXT:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The chat text is invalid."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_UNKNOWN_PLAYER_ID:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The server referred to an unknown player. Aborting."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_NO_CURRENT_PLAYER:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal error: The current player could not be found."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_PLAYER_NOT_ACTIVE:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Internal error: The current player is not active."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_PLAYER_KICKED:
+			{ mySession->terminateNetworkClient();
+			  QMessageBox::warning(this, tr("Network Error"),
+				tr("You were kicked from the server."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_PLAYER_BANNED:
+		{ mySession->terminateNetworkClient();
+		  QMessageBox::warning(this, tr("Network Error"),
+			tr("You were temporarily banned from the server."),
+			QMessageBox::Close); }
+		break;
+		case ERR_NET_SESSION_TIMED_OUT:
+		{ mySession->terminateNetworkClient();
+		  QMessageBox::warning(this, tr("Network Error"),
+			tr("Your server connection timed out due to inactivity. You are very welcome to reconnect!"),
+			QMessageBox::Close); }
+		break;
+		case ERR_NET_INVALID_PLAYER_COUNT:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The client player count is invalid."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_TOO_MANY_MANUAL_BLINDS:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Too many manual blinds were set. Please reconfigure the manual blinds."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_INVALID_AVATAR_FILE:
+		case ERR_NET_WRONG_AVATAR_SIZE:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("An invalid avatar file was configured. Please choose a different avatar."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_AVATAR_TOO_LARGE:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The selected avatar file is too large. Please choose a different avatar."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_AVATAR_UPLOAD_BLOCKED:
+		{ QMessageBox::warning(this, tr("Network Error"),
+			tr("You cannot upload a new avatar file at this time. Please try again in a few seconds."),
+			QMessageBox::Close); }
+		break;
+		case ERR_NET_INVALID_REQUEST_ID:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("An internal avatar error occured. Please report this to an admin in the lobby chat."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_START_TIMEOUT:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("Could not start game: Synchronization failed."),
+				QMessageBox::Close); }
+		break;
+		case ERR_NET_SERVER_MAINTENANCE:
+			{ QMessageBox::warning(this, tr("Network Error"),
+				tr("The server is down for maintenance. Please try again later."),
+				QMessageBox::Close); }
+		break;
+		default:  { QMessageBox::warning(this, tr("Network Error"),
+				tr("An internal error occured."),
+				QMessageBox::Close); }
+	}
+	// close dialogs
+	myGameLobbyDialog->reject();
+	myConnectToServerDialog->reject();
+	myStartNetworkGameDialog->reject();
+}
+
+void startWindowImpl::networkNotification(int notificationId)
+{
+	hideTimeoutDialog();
+	switch (notificationId)
+	{
+		case NTF_NET_REMOVED_KICKED:
+			{ QMessageBox::warning(this, tr("Network Notification"),
+				tr("You were kicked from the game."),
+				QMessageBox::Close); }
+		break;
+		case NTF_NET_REMOVED_GAME_FULL:
+		case NTF_NET_JOIN_GAME_FULL:
+			{ QMessageBox::warning(this, tr("Network Notification"),
+				tr("Sorry, this game is already full."),
+				QMessageBox::Close); }
+		break;
+		case NTF_NET_REMOVED_ALREADY_RUNNING:
+		case NTF_NET_JOIN_ALREADY_RUNNING:
+			{ QMessageBox::warning(this, tr("Network Notification"),
+				tr("Unable to join - the server has already started the game."),
+				QMessageBox::Close); }
+		break;
+		case NTF_NET_REMOVED_TIMEOUT:
+		{ QMessageBox::warning(this, tr("Network Notification"),
+			tr("Your admin state timed out due to inactivity. Feel free to create a new game!"),
+			QMessageBox::Close); }
+		break;
+		case NTF_NET_JOIN_INVALID_PASSWORD:
+			{ QMessageBox::warning(this, tr("Network Notification"),
+				tr("Invalid password when joining the game.\nPlease reenter the password and try again."),
+				QMessageBox::Close); }
+		break;
+		case NTF_NET_NEW_RELEASE_AVAILABLE:
+			{	QMessageBox msgBox(QMessageBox::Information, tr("Network Notification"),
+				tr("A new release of PokerTH is available.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
+				QMessageBox::Close, this); 
+				msgBox.setTextFormat(Qt::RichText);
+				msgBox.exec();
+			}
+		break;
+		case NTF_NET_OUTDATED_BETA:
+			{	QMessageBox msgBox(QMessageBox::Information, tr("Network Notification"),
+				tr("This beta release of PokerTH is outdated.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
+				QMessageBox::Close, this); 
+				msgBox.setTextFormat(Qt::RichText);
+				msgBox.exec();
+			}
+		break;
+	}
+}
+
+void startWindowImpl::networkStart(boost::shared_ptr<Game> game)
+{
+	mySession->startClientGame(game);
+
+	//send playerNicksList to chat for nick-autocompletition
+	myGuiInterface->getMyW()->getMyChat()->setPlayerNicksList(getPlayerNicksList());
+}
+
+
+QStringList startWindowImpl::getPlayerNicksList() {
+
+	QStringList list;
+	PlayerListConstIterator it_c;
+	
+	for (it_c=mySession->getCurrentGame()->getSeatsList()->begin(); it_c!=mySession->getCurrentGame()->getSeatsList()->end(); it_c++) {
+		list << QString::fromUtf8((*it_c)->getMyName().c_str());		
+	}
+	
+	return list;
+}
\ No newline at end of file
diff --git a/src/gui/qt/startwindow/startwindowimpl.h b/src/gui/qt/startwindow/startwindowimpl.h
index 4b72edd4..47361789 100644
--- a/src/gui/qt/startwindow/startwindowimpl.h
+++ b/src/gui/qt/startwindow/startwindowimpl.h
@@ -103,6 +103,15 @@ public slots:
 
 	void startNewLocalGame(newGameDialogImpl* =0);
 
+	void showTimeoutDialog(int msgID, unsigned duration);
+	void hideTimeoutDialog();
+
+	void networkError(int, int);
+	void networkNotification(int);
+
+	void networkStart(boost::shared_ptr<Game> game);
+	QStringList getPlayerNicksList();
+
 private:
 	ConfigFile *myConfig;