Delay after showing cards when all in condition is true. Added option TCP_NODELAY. Round is now shown before dealing cards.

src/gui/generic/serverguiwrapper.cpp

@@ -60,7 +60,7 @@ void ServerGuiWrapper::refreshPot() const {}
 void ServerGuiWrapper::refreshGroupbox(int playerID, int status) const {}
 void ServerGuiWrapper::refreshPlayerName() const {}
 void ServerGuiWrapper::refreshButton() const {}
-void ServerGuiWrapper::refreshGameLabels() const {}
+void ServerGuiWrapper::refreshGameLabels(GameState state) const {}
 
 void ServerGuiWrapper::dealHoleCards() {}
 void ServerGuiWrapper::dealFlopCards() {}

src/gui/generic/serverguiwrapper.h

@@ -44,7 +44,7 @@ public:
 	void refreshAll() const;
 	void refreshPlayerName() const;
 	void refreshButton() const;
-	void refreshGameLabels() const;
+	void refreshGameLabels(GameState state) const;
 
 	void dealHoleCards();
 	void dealFlopCards();

src/gui/guiinterface.h

@@ -49,7 +49,7 @@ public:
 	virtual void refreshAll() const=0;
 	virtual void refreshPlayerName() const=0;
 	virtual void refreshButton() const =0;
-	virtual void refreshGameLabels() const=0;
+	virtual void refreshGameLabels(GameState state) const=0;
 
 // 	// Karten-Funktionen
 	virtual void dealHoleCards()=0;

src/gui/qt/guiwrapper.cpp

@@ -58,7 +58,7 @@ void GuiWrapper::refreshPot() const { myW->signalRefreshPot(); }
 void GuiWrapper::refreshGroupbox(int playerID, int status) const { myW->signalRefreshGroupbox(playerID, status); }
 void GuiWrapper::refreshPlayerName() const { myW->signalRefreshPlayerName(); }
 void GuiWrapper::refreshButton() const { myW->signalRefreshButton(); }
-void GuiWrapper::refreshGameLabels() const { myW->signalRefreshGameLabels(); }
+void GuiWrapper::refreshGameLabels(GameState state) const { myW->signalRefreshGameLabels(state); }
 
 void GuiWrapper::dealHoleCards() { myW->signalDealHoleCards(); }
 void GuiWrapper::dealFlopCards() { myW->signalDealFlopCards0(); }

src/gui/qt/guiwrapper.h

@@ -52,7 +52,7 @@ public:
 	void refreshAll() const;
 	void refreshPlayerName() const;
 	void refreshButton() const;
-	void refreshGameLabels() const;
+	void refreshGameLabels(GameState state) const;
 
 	void dealHoleCards();
 	void dealFlopCards();

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -582,7 +582,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalRefreshAll()), this, SLOT(refreshAll()));
 	connect(this, SIGNAL(signalRefreshPlayerName()), this, SLOT(refreshPlayerName()));
 	connect(this, SIGNAL(signalRefreshButton()), this, SLOT(refreshButton()));
-	connect(this, SIGNAL(signalRefreshGameLabels()), this, SLOT(refreshGameLabels()));
+	connect(this, SIGNAL(signalRefreshGameLabels(int)), this, SLOT(refreshGameLabels(int)));
 
 	connect(this, SIGNAL(signalMeInAction()), this, SLOT(meInAction()));
 
@@ -1186,9 +1186,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) {
 	}
 }
 
-void mainWindowImpl::refreshGameLabels() { 
+void mainWindowImpl::refreshGameLabels(int gameState) { 
 
-	switch(mySession->getCurrentGame()->getCurrentHand()->getActualRound()) {
+	switch(gameState) {
 		case 0: {
 			textLabel_handLabel->setText("Preflop");
 		} break;

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -84,6 +84,7 @@ signals:
 	void signalRefreshAll();
 	void signalRefreshPlayerName();
 	void signalRefreshButton();
+	void signalRefreshGameLabels(int);
 
 	void signalMeInAction();
 
@@ -92,7 +93,6 @@ signals:
 	void signalDealTurnCards0();
 	void signalDealRiverCards0();
 
-	void signalRefreshGameLabels();
 	void signalNextPlayerAnimation();
 
 	void signalPreflopAnimation1();
@@ -134,7 +134,7 @@ public slots:
 	void refreshGroupbox(int =-1, int =-1);
 	void refreshAll();
 	void refreshPlayerName();
-	void refreshGameLabels();
+	void refreshGameLabels(int);
 	void refreshButton();
 	void refreshPlayerAvatar();