diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 181b2ab9..39bb8959 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1782,54 +1782,43 @@ - - - Vote id: - - - - - - - - 0 - 0 - - - - - - + + + + + Vote Timeout: + + + + + + + + 0 + 0 + + + + + + + + - - - Timeout: - - - - - - - - - - - - + 0 0 - Do you want to kick %1 -from this game? + - + @@ -1847,6 +1836,19 @@ from this game? + + + + Qt::Vertical + + + + 20 + 27 + + + + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 17ee3eea..972f6680 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -578,7 +578,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) connect(this, SIGNAL(signalPostRiverRunAnimation1()), this, SLOT(postRiverRunAnimation1())); connect(this, SIGNAL(signalFlipHolecardsAllIn()), this, SLOT(flipHolecardsAllIn())); connect(this, SIGNAL(signalNextRoundCleanGui()), this, SLOT(nextRoundCleanGui())); - connect(this, SIGNAL(signalStartVoteOnKick()), this, SLOT(startVoteOnKick())); + connect(this, SIGNAL(signalStartVoteOnKick(int, int)), this, SLOT(startVoteOnKick(int, int))); connect(this, SIGNAL(signalEndVoteOnKick()), this, SLOT(endVoteOnKick())); } @@ -3059,12 +3059,17 @@ void gameTableImpl::triggerVoteOnKick(int id) { // myStartWindow->getSession()->sendVoteKickSignal(id); } -void gameTableImpl::startVoteOnKick() +void gameTableImpl::startVoteOnKick(int playerId, int timeoutSec) { if(tabWidget_Left->widget(2) != tab_Kick) tabWidget_Left->insertTab(2, tab_Chat, QString(tr("Kick"))); tabWidget_Left->setCurrentIndex(2); + + PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(playerId)); + label_kickUser->setText(tr("Do you want to kick %1 \nfrom this game?").arg(QString::fromUtf8(info.playerName.c_str()))); + +// TODO timeout timer } void gameTableImpl::endVoteOnKick() diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h index ce905153..c815e97f 100755 --- a/src/gui/qt/gametable/gametableimpl.h +++ b/src/gui/qt/gametable/gametableimpl.h @@ -119,7 +119,7 @@ signals: void signalNextRoundCleanGui(); - void signalStartVoteOnKick(); + void signalStartVoteOnKick(int playerId, int timeoutSec); void signalEndVoteOnKick(); public slots: @@ -279,7 +279,7 @@ public slots: void showMaximized (); void closeGameTable(); - void startVoteOnKick(); + void startVoteOnKick(int playerId, int timeoutSec); void endVoteOnKick(); void voteOnKickYes(); void voteOnKickNo(); diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index 39456d03..40bda069 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -105,7 +105,7 @@ void GuiWrapper::disableMyButtons() { myW->signalDisableMyButtons(); } void GuiWrapper::startTimeoutAnimation(int playerId, int timeoutSec) { myW->signalStartTimeoutAnimation(playerId, timeoutSec); } void GuiWrapper::stopTimeoutAnimation(int playerId) { myW->signalStopTimeoutAnimation(playerId); } -void GuiWrapper::startVoteOnKick() { myW->signalStartVoteOnKick(); } +void GuiWrapper::startVoteOnKick(int playerId, int timeoutSec) { myW->signalStartVoteOnKick(playerId, timeoutSec); } void GuiWrapper::endVoteOnKick() { myW->signalEndVoteOnKick(); } void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), action, setValue); } diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 5b88a7fb..8ef22538 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -96,7 +96,7 @@ public: void startTimeoutAnimation(int playerId, int timeoutSec); void stopTimeoutAnimation(int playerId); - void startVoteOnKick(); + void startVoteOnKick(int playerId, int timeoutSec); void endVoteOnKick(); void logPlayerActionMsg(std::string playerName, int action, int setValue) ;