next steps startwindow-integration --> UNSTABLE

src/gui/qt/gametable/gametableimpl.cpp

@@ -480,11 +480,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 	myConnectToServerDialog = boost::shared_ptr<connectToServerDialogImpl>(new connectToServerDialogImpl(this));
 	myStartNetworkGameDialog = boost::shared_ptr<startNetworkGameDialogImpl>(new startNetworkGameDialogImpl(this, myConfig));
 	myCreateNetworkGameDialog = boost::shared_ptr<createNetworkGameDialogImpl>(new createNetworkGameDialogImpl(this, myConfig));
-	myAboutPokerthDialog = boost::shared_ptr<aboutPokerthImpl>(new aboutPokerthImpl(this, myConfig));
-// 	myGameLobbyDialog = boost::shared_ptr<gameLobbyDialogImpl>(new gameLobbyDialogImpl(this, myConfig));
 
 	myStartNetworkGameDialog->setMyW(this);
-// 	myGameLobbyDialog->setMyW(this);
 	
 	myTimeoutDialog.reset(new timeoutMsgBoxImpl(this));
 
@@ -533,12 +530,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
 
 	connect(blinkingStartButtonAnimationTimer, SIGNAL(timeout()), this, SLOT( blinkingStartButtonAnimationAction()));
 
-	connect( actionNewGame, SIGNAL( triggered() ), this, SLOT( callNewGameDialog() ) );
-	connect( actionAboutPokerth, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) );
 	connect( actionSettings, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) );
-	connect( actionJoin_network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) );
-	connect( actionCreate_network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) );
-	connect( actionInternet_Game, SIGNAL( triggered() ), this, SLOT( callGameLobbyDialog() ) );
 	connect( actionQuit, SIGNAL( triggered() ), this, SLOT( quitPokerTH() ) );
 	connect( actionFullScreen, SIGNAL( triggered() ), this, SLOT( switchFullscreen() ) );
 	connect( actionShowHideChat, SIGNAL( triggered() ), this, SLOT( switchChatWindow() ) );
@@ -792,8 +784,6 @@ void gameTableImpl::startNewLocalGame(newGameDialogImpl *v) {
 }
 
 
-void gameTableImpl::callAboutPokerthDialog() {	myAboutPokerthDialog->exec(); }
-
 void gameTableImpl::callCreateNetworkGameDialog() {
 	
 	myCreateNetworkGameDialog->exec();
@@ -998,6 +988,12 @@ void gameTableImpl::callSettingsDialog() {
 	mySettingsDialog->exec();
 	
 	if (mySettingsDialog->result() == QDialog::Accepted && mySettingsDialog->getSettingsCorrect()) {
+		applySettings();
+	}
+}
+
+void gameTableImpl::applySettings() {
+
 	//Toolbox verstecken?
 	if (myConfig->readConfigInt("ShowLeftToolBox")) { groupBox_LeftToolBox->show(); }
 	else { groupBox_LeftToolBox->hide(); }
@@ -1090,7 +1086,6 @@ void gameTableImpl::callSettingsDialog() {
 	// Re-init audio.
 	mySDLPlayer->audioDone();
 	mySDLPlayer->initAudio();
-	}
 }
 
 void gameTableImpl::initGui(int speed)

src/gui/qt/gametable/gametableimpl.h

@@ -200,8 +200,8 @@ public slots:
 	void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!!
 
 	void callNewGameDialog() ;
-	void callAboutPokerthDialog();
 	void callSettingsDialog();
+	void applySettings();
 	void callCreateNetworkGameDialog();
 	void callJoinNetworkGameDialog();
 	void callGameLobbyDialog();
@@ -404,7 +404,6 @@ private:
 	QPixmap *flipside;
 
 // 	Dialogs
-	boost::shared_ptr<aboutPokerthImpl> myAboutPokerthDialog;
 	boost::shared_ptr<newGameDialogImpl> myNewGameDialog;
 	boost::shared_ptr<settingsDialogImpl> mySettingsDialog;
 	boost::shared_ptr<selectAvatarDialogImpl> mySelectAvatarDialog;

src/gui/qt/startwindow.ui

@@ -123,6 +123,7 @@
     <addaction name="actionStart_Local_Game" />
     <addaction name="menuNetwork_Game" />
     <addaction name="actionInternet_Game" />
+    <addaction name="actionAbout_PokerTH" />
     <addaction name="actionQuit" />
    </widget>
    <widget class="QMenu" name="menuSettings" >
@@ -131,15 +132,8 @@
     </property>
     <addaction name="actionConfigure_PokerTH" />
    </widget>
-   <widget class="QMenu" name="menuAbout" >
-    <property name="title" >
-     <string>About</string>
-    </property>
-    <addaction name="actionAbout_PokerTH" />
-   </widget>
    <addaction name="menuPokerTH" />
    <addaction name="menuSettings" />
-   <addaction name="menuAbout" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
   <action name="actionStart_Local_Game" >

src/gui/qt/startwindow/startwindowimpl.cpp

@@ -90,6 +90,9 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
 	connect( actionJoin_Network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) );
 	connect( pushButton_Join_Network_Game, SIGNAL( clicked() ), this, SLOT( callJoinNetworkGameDialog() ) );
 	
+	connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) );
+	connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) );
+
 
 	connect(this, SIGNAL(signalShowClientDialog()), this, SLOT(showClientDialog()));
 
@@ -396,3 +399,14 @@ void startWindowImpl::showNetworkStartDialog()
 			myServerGuiInterface->getSession().terminateNetworkServer();
 	}
 }
+
+void startWindowImpl::callAboutPokerthDialog() { myAboutPokerthDialog->exec(); }
+
+void startWindowImpl::callSettingsDialog() {
+
+	mySettingsDialog->exec();
+	
+	if (mySettingsDialog->result() == QDialog::Accepted && mySettingsDialog->getSettingsCorrect()) {
+		myGuiInterface->getMyW()->applySettings();
+	}
+}

src/gui/qt/startwindow/startwindowimpl.h

@@ -89,6 +89,9 @@ signals:
 
 
 public slots: 
+
+	void callAboutPokerthDialog();
+	void callSettingsDialog();
 	void callNewGameDialog();
 	void callGameLobbyDialog();
 	void callCreateNetworkGameDialog();
@@ -98,6 +101,7 @@ public slots:
 	void showClientDialog();
 	void showNetworkStartDialog();
 	
+
 private:
 	ConfigFile *myConfig;