From 0f6bc1cf1b3f14ba148800169a77170c2ea27ad1 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 12 Oct 2008 20:46:40 +0000 Subject: [PATCH] start implementing ingame votekick gui signals --- src/gui/qt/gametable.ui | 6 +++--- src/gui/qt/gametable/gametableimpl.cpp | 29 ++++++++++++++++++++++++++ src/gui/qt/gametable/gametableimpl.h | 7 +++++++ src/gui/qt/guiwrapper.cpp | 3 +++ src/gui/qt/guiwrapper.h | 3 +++ 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 35c8fd5b..181b2ab9 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1832,14 +1832,14 @@ from this game? - + Yes - + No @@ -2947,7 +2947,7 @@ from this game? 0 0 1000 - 28 + 30 diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 6dcc1546..17ee3eea 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -537,6 +537,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) connect( radioButton_autoCheckFold, SIGNAL( clicked() ) , this, SLOT( changePlayingMode() ) ); connect( radioButton_autoCheckCallAny, SIGNAL( clicked() ), this, SLOT( changePlayingMode() ) ); + connect( pushButton_voteOnKickYes, SIGNAL( clicked() ), this, SLOT( voteOnKickYes() ) ); + connect( pushButton_voteOnKickNo, SIGNAL( clicked() ), this, SLOT( voteOnKickNo() ) ); + //Nachrichten Thread-Save connect(this, SIGNAL(signalInitGui(int)), this, SLOT(initGui(int))); connect(this, SIGNAL(signalRefreshSet()), this, SLOT(refreshSet())); @@ -575,6 +578,8 @@ 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(signalEndVoteOnKick()), this, SLOT(endVoteOnKick())); } @@ -3054,3 +3059,27 @@ void gameTableImpl::triggerVoteOnKick(int id) { // myStartWindow->getSession()->sendVoteKickSignal(id); } +void gameTableImpl::startVoteOnKick() +{ + if(tabWidget_Left->widget(2) != tab_Kick) + tabWidget_Left->insertTab(2, tab_Chat, QString(tr("Kick"))); + + tabWidget_Left->setCurrentIndex(2); +} + +void gameTableImpl::endVoteOnKick() +{ + if(tabWidget_Left->widget(2) == tab_Kick) + tabWidget_Left->removeTab(2); + + tabWidget_Left->setCurrentIndex(1); +} + +void gameTableImpl::voteOnKickYes() +{ +} + +void gameTableImpl::voteOnKickNo() +{ +} + diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h index f8d9ab82..ce905153 100755 --- a/src/gui/qt/gametable/gametableimpl.h +++ b/src/gui/qt/gametable/gametableimpl.h @@ -118,6 +118,9 @@ signals: void signalFlipHolecardsAllIn(); void signalNextRoundCleanGui(); + + void signalStartVoteOnKick(); + void signalEndVoteOnKick(); public slots: @@ -276,6 +279,10 @@ public slots: void showMaximized (); void closeGameTable(); + void startVoteOnKick(); + void endVoteOnKick(); + void voteOnKickYes(); + void voteOnKickNo(); private: diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index bbc3b2ef..39456d03 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -105,6 +105,9 @@ 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::endVoteOnKick() { myW->signalEndVoteOnKick(); } + void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), action, setValue); } void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->signalLogNewGameHandMsg(gameID, handID); } void GuiWrapper::logNewBlindsSetsMsg(int sbSet, int bbSet, std::string sbName, std::string bbName) { myLog->signalLogNewBlindsSetsMsg(sbSet, bbSet, QString::fromUtf8(sbName.c_str()), QString::fromUtf8(bbName.c_str())); } diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 9b9eb753..5b88a7fb 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -96,6 +96,9 @@ public: void startTimeoutAnimation(int playerId, int timeoutSec); void stopTimeoutAnimation(int playerId); + void startVoteOnKick(); + void endVoteOnKick(); + void logPlayerActionMsg(std::string playerName, int action, int setValue) ; void logNewGameHandMsg(int gameID, int handID) ; void logNewBlindsSetsMsg(int sbSet, int bbSet, std::string sbName, std::string bbName);