extra callback for showing internet game login dialog

src/config/configfile.cpp

@@ -296,9 +296,13 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 			if ( confAppDataPath ) {
 				const char *tmpStr = confAppDataPath->Attribute("value");
 				if (tmpStr) tempAppDataPath = tmpStr;
+				//if appdatapath changes directly update it here not in UpdateConfig()
+				if(tempAppDataPath != myQtToolsInterface->getDataPathStdString(myArgv0)) {
+					confAppDataPath->SetAttribute("value", myQtToolsInterface->stringToUtf8(myQtToolsInterface->getDataPathStdString(myArgv0)));
+					doc.SaveFile( configFileName );
+				}
 			}
-
-			if (tempRevision < configRev || tempAppDataPath != myQtToolsInterface->getDataPathStdString(myArgv0) ) { /*löschen()*/
+			if (tempRevision < configRev) {
 				myConfigState = OLD;
 				updateConfig(myConfigState) ;
 			}

src/gui/guiinterface.h

@@ -81,7 +81,7 @@ public:
 	virtual void riverAnimation2()=0;
 
 	virtual void postRiverAnimation1()=0;
-        virtual void postRiverRunAnimation1()=0;
+	virtual void postRiverRunAnimation1()=0;
 	virtual void flipHolecardsAllIn()=0;
 
 	virtual void nextRoundCleanGui()=0;

src/gui/qt/guiwrapper.cpp

@@ -126,6 +126,7 @@ void GuiWrapper::flushLogAtHand() { myLog->signalFlushLogAtHand(); }
 void GuiWrapper::SignalNetClientConnect(int actionID) { myStartWindow->signalNetClientConnect(actionID); }
 void GuiWrapper::SignalNetClientServerListAdd(unsigned serverId) { myStartWindow->signalNetClientServerListAdd(serverId); }
 void GuiWrapper::SignalNetClientServerListShow() { myStartWindow->signalNetClientServerListShow(); }
+void GuiWrapper::SignalNetClientLoginShow() { myStartWindow->signalNetClientLoginShow(); }
 void GuiWrapper::SignalNetClientServerListClear() { myStartWindow->signalNetClientServerListClear(); }
 void GuiWrapper::SignalNetClientGameInfo(int actionID) { myStartWindow->signalNetClientGameInfo(actionID); }
 void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myStartWindow->signalNetClientError(errorID, osErrorID); }

src/gui/qt/guiwrapper.h

@@ -115,6 +115,7 @@ public:
 	void SignalNetClientServerListAdd(unsigned serverId);
 	void SignalNetClientServerListShow();
 	void SignalNetClientServerListClear();
+	void SignalNetClientLoginShow();
 	void SignalNetClientGameInfo(int actionID);
 	void SignalNetClientError(int errorID, int osErrorID);
 	void SignalNetClientNotification(int notificationId);

src/gui/qt/startwindow/startwindowimpl.cpp

@@ -62,7 +62,6 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 // 		myGuiInterface->setSession(session);
 	}
 
-
 // #ifdef __APPLE__
 // 	setWindowModality(Qt::ApplicationModal);
 // 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
@@ -120,6 +119,8 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 	connect(this, SIGNAL(signalNetClientServerListClear()), myServerListDialog, SLOT(clearList()));
 	connect(this, SIGNAL(signalNetClientServerListAdd(unsigned)), myServerListDialog, SLOT(addServerItem(unsigned)));
 
+	connect(this, SIGNAL(signalNetClientLoginShow()), this, SLOT(callInternetGameLoginDialog()));
+	
 	connect(this, SIGNAL(signalNetClientSelfJoined(unsigned, QString, int)), myStartNetworkGameDialog, SLOT(joinedNetworkGame(unsigned, QString, int)));
 	connect(this, SIGNAL(signalNetClientPlayerJoined(unsigned, QString, int)), myStartNetworkGameDialog, SLOT(addConnectedPlayer(unsigned, QString, int)));
 	connect(this, SIGNAL(signalNetClientPlayerChanged(unsigned, QString)), myStartNetworkGameDialog, SLOT(updatePlayer(unsigned, QString)));
@@ -312,21 +313,32 @@ void startWindowImpl::joinGameLobby() {
 	// Clear Lobby dialog.
 	myGameLobbyDialog->clearDialog();
 
+	//start internet client with config values for user and pw TODO
+	mySession->startInternetClient();
+	
+	//Dialog mit Statusbalken
+	myConnectToServerDialog->exec();
+	if (myConnectToServerDialog->result() == QDialog::Accepted ) {
+		showLobbyDialog();
+	}
+	else {
+		mySession->terminateNetworkClient();
+	}
+}
+
+
+void startWindowImpl::callInternetGameLoginDialog() {
+
 	//login
 	myInternetGameLoginDialog->exec();
 	if(myInternetGameLoginDialog->result() == QDialog::Accepted) {
 		//send login infos
-		mySession->startInternetClient(std::string(myInternetGameLoginDialog->lineEdit_username->text().toUtf8().constData()), std::string(myInternetGameLoginDialog->lineEdit_password->text().toUtf8().constData()));
-		
-		//Dialog mit Statusbalken
-		myConnectToServerDialog->exec();
-		if (myConnectToServerDialog->result() == QDialog::Accepted ) {
-			showLobbyDialog();
-		}
-		else {
-			mySession->terminateNetworkClient();
-		}
+//		mySession->
 	}
+	else {
+		myConnectToServerDialog->reject();
+		mySession->terminateNetworkClient();
+	}	
 }
 
 void startWindowImpl::callCreateNetworkGameDialog() {

src/gui/qt/startwindow/startwindowimpl.h

@@ -65,6 +65,7 @@ signals:
 	void signalNetClientServerListShow();
 	void signalNetClientServerListClear();
 	void signalNetClientServerListAdd(unsigned serverId);
+	void signalNetClientLoginShow();
 	void signalNetClientGameInfo(int actionID);
 	void signalNetClientError(int errorID, int osErrorID);
 	void signalNetClientNotification(int notificationId);
@@ -110,6 +111,7 @@ public slots:
 	void callCreateNetworkGameDialog();
 	void callJoinNetworkGameDialog();
 	void showLobbyDialog();
+	void callInternetGameLoginDialog();
 	void joinGameLobby();
 	void showClientDialog();
 	void showNetworkStartDialog();

src/session.cpp

@@ -154,7 +154,7 @@ boost::shared_ptr<AvatarManager> Session::getAvatarManager()
 	return myAvatarManager;
 }
 
-void Session::startInternetClient(const std::string &username, const std::string &password)
+void Session::startInternetClient()
 {
 	if (myNetClient || !myGui)
 	{
@@ -178,8 +178,8 @@ void Session::startInternetClient(const std::string &username, const std::string
 		myConfig->readConfigInt("InternetServerUseIpv6") == 1,
 		myConfig->readConfigInt("InternetServerUseSctp") == 1,
 		useAvatarServer ? myConfig->readConfigString("AvatarServerAddress") : "",
-		username,
-		password,
+		myConfig->readConfigString("MyName"),
+		"testpw",
 		myConfig->readConfigString("MyAvatar"),
 		myQtToolsInterface->stringFromUtf8(myConfig->readConfigString("CacheDir")));
 	myNetClient->Run();

src/session.h

@@ -62,7 +62,7 @@ public:
 
 	boost::shared_ptr<AvatarManager> getAvatarManager();
 
-	void startInternetClient(const std::string &username, const std::string &password);
+	void startInternetClient();
 	void startNetworkClient(const std::string &serverAddress, unsigned serverPort, bool ipv6, bool sctp, const std::string &pwd);
 	void startNetworkClientForLocalServer(const GameData &gameData);
 	void terminateNetworkClient();