First test version with network timeout. Only activity timeout and global timeout, no game admin timeout yet. Set to test values (will disconnect rapidly).

Modified method for init timeout (if session cannot be established) - now using one non-modifiable timer for each session, and an additional timer which is reset whenever session data is received.

src/gui/generic/serverguiwrapper.cpp

@@ -118,6 +118,7 @@ void ServerGuiWrapper::SignalNetClientGameInfo(int actionID) { if (myClientcb) m
 void ServerGuiWrapper::SignalNetClientError(int errorID, int osErrorID) { if (myClientcb) myClientcb->SignalNetClientError(errorID, osErrorID); }
 void ServerGuiWrapper::SignalNetClientNotification(int notificationId) { if (myClientcb) myClientcb->SignalNetClientNotification(notificationId); }
 void ServerGuiWrapper::SignalNetClientStatsUpdate(const ServerStats &stats) { if (myClientcb) myClientcb->SignalNetClientStatsUpdate(stats); }
+void ServerGuiWrapper::SignalNetClientShowTimeoutDialog(NetTimeoutReason reason, unsigned remainingSec) { if (myClientcb) myClientcb->SignalNetClientShowTimeoutDialog(reason, remainingSec); }
 void ServerGuiWrapper::SignalNetClientRemovedFromGame(int notificationId) { if (myClientcb) myClientcb->SignalNetClientRemovedFromGame(notificationId); }
 void ServerGuiWrapper::SignalNetClientSelfJoined(unsigned playerId, const string &playerName, PlayerRights rights) { if (myClientcb) myClientcb->SignalNetClientSelfJoined(playerId, playerName, rights); }
 void ServerGuiWrapper::SignalNetClientPlayerJoined(unsigned playerId, const string &playerName, PlayerRights rights) { if (myClientcb) myClientcb->SignalNetClientPlayerJoined(playerId, playerName, rights); }

src/gui/generic/serverguiwrapper.h

@@ -101,6 +101,7 @@ public:
 	void SignalNetClientError(int errorID, int osErrorID);
 	void SignalNetClientNotification(int notificationId);
 	void SignalNetClientStatsUpdate(const ServerStats &stats);
+	void SignalNetClientShowTimeoutDialog(NetTimeoutReason reason, unsigned remainingSec);
 	void SignalNetClientRemovedFromGame(int notificationId);
 	void SignalNetClientSelfJoined(unsigned playerId, const std::string &playerName, PlayerRights rights);
 	void SignalNetClientPlayerJoined(unsigned playerId, const std::string &playerName, PlayerRights rights);

src/gui/qt/guiwrapper.cpp

@@ -120,7 +120,7 @@ void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->signalNetClientGam
 void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->signalNetClientError(errorID, osErrorID); }
 void GuiWrapper::SignalNetClientNotification(int notificationId) { myW->signalNetClientNotification(notificationId); }
 void GuiWrapper::SignalNetClientStatsUpdate(const ServerStats &stats) { myW->signalNetClientStatsUpdate(stats); }
-void GuiWrapper::SignalNetClientShowTimeoutDialog(int msgID, int duration) { myW->signalNetClientShowTimeoutDialog(msgID, duration); }
+void GuiWrapper::SignalNetClientShowTimeoutDialog(NetTimeoutReason reason, unsigned remainingSec) { myW->signalNetClientShowTimeoutDialog(reason, remainingSec); }
 void GuiWrapper::SignalNetClientRemovedFromGame(int notificationId) { myW->signalNetClientRemovedFromGame(notificationId); }
 void GuiWrapper::SignalNetClientSelfJoined(unsigned playerId, const string &playerName, PlayerRights rights) { myW->signalNetClientSelfJoined(playerId, QString::fromUtf8(playerName.c_str()), rights); }
 void GuiWrapper::SignalNetClientPlayerJoined(unsigned playerId, const string &playerName, PlayerRights rights) { myW->signalNetClientPlayerJoined(playerId, QString::fromUtf8(playerName.c_str()), rights); }

src/gui/qt/guiwrapper.h

@@ -108,7 +108,7 @@ public:
 	void SignalNetClientError(int errorID, int osErrorID);
 	void SignalNetClientNotification(int notificationId);
 	void SignalNetClientStatsUpdate(const ServerStats &stats);
-	void SignalNetClientShowTimeoutDialog(int, int);
+	void SignalNetClientShowTimeoutDialog(NetTimeoutReason reason, unsigned remainingSec);
 	void SignalNetClientRemovedFromGame(int notificationId);
 	void SignalNetClientSelfJoined(unsigned playerId, const std::string &playerName, PlayerRights rights);
 	void SignalNetClientPlayerJoined(unsigned playerId, const std::string &playerName, PlayerRights rights);

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -639,7 +639,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalNetClientGameListPlayerLeft(unsigned, unsigned)), myGameLobbyDialog, SLOT(gameRemovePlayer(unsigned, unsigned)));
 	connect(this, SIGNAL(signalNetClientRemovedFromGame(int)), myGameLobbyDialog, SLOT(removedFromGame(int)));
 	connect(this, SIGNAL(signalNetClientStatsUpdate(ServerStats)), myGameLobbyDialog, SLOT(updateStats(ServerStats)));
-	connect(this, SIGNAL(signalNetClientShowTimeoutDialog(int, int)), this, SLOT(showTimeoutDialog(int, int)));
+	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)));
@@ -3777,10 +3777,10 @@ void mainWindowImpl::leaveCurrentNetworkGame() {
 }
 
 
-void mainWindowImpl::showTimeoutDialog(int msgID, int duration) {
+void mainWindowImpl::showTimeoutDialog(int msgID, unsigned duration) {
 
 	myTimeoutDialog->setMySession(mySession);
-	myTimeoutDialog->setMsgID(msgID);
+	myTimeoutDialog->setMsgID((NetTimeoutReason)msgID);
 	myTimeoutDialog->setTimeoutDuration(duration);
 	myTimeoutDialog->show();
 	myTimeoutDialog->raise();

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -132,7 +132,7 @@ signals:
 	void signalNetClientError(int errorID, int osErrorID);
 	void signalNetClientNotification(int notificationId);
 	void signalNetClientStatsUpdate(ServerStats stats);
-	void signalNetClientShowTimeoutDialog(int, int);
+	void signalNetClientShowTimeoutDialog(int, unsigned);
 	void signalNetClientRemovedFromGame(int notificationId);
 	void signalNetServerError(int errorID, int osErrorID);
 	void signalNetClientSelfJoined(unsigned playerId, QString playerName, int rights);
@@ -334,7 +334,7 @@ public slots:
 	void showMaximized ();
 	void quitPokerTH();
 
-	void showTimeoutDialog(int msgID, int duration);
+	void showTimeoutDialog(int msgID, unsigned duration);
 	void hideTimeoutDialog();
 	
 // 	void paintEvent(QPaintEvent *);

src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp

@@ -59,5 +59,5 @@ void timeoutMsgBoxImpl::timerRefresh() {
 
 void timeoutMsgBoxImpl::stopTimeout() {
 
-// 	mySession->stopTimeout
+ 	mySession->resetNetworkTimeout();
 }