next steps startwindow-integration. network- and internet-game --> UNSTABLE

pokerth_game.pro

@@ -7,8 +7,8 @@ isEmpty( PREFIX ) {
 TEMPLATE = app
 CODECFORSRC = UTF-8
 
-CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
+#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
-#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
+CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
 
 #####Uncomment this for RELEASE
 #QTPLUGIN += qjpeg qgif

pokerth_lib.pro

@@ -3,8 +3,8 @@
 TEMPLATE = lib
 CODECFORSRC = UTF-8
 
-CONFIG += staticlib thread exceptions rtti stl warn_on release
+#CONFIG += staticlib thread exceptions rtti stl warn_on release
-#CONFIG += staticlib thread exceptions rtti stl warn_on debug
+CONFIG += staticlib thread exceptions rtti stl warn_on debug
 
 UI_DIR = uics
 TARGET = lib/pokerth_lib

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -208,6 +208,7 @@ void gameLobbyDialogImpl::refresh(int actionID) {
 	{
 		treeWidget_GameList->clear();
 		this->accept();
+		myW->show();
 // 		TODO doitux: hier gametable holen
 	}
 }

src/gui/qt/guiwrapper.cpp

@@ -123,6 +123,11 @@ void GuiWrapper::logPlayerWinGame(std::string playerName, int gameID) { myLog->s
 void GuiWrapper::flushLogAtGame(int gameID) { myLog->signalFlushLogAtGame(gameID); }
 void GuiWrapper::flushLogAtHand() { myLog->signalFlushLogAtHand(); }
 
+void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { myW->signalNetClientGameStart(game); }
+
+
+
+
 ////////// this is for startwindow ////////////////////
 
 
@@ -161,7 +166,7 @@ void GuiWrapper::SignalNetClientGameListUpdateAdmin(unsigned gameId, unsigned ad
 void GuiWrapper::SignalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId) { myStartWindow->signalNetClientGameListPlayerJoined(gameId, playerId); }
 void GuiWrapper::SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId) { myStartWindow->signalNetClientGameListPlayerLeft(gameId, playerId); }
 
-void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { myStartWindow->signalNetClientGameStart(game); }
+
 void GuiWrapper::SignalNetClientWaitDialog() { myStartWindow->signalShowClientDialog(); }
 void GuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { myW->signalNetClientChatMsg(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); }
 void GuiWrapper::SignalNetServerSuccess(int /*actionID*/) { }

src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp

@@ -234,3 +234,9 @@ bool startNetworkGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 void startNetworkGameDialogImpl::receiveChatMsg(QString playerName, QString message) {
 	myChat->receiveMessage(playerName, message);
 }
+
+void startNetworkGameDialogImpl::accept()
+{
+	myW->show();
+	QDialog::accept();
+}

src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h

@@ -46,6 +46,7 @@ public slots:
 	void startGame();
 	void cancel();
 	void refresh(int actionID);
+	void accept();
 	void joinedNetworkGame(unsigned playerId, QString playerName, int rights);
 	void addConnectedPlayer(unsigned playerId, QString playerName, int rights);
 	void updatePlayer(unsigned playerId, QString newPlayerName);