diff --git a/src/gui/generic/serverguiwrapper.cpp b/src/gui/generic/serverguiwrapper.cpp
index 0ec328d4..430dd219 100644
--- a/src/gui/generic/serverguiwrapper.cpp
+++ b/src/gui/generic/serverguiwrapper.cpp
@@ -147,6 +147,8 @@ void ServerGuiWrapper::SignalNetClientGameChatMsg(const string &playerName, cons
void ServerGuiWrapper::SignalNetClientLobbyChatMsg(const string &playerName, const string &msg) { if (myClientcb) myClientcb->SignalNetClientLobbyChatMsg(playerName, msg); }
void ServerGuiWrapper::SignalNetClientMsgBox(const string &msg) { if (myClientcb) myClientcb->SignalNetClientMsgBox(msg); }
void ServerGuiWrapper::SignalNetClientWaitDialog() { if (myClientcb) myClientcb->SignalNetClientWaitDialog(); }
+void ServerGuiWrapper::SignalNetClientWarningAutoFoldInRankingGame(unsigned remainingAutoFolds) { if (myClientcb) myClientcb->SignalNetClientWarningAutoFoldInRankingGame(remainingAutoFolds); }
+
void ServerGuiWrapper::SignalNetServerSuccess(int actionID) { if (myServercb) myServercb->SignalNetServerSuccess(actionID); }
void ServerGuiWrapper::SignalNetServerError(int errorID, int osErrorID) { if (myServercb) myServercb->SignalNetServerError(errorID, osErrorID); }
diff --git a/src/gui/generic/serverguiwrapper.h b/src/gui/generic/serverguiwrapper.h
index 90e98dd1..0ff9b987 100644
--- a/src/gui/generic/serverguiwrapper.h
+++ b/src/gui/generic/serverguiwrapper.h
@@ -120,6 +120,7 @@ public:
void SignalNetClientGameChatMsg(const std::string &playerName, const std::string &msg);
void SignalNetClientLobbyChatMsg(const std::string &playerName, const std::string &msg);
void SignalNetClientWaitDialog();
+ void SignalNetClientWarningAutoFoldInRankingGame(unsigned remainingAutoFolds);
void SignalNetClientGameListNew(unsigned gameId);
void SignalNetClientGameListRemove(unsigned gameId);
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 0ab59375..3d89bae7 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -1552,7 +1552,7 @@ void gameLobbyDialogImpl::showAutoStartTimer()
autoStartTimerOverlay->setGeometry(((scrollArea_gameInfos->geometry().width()-190)/2), ((scrollArea_gameInfos->geometry().height()-50)/2), 190, 50);
QString string(tr("The game will start in
%1 seconds.").arg(6));
- autoStartTimerOverlay->setText(""+string+"");
+ autoStartTimerOverlay->setText(""+string+"");
autoStartTimerCounter = 6;
autoStartTimer->start(1000);
@@ -1563,7 +1563,7 @@ void gameLobbyDialogImpl::updateAutoStartTimer()
--autoStartTimerCounter;
if(autoStartTimerCounter) {
QString string(tr("The game will start in
%1 seconds.").arg(autoStartTimerCounter));
- autoStartTimerOverlay->setText(""+string+"");
+ autoStartTimerOverlay->setText(""+string+"");
}
else {
autoStartTimer->stop();
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 855994c3..767b62f9 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -508,7 +508,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
connect(this, SIGNAL(signalEndVoteOnKick()), this, SLOT(endVoteOnKick()));
connect(this, SIGNAL(signalNetClientPlayerLeft(unsigned)), this, SLOT(netClientPlayerLeft(unsigned)));
-
+ connect(this, SIGNAL(signalWarningAutoFoldInRankingGame(unsigned)), this, SLOT(showWarningAutoFoldInRankingGame(unsigned)));
}
gameTableImpl::~gameTableImpl() {
@@ -3387,3 +3387,13 @@ void gameTableImpl::sendShowMyCardsSignal()
pushButton_showMyCards->hide();
}
}
+
+void gameTableImpl::showWarningAutoFoldInRankingGame(unsigned remainingAutoFolds)
+{
+ QMessageBox::warning(this, tr("PokerTH - Warning"),
+ tr("You have triggered a warning level of timeouts in a ranking game.\n"
+ "After %1 additional timeouts the server needs to kick you to provide a better game flow!\n\n"
+ "If you are temporarily away, you can use the \"away\" tools in the tool box on the right."),
+ QMessageBox::Ok);
+ tabWidget_Right->setCurrentIndex(1);
+}
diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h
index 9667f676..71a50248 100755
--- a/src/gui/qt/gametable/gametableimpl.h
+++ b/src/gui/qt/gametable/gametableimpl.h
@@ -119,14 +119,12 @@ signals:
void signalPostRiverShowCards(unsigned playerId);
void signalFlipHolecardsAllIn();
-
void signalNextRoundCleanGui();
-
void signalStartVoteOnKick(unsigned playerId, unsigned voteStarterPlayerId, int timeoutSec, int numVotesNeededToKick);
void signalChangeVoteOnKickButtonsState(bool showHide);
void signalEndVoteOnKick();
-
void signalNetClientPlayerLeft(unsigned playerId);
+ void signalWarningAutoFoldInRankingGame(unsigned remainingAutoFolds);
public slots:
@@ -309,6 +307,8 @@ public slots:
void showShowMyCardsButton();
void sendShowMyCardsSignal();
+ void showWarningAutoFoldInRankingGame(unsigned);
+
private:
boost::shared_ptr myServerGuiInterface;
diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index ec3e0470..1aeb56f2 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -168,6 +168,8 @@ void GuiWrapper::SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned pla
void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr game) { myStartWindow->signalNetClientGameStart(game); }
void GuiWrapper::SignalNetClientWaitDialog() { myStartWindow->signalShowClientDialog(); }
+void GuiWrapper::SignalNetClientWarningAutoFoldInRankingGame(unsigned remainingAutoFolds) { myW->signalWarningAutoFoldInRankingGame(remainingAutoFolds); }
+
void GuiWrapper::SignalNetClientGameChatMsg(const string &playerName, const string &msg) { myStartWindow->signalNetClientGameChatMsg(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); }
void GuiWrapper::SignalNetClientLobbyChatMsg(const string &playerName, const string &msg) { myStartWindow->signalNetClientLobbyChatMsg(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); }
void GuiWrapper::SignalNetClientMsgBox(const string &msg) { myStartWindow->signalNetClientMsgBox(QString::fromUtf8(msg.c_str())); }
diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h
index aaab4200..dcbeee3e 100644
--- a/src/gui/qt/guiwrapper.h
+++ b/src/gui/qt/guiwrapper.h
@@ -133,6 +133,8 @@ public:
void SignalNetClientLobbyChatMsg(const std::string &playerName, const std::string &msg);
void SignalNetClientMsgBox(const std::string &msg);
void SignalNetClientWaitDialog();
+ void SignalNetClientWarningAutoFoldInRankingGame(unsigned remainingAutoFolds);
+
void SignalNetClientGameListNew(unsigned gameId);
void SignalNetClientGameListRemove(unsigned gameId);
diff --git a/src/net/clientcallback.h b/src/net/clientcallback.h
index 4d980596..b2b34ad3 100644
--- a/src/net/clientcallback.h
+++ b/src/net/clientcallback.h
@@ -60,6 +60,7 @@ public:
virtual void SignalNetClientLobbyChatMsg(const std::string &playerName, const std::string &msg) = 0;
virtual void SignalNetClientMsgBox(const std::string &msg) = 0;
virtual void SignalNetClientWaitDialog() = 0;
+ virtual void SignalNetClientWarningAutoFoldInRankingGame(unsigned remainingAutoFolds) = 0;
virtual void SignalNetClientServerListAdd(unsigned serverId) = 0;
virtual void SignalNetClientServerListClear() = 0;