From d7e2bf9a2ed2acef5478f6ed27061ec8876aeebf Mon Sep 17 00:00:00 2001 From: doitux Date: Wed, 2 May 2007 22:46:29 +0000 Subject: [PATCH] --- src/gui/qt/guiwrapper.cpp | 1 + src/gui/qt/guiwrapper.h | 1 + src/gui/qt/mainwindow/mainwindowimpl.cpp | 1 + src/gui/qt/mainwindow/mainwindowimpl.h | 1 + .../startnetworkgamedialog/startnetworkgamedialogimpl.cpp | 8 ++++++++ .../startnetworkgamedialog/startnetworkgamedialogimpl.h | 1 + 6 files changed, 13 insertions(+) diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index 2aa0a962..9e60ddd5 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -99,4 +99,5 @@ void GuiWrapper::SignalNetClientGameStart(const GameData &gameData) { myW->Signa void GuiWrapper::SignalNetServerSuccess(int actionID) { } void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { } void GuiWrapper::SignalNetServerPlayerJoined(const string &playerName) { myW->SignalNetServerPlayerJoined(QString::fromUtf8(playerName.c_str())); } +void GuiWrapper::SignalNetServerPlayerLeft(const string &playerName) { myW->SignalNetServerPlayerLeft(QString::fromUtf8(playerName.c_str())); } diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 3abf2eea..5481fa2b 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -99,6 +99,7 @@ public: void SignalNetServerSuccess(int actionID); void SignalNetServerError(int errorID, int osErrorID); void SignalNetServerPlayerJoined(const std::string &playerName); + void SignalNetServerPlayerLeft(const std::string &playerName); private: diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 75d0a86a..f2079218 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -557,6 +557,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) connect(this, SIGNAL(SignalNetClientGameStart(int, int, int, int)), this, SLOT(networkStart(int, int, int, int))); connect(this, SIGNAL(SignalNetServerPlayerJoined(QString)), myStartNetworkGameDialog, SLOT(addConnectedPlayer(QString))); + connect(this, SIGNAL(SignalNetServerPlayerLeft(QString)), myStartNetworkGameDialog, SLOT(removePlayer(QString))); // textBrowser_Log->append(QString::number(this->pos().x(),10)+" "+QString::number(this->pos().y(),10)); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index fd2335d9..b0f4083d 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -98,6 +98,7 @@ signals: void SignalNetClientError(int errorID, int osErrorID); void SignalNetClientGameStart(int numberOfPlayers, int startCash, int smallBlind, int handsBeforeRaise); void SignalNetServerPlayerJoined(QString playerName); + void SignalNetServerPlayerLeft(QString playerName); public slots: diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index becf0ceb..37d0d1bc 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -47,6 +47,14 @@ void startNetworkGameDialogImpl::addConnectedPlayer(QString playerName) { item->setData(0, 0, playerName); } +void startNetworkGameDialogImpl::removePlayer(QString playerName) { + + QList list = treeWidget->findItems(playerName, Qt::MatchExactly, 0); + if(!list.empty()) { + treeWidget->takeTopLevelItem(treeWidget->indexOfTopLevelItem(list[0])); + } +} + void startNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h index df1cf2b5..1290b6b4 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h @@ -38,6 +38,7 @@ public slots: void startGame(); void cancel(); void addConnectedPlayer(QString playerName); + void removePlayer(QString playerName); void keyPressEvent ( QKeyEvent*); };