diff --git a/pokerth.pro b/pokerth.pro
index fec9ee36..968cbdd7 100755
--- a/pokerth.pro
+++ b/pokerth.pro
@@ -30,7 +30,6 @@ INCLUDEPATH += . \
src/gui/qt/settingsdialog \
src/gui/qt/settingsdialog/selectavatardialog \
src/gui/qt/startnetworkgamedialog \
- src/gui/qt/waitforservertostartgamedialog \
src/gui/qt/changehumanplayernamedialog
DEPENDPATH += . \
@@ -61,7 +60,6 @@ DEPENDPATH += . \
src/gui/qt/settingsdialog \
src/gui/qt/settingsdialog/selectavatardialog \
src/gui/qt/startnetworkgamedialog \
- src/gui/qt/waitforservertostartgamedialog \
src/gui/qt/changehumanplayernamedialog
# Input
HEADERS += src/game.h \
@@ -145,7 +143,6 @@ HEADERS += src/game.h \
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h \
src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h \
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \
- src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h \
src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.h \
src/gui/qttoolsinterface.h \
src/gui/qt/qttools/qttoolswrapper.h \
@@ -160,7 +157,6 @@ FORMS += src/gui/qt/mainwindow.ui \
src/gui/qt/settingsdialog.ui \
src/gui/qt/selectavatardialog.ui \
src/gui/qt/startnetworkgamedialog.ui \
- src/gui/qt/waitforservertostartgamedialog.ui \
src/gui/qt/changehumanplayernamedialog.ui
SOURCES += src/game.cpp \
src/pokerth.cpp \
@@ -253,7 +249,6 @@ SOURCES += src/game.cpp \
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp \
src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp \
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \
- src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp \
src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \
src/gui/qttoolsinterface.cpp \
src/gui/qt/qttools/qttoolswrapper.cpp \
diff --git a/src/gui/qt/startnetworkgamedialog.ui b/src/gui/qt/startnetworkgamedialog.ui
index 50bf090e..52203556 100644
--- a/src/gui/qt/startnetworkgamedialog.ui
+++ b/src/gui/qt/startnetworkgamedialog.ui
@@ -5,8 +5,8 @@
0
0
- 287
- 259
+ 311
+ 470
@@ -19,6 +19,80 @@
6
+ -
+
+
+ Lobby-Chat
+
+
+
+ 7
+
+
+ 0
+
+
-
+
+
+ -
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 181
+ 20
+
+
+
+
+ -
+
+
+ Start Game
+
+
+
+ -
+
+
+ Cancel
+
+
+
+
+
+ -
+
+
+
+ Connected Players
+
+
+
+
-
@@ -63,59 +137,6 @@
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- Connected Players
-
-
-
-
- -
-
-
- 0
-
-
- 6
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 181
- 20
-
-
-
-
- -
-
-
- Start Game
-
-
-
- -
-
-
- Cancel
-
-
-
-
-
diff --git a/src/gui/qt/waitforservertostartgamedialog.ui b/src/gui/qt/waitforservertostartgamedialog.ui
deleted file mode 100644
index f286de69..00000000
--- a/src/gui/qt/waitforservertostartgamedialog.ui
+++ /dev/null
@@ -1,101 +0,0 @@
-
- waitForServerToStartGameDialog
-
-
-
- 0
- 0
- 279
- 257
-
-
-
- Waiting for Server ...
-
-
-
- 9
-
-
- 6
-
- -
-
-
-
- Connected Players
-
-
-
-
- -
-
-
- Waiting for the server to start the game ...
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 100
- 16777215
-
-
-
- Cancel
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
- pushButton_cancel
- clicked()
- waitForServerToStartGameDialog
- reject()
-
-
- 162
- 231
-
-
- 64
- 233
-
-
-
-
-
diff --git a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp b/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp
deleted file mode 100644
index e5f52918..00000000
--- a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2006 by FThauer FHammer *
- * f.thauer@web.de *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-#include "waitforservertostartgamedialogimpl.h"
-#include "session.h"
-#include
-// #include "configfile.h"
-
-waitForServerToStartGameDialogImpl::waitForServerToStartGameDialogImpl(QWidget *parent)
- : QDialog(parent)
-{
-
- setupUi(this);
-
- connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) );
-
-}
-
-void waitForServerToStartGameDialogImpl::refresh(int actionID) {
-
- if (actionID == MSG_NET_GAME_CLIENT_START)
- {
- QTimer::singleShot(500, this, SLOT(accept()));
- }
-}
-
-void waitForServerToStartGameDialogImpl::cancel() {
-
-}
-
-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
deleted file mode 100644
index 6ca5c9b1..00000000
--- a/src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2006 by FThauer FHammer *
- * f.thauer@web.de *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-#ifndef WAITFORSERVERTOSTARTGAMEDIALOGIMPL_H
-#define WAITFORSERVERTOSTARTGAMEDIALOGIMPL_H
-
-#include "ui_waitforservertostartgamedialog.h"
-
-#include
-#include
-
-class Session;
-
-class waitForServerToStartGameDialogImpl: public QDialog, public Ui::waitForServerToStartGameDialog {
-Q_OBJECT
-public:
- waitForServerToStartGameDialogImpl(QWidget *parent = 0);
-
-public slots:
-
- void refresh(int actionID);
- void cancel();
- void keyPressEvent ( QKeyEvent * event );
- void addConnectedPlayer(QString playerName);
- void removePlayer(QString playerName);
-};
-
-#endif