highlightRoundLabel --> refreshGameLabels

src/gui/qt/guiwrapper.cpp

@@ -58,15 +58,13 @@ 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(int round) const { myW->signalRefreshGameLabels(round); }
 
 void GuiWrapper::dealHoleCards() { myW->signalDealHoleCards(); }
 void GuiWrapper::dealFlopCards() { myW->signalDealFlopCards0(); }
 void GuiWrapper::dealTurnCard() { myW->signalDealTurnCards0(); }
 void GuiWrapper::dealRiverCard() { myW->signalDealRiverCards0(); }
 
-void GuiWrapper::highlightRoundLabel(string round) const { myW->signalHighlightRoundLabel(QString::fromUtf8(round.c_str())); }
-
-
 void GuiWrapper::nextPlayerAnimation() { myW->signalNextPlayerAnimation(); }
 
 void GuiWrapper::preflopAnimation1() { myW->signalPreflopAnimation1(); }

src/gui/qt/guiwrapper.h

@@ -58,7 +58,7 @@ public:
 	void dealTurnCard();
 	void dealRiverCard();
 
-	void highlightRoundLabel(std::string round) const;
+	void refreshGameLabels(int round) const;
 
 	void nextPlayerAnimation();
 

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -591,7 +591,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalDealTurnCards0()), this, SLOT(dealTurnCards0()));
 	connect(this, SIGNAL(signalDealRiverCards0()), this, SLOT(dealRiverCards0()));
 
-	connect(this, SIGNAL(signalHighlightRoundLabel(QString)), this, SLOT(highlightRoundLabel(QString)));
+	connect(this, SIGNAL(signalRefreshGameLabels(int)), this, SLOT(refreshGameLabels(int)));
 	connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation()));
 
 	connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1()));
@@ -1204,19 +1204,31 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) {
 	}
 }
 
-void mainWindowImpl::highlightRoundLabel(QString round) { 
+void mainWindowImpl::refreshGameLabels(int round) { 
 
-	// für PostRiverRun (alte Runden stehen lassen)
-	if(round != "") {
-
-// 		QPalette tempPalette = frame_handLabel->palette();
-// 		tempPalette.setColor(QPalette::Window, highlight);
-// 		frame_handLabel->setPalette(tempPalette);
-		
-		textLabel_handLabel->setText(round);
-		textLabel_handNumber->setText(QString::number(mySession->getCurrentGame()->getCurrentHand()->getMyID(),10));
-		textLabel_gameNumber->setText(QString::number(mySession->getCurrentGame()->getMyGameID(),10));
+	switch(round) {
+		case 0: {
+			textLabel_handLabel->setText("Preflop");
+		} break;
+		case 1: {
+			textLabel_handLabel->setText("Flop");
+		} break;
+		case 2: {
+			textLabel_handLabel->setText("Turn");
+		} break;
+		case 3: {
+			textLabel_handLabel->setText("River");
+		} break;
+		case 4: {
+			textLabel_handLabel->setText("");
+		} break;
+		default: {
+			textLabel_handLabel->setText("!!! ERROR !!!");
+		}
 	}
+
+	textLabel_handNumber->setText(QString::number(mySession->getCurrentGame()->getCurrentHand()->getMyID(),10));
+	textLabel_gameNumber->setText(QString::number(mySession->getCurrentGame()->getMyGameID(),10));
 }
 
 void mainWindowImpl::refreshAll() {

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -94,7 +94,7 @@ signals:
 	void signalDealTurnCards0();
 	void signalDealRiverCards0();
 
-	void signalHighlightRoundLabel(QString);
+	void signalRefreshGameLabels(int);
 	void signalNextPlayerAnimation();
 
 	void signalPreflopAnimation1();
@@ -133,7 +133,7 @@ public slots:
 	void refreshGroupbox(int =-1, int =-1);
 	void refreshAll();
 	void refreshPlayerName();
-
+	void refreshGameLabels(int);
 	void refreshButton();
 	void refreshPlayerAvatar();
 
@@ -144,8 +144,6 @@ public slots:
 	void meInAction();
 	void disableMyButtons();
 
-	void highlightRoundLabel(QString);
-
 	void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!!
 
 	void callNewGameDialog() ;