diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index 9e60ddd5..f3889454 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -93,7 +93,8 @@ void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->logNewGameHa
void GuiWrapper::SignalNetClientConnect(int actionID) { myW->SignalNetClientConnect(actionID); }
void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->SignalNetClientGameInfo(actionID); }
void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->SignalNetClientError(errorID, osErrorID); }
-
+void GuiWrapper::SignalNetClientPlayerJoined(const string &playerName) { myW->SignalNetClientPlayerJoined(QString::fromUtf8(playerName.c_str())); }
+void GuiWrapper::SignalNetClientPlayerLeft(const string &playerName) { myW->SignalNetClientPlayerLeft(QString::fromUtf8(playerName.c_str())); }
void GuiWrapper::SignalNetClientGameStart(const GameData &gameData) { myW->SignalNetClientGameStart(gameData.numberOfPlayers, gameData.startCash, gameData.smallBlind, gameData.handsBeforeRaise); }
void GuiWrapper::SignalNetServerSuccess(int actionID) { }
@@ -101,3 +102,4 @@ 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 5481fa2b..a929044f 100644
--- a/src/gui/qt/guiwrapper.h
+++ b/src/gui/qt/guiwrapper.h
@@ -93,6 +93,8 @@ public:
void SignalNetClientConnect(int actionID);
void SignalNetClientGameInfo(int actionID);
void SignalNetClientError(int errorID, int osErrorID);
+ void SignalNetClientPlayerJoined(const std::string &playerName);
+ void SignalNetClientPlayerLeft(const std::string &playerName);
void SignalNetClientGameStart(const GameData &gameData);
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index f6bb275c..821349a2 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -552,6 +552,9 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
//Nachrichten Thread-Save
connect(this, SIGNAL(SignalNetClientConnect(int)), myConnectToServerDialog, SLOT(refresh(int)));
connect(this, SIGNAL(SignalNetClientGameInfo(int)), myWaitingForServerGameDialog, SLOT(refresh(int)));
+ connect(this, SIGNAL(SignalNetClientPlayerJoined(QString)), myWaitingForServerGameDialog, SLOT(addConnectedPlayer(QString)));
+ connect(this, SIGNAL(SignalNetClientPlayerLeft(QString)), myWaitingForServerGameDialog, SLOT(removePlayer(QString)));
+
// Errors are handled globally, not within one dialog.
connect(this, SIGNAL(SignalNetClientError(int, int)), this, SLOT(networkError(int, int)));
connect(this, SIGNAL(SignalNetClientGameStart(int, int, int, int)), this, SLOT(networkStart(int, int, int, int)));
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h
index b0f4083d..2f74a7f7 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.h
+++ b/src/gui/qt/mainwindow/mainwindowimpl.h
@@ -96,10 +96,13 @@ signals:
void SignalNetClientConnect(int actionID);
void SignalNetClientGameInfo(int actionID);
void SignalNetClientError(int errorID, int osErrorID);
+ void SignalNetClientPlayerJoined(QString playerName);
+ void SignalNetClientPlayerLeft(QString playerName);
void SignalNetClientGameStart(int numberOfPlayers, int startCash, int smallBlind, int handsBeforeRaise);
void SignalNetServerPlayerJoined(QString playerName);
void SignalNetServerPlayerLeft(QString playerName);
+
public slots:
void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!!
diff --git a/src/gui/qt/waitforservertostartgamedialog.ui b/src/gui/qt/waitforservertostartgamedialog.ui
index c1201830..ba5e4832 100644
--- a/src/gui/qt/waitforservertostartgamedialog.ui
+++ b/src/gui/qt/waitforservertostartgamedialog.ui
@@ -6,7 +6,7 @@
0
0
279
- 81
+ 257
@@ -19,33 +19,26 @@
6
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
+
-
+
+
+
+ Connected Player
+
+
+
- -
-
-
- Qt::Horizontal
+
-
+
+
+ Waiting for the server to start the game ...
-
-
- 40
- 20
-
+
+ Qt::AlignCenter
-
+
- -
+
-
@@ -58,15 +51,31 @@
- -
-
-
- Waiting for the server to start the game ...
+
-
+
+
+ Qt::Horizontal
-
- Qt::AlignCenter
+
+
+ 40
+ 20
+
-
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
diff --git a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp
index 391fed1a..b8cfaa76 100644
--- a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp
+++ b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp
@@ -45,3 +45,17 @@ void waitForServerToStartGameDialogImpl::keyPressEvent ( QKeyEvent * event ) {
// if (event->key() == 16777220) { pushButton_connect->click(); } //ENTER
}
+
+void waitForServerToStartGameDialogImpl::addConnectedPlayer(QString playerName) {
+
+ QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget,0);
+ item->setData(0, 0, playerName);
+}
+
+void waitForServerToStartGameDialogImpl::removePlayer(QString playerName) {
+
+ QList list = treeWidget->findItems(playerName, Qt::MatchExactly, 0);
+ if(!list.empty()) {
+ treeWidget->takeTopLevelItem(treeWidget->indexOfTopLevelItem(list[0]));
+ }
+}
diff --git a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h
index f0ba68c7..a9227e46 100644
--- a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h
+++ b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h
@@ -38,6 +38,8 @@ public slots:
void refresh(int actionID);
void cancel();
void keyPressEvent ( QKeyEvent * event );
+ void addConnectedPlayer(QString playerName);
+ void removePlayer(QString playerName);
};
#endif