next steps startwindow-integration --> UNSTABLE

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -10,6 +10,7 @@
 //
 //
 #include "gamelobbydialogimpl.h"
+#include "startwindowimpl.h"
 #include "lobbychat.h"
 #include "changecompleteblindsdialogimpl.h"
 #include "session.h"
@@ -17,8 +18,8 @@
 #include "gamedata.h"
 #include <net/socket_msg.h>
 
-gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
- : QDialog(parent), myW(NULL), myConfig(c), mySession(NULL), currentGameName(""), myPlayerId(0), isAdmin(false), inGame(false), myChat(NULL), keyUpCounter(0)
+gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
+ : QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), mySession(NULL), currentGameName(""), myPlayerId(0), isAdmin(false), inGame(false), myChat(NULL), keyUpCounter(0)
 {
 
 #ifdef __APPLE__
@@ -209,7 +210,6 @@ void gameLobbyDialogImpl::refresh(int actionID) {
 		treeWidget_GameList->clear();
 		this->accept();
 		myW->show();
-// 		TODO doitux: hier gametable holen
 	}
 }
 
@@ -841,3 +841,9 @@ void gameLobbyDialogImpl::joinAnyGameButtonRefresh() {
 	else pushButton_joinAnyGame->setEnabled(FALSE);
 }
 
+void gameLobbyDialogImpl::reject()
+{
+	myStartWindow->show();
+	QDialog::reject();
+}
+

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h

@@ -27,6 +27,7 @@
 class Session;
 class ConfigFile;
 class LobbyChat;
+class startWindowImpl;
 
 /**
 	@author FThauer FHammer <webmaster@pokerth.net>
@@ -34,7 +35,7 @@ class LobbyChat;
 class gameLobbyDialogImpl: public QDialog, public Ui::gameLobbyDialog {
 Q_OBJECT
 public:
-	gameLobbyDialogImpl(QWidget *parent = 0, ConfigFile* = 0);
+	gameLobbyDialogImpl(startWindowImpl *parent = 0, ConfigFile* = 0);
 
 	~gameLobbyDialogImpl();
 
@@ -102,10 +103,12 @@ public slots:
 
 	void joinAnyGameButtonRefresh();
 
-
+	void reject();
+	
 private:
 	
 	gameTableImpl* myW;
+	startWindowImpl* myStartWindow;
 	ConfigFile *myConfig;	
 	Session *mySession;
 	createInternetGameDialogImpl *myCreateInternetGameDialog;