diff --git a/pokerth.pro b/pokerth.pro
index ddb270b5..11df587e 100755
--- a/pokerth.pro
+++ b/pokerth.pro
@@ -18,8 +18,8 @@ HEADERS += tinystr.h \
newgamedialogimpl.h \
aboutpokerthimpl.h \
settingsdialogimpl.h \
- joinnetworkgamedialog.h \
- connecttoserverdialog.h \
+ joinnetworkgamedialogimpl.h \
+ connecttoserverdialogimpl.h \
configfile.h \
log.h \
guiinterface.h \
@@ -55,8 +55,8 @@ SOURCES += pokerth.cpp \
newgamedialogimpl.cpp \
aboutpokerthimpl.cpp \
settingsdialogimpl.cpp \
- joinnetworkgamedialog.cpp \
- connecttoserverdialog.cpp \
+ joinnetworkgamedialogimpl.cpp \
+ connecttoserverdialogimpl.cpp \
configfile.cpp \
log.cpp \
guiinterface.cpp \
diff --git a/src/gui/guiinterface.h b/src/gui/guiinterface.h
index c5759175..386258c3 100644
--- a/src/gui/guiinterface.h
+++ b/src/gui/guiinterface.h
@@ -95,6 +95,9 @@ public:
virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
virtual void logNewGameHandMsg(int gameID, int HandID) =0;
+ //connectToServerDialog
+ virtual void refreshConnectToServerDialog(int messageID, int percent) =0;
+
diff --git a/src/gui/qt/connecttoserverdialog.ui b/src/gui/qt/connecttoserverdialog.ui
index 0a304ffc..494c1ecd 100644
--- a/src/gui/qt/connecttoserverdialog.ui
+++ b/src/gui/qt/connecttoserverdialog.ui
@@ -85,5 +85,22 @@
-
+
+
+ pushButton
+ clicked()
+ connectToServerDialog
+ reject()
+
+
+ 122
+ 96
+
+
+ 44
+ 90
+
+
+
+
diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialog.cpp b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
similarity index 93%
rename from src/gui/qt/connecttoserverdialog/connecttoserverdialog.cpp
rename to src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
index 050519fd..251f1249 100644
--- a/src/gui/qt/connecttoserverdialog/connecttoserverdialog.cpp
+++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "connecttoserverdialog.h"
+#include "connecttoserverdialogimpl.h"
// #include "configfile.h"
connectToServerDialogImpl::connectToServerDialogImpl(QWidget *parent)
@@ -30,3 +30,8 @@ connectToServerDialogImpl::connectToServerDialogImpl(QWidget *parent)
}
+void connectToServerDialogImpl::refresh(int messageID, int percent) {
+
+
+
+}
diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialog.h b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h
similarity index 97%
rename from src/gui/qt/connecttoserverdialog/connecttoserverdialog.h
rename to src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h
index b05a7122..66762943 100644
--- a/src/gui/qt/connecttoserverdialog/connecttoserverdialog.h
+++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h
@@ -32,8 +32,11 @@ Q_OBJECT
public:
connectToServerDialogImpl(QWidget *parent = 0);
+
public slots:
+ void refresh(int messageID, int percent);
+
};
#endif
diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index 63151ef4..8b8601ba 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -32,6 +32,7 @@ GuiWrapper::GuiWrapper() : myLog(0), myW(0)
myW->show();
myLog = new Log(myW);
+ myConnectToServerDialog = new connectToServerDialogImpl();
myConfig = new ConfigFile;
@@ -89,4 +90,4 @@ void GuiWrapper::meInAction() const { myW->meInAction(); }
void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->logPlayerActionMsg(playerName, action, setValue); }
void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->logNewGameHandMsg(gameID, handID); }
-
+void GuiWrapper::refreshConnectToServerDialog(int messageID, int percent) { myConnectToServerDialog->refresh(messageID, percent); }
diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h
index 99b1ad6f..fc7af68d 100644
--- a/src/gui/qt/guiwrapper.h
+++ b/src/gui/qt/guiwrapper.h
@@ -24,6 +24,7 @@
#include "log.h"
#include "mainwindowimpl.h"
+#include "connecttoserverdialogimpl.h"
#include "configfile.h"
#include
@@ -86,12 +87,16 @@ public:
void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
void logNewGameHandMsg(int gameID, int handID) ;
+ void refreshConnectToServerDialog(int messageID, int percent);
+
private:
Log *myLog;
mainWindowImpl *myW;
ConfigFile *myConfig;
+ connectToServerDialogImpl *myConnectToServerDialog;
+
};
#endif
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialog.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
similarity index 97%
rename from src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialog.cpp
rename to src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index 861f7185..121df928 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialog.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "joinnetworkgamedialog.h"
+#include "joinnetworkgamedialogimpl.h"
// #include "configfile.h"
joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialog.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
similarity index 100%
rename from src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialog.h
rename to src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 1d9e7b9f..e48b3593 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -22,8 +22,8 @@
#include "newgamedialogimpl.h"
#include "aboutpokerthimpl.h"
#include "settingsdialogimpl.h"
-#include "joinnetworkgamedialog.h"
-#include "connecttoserverdialog.h"
+#include "joinnetworkgamedialogimpl.h"
+#include "connecttoserverdialogimpl.h"
#include "startsplash.h"