src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -498,100 +498,62 @@ mainWindowImpl::~mainWindowImpl() {}
 
 void mainWindowImpl::callNewGameDialog() {
 
-	
-
 	//wenn Dialogfenster gezeigt werden soll
-
 	if(myConfig->readConfigInt("ShowGameSettingsDialogOnNewGame")){
 
 		newGameDialogImpl *v = new newGameDialogImpl(this);
 		v->exec();
-	
+		if (v->result() == QDialog::Accepted ) { startNewLocalGame(v);	}
-		if (v->result() == QDialog::Accepted ) {
-
-			// Start new local game - terminate existing network game.
-			mySession->terminateNetworkClient();
-			mySession->terminateNetworkServer();
-
-			if(actualGame) {
-				mySession->deleteGame();
-				actualGame = 0;
-			}
-			
-			guiGameSpeed = v->spinBox_gameSpeed->value();
-	// 		debugMode = v->checkBox_debugMode->isChecked();
-			//Speeds 
-			setSpeeds();
-	
-			//restliche Singleshots killen!!!
-			stopTimer();
-				
-			label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
-			label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
-	
-			
-			//Tools und Board aufhellen und enablen
-			QPalette tempPalette = groupBox_board->palette();
-			tempPalette.setColor(QPalette::Window, active);
-			groupBox_board->setPalette(tempPalette);
-			groupBox_right_tools->setDisabled(FALSE);
-			groupBox_left_tools->setDisabled(FALSE);	
-		
-	
-			//positioning Slider
-			horizontalSlider_speed->setValue(guiGameSpeed);
-			
-			//Start Game!!!
-			mySession->startGame(v->spinBox_quantityPlayers->value(), v->spinBox_startCash->value(), v->spinBox_smallBlind->value());
-	
-		}
 	}
 	// sonst mit gespeicherten Werten starten
-	else {
+	else { startNewLocalGame(); }
+}
 
-		// COPY AND PASTE WARNING, see above!!!
+void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
-		// TODO
-		// Start new local game - terminate existing network game.
-		mySession->terminateNetworkClient();
-		mySession->terminateNetworkServer();
 
-		if(actualGame) {
+	// Start new local game - terminate existing network game.
-			mySession->deleteGame();
+	mySession->terminateNetworkClient();
-			actualGame = 0;
+	mySession->terminateNetworkServer();
-		}
 
-		guiGameSpeed = myConfig->readConfigInt("GameSpeed");
+	if(actualGame) {
+		mySession->deleteGame();
+		actualGame = 0;
+	}
+	//restliche Singleshots killen!!!
+	stopTimer();
+		
+	label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
+	label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
+	
+	//Tools und Board aufhellen und enablen
+	QPalette tempPalette = groupBox_board->palette();
+	tempPalette.setColor(QPalette::Window, active);
+	groupBox_board->setPalette(tempPalette);
+	groupBox_right_tools->setDisabled(FALSE);
+	groupBox_left_tools->setDisabled(FALSE);	
+		
+	//positioning Slider
+	horizontalSlider_speed->setValue(guiGameSpeed);
+
+	//get values from local game dialog
+	if(v) {
 		//Speeds 
+		guiGameSpeed = v->spinBox_gameSpeed->value();
+		setSpeeds();
+		//Start Game!!!
+		mySession->startGame(v->spinBox_quantityPlayers->value(), v->spinBox_startCash->value(), v->spinBox_smallBlind->value());
+	}
+	// start with default values
+	else {
+		//Speeds 
+		guiGameSpeed = myConfig->readConfigInt("GameSpeed");
 		setSpeeds();
-				
-		//restliche Singleshots killen!!!
-		stopTimer();
-	
-		label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
-		label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
-	
-	
-	// 	debugMode = v->checkBox_debugMode->isChecked();
-			
-		//Tools und Board aufhellen und enablen
-		QPalette tempPalette = groupBox_board->palette();
-		tempPalette.setColor(QPalette::Window, active);
-		groupBox_board->setPalette(tempPalette);
-		groupBox_right_tools->setDisabled(FALSE);	
-	 	groupBox_left_tools->setDisabled(FALSE);	
-	
-		
-		//positioning Slider
-		horizontalSlider_speed->setValue(guiGameSpeed);
-
 		//Start Game!!!
 		mySession->startGame(myConfig->readConfigInt("NumberOfPlayers"), myConfig->readConfigInt("StartCash"), myConfig->readConfigInt("SmallBlind"));
-
-
 	}
-
 }
 
+
 void mainWindowImpl::callAboutPokerthDialog() {
 
 	aboutPokerthImpl *v = new aboutPokerthImpl(this);

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -38,6 +38,7 @@ class BoardInterface;
 // class HandInterface;
 class PlayerInterface;
 class MyCardsPixmapLabel;
+class newGameDialogImpl;
 class joinNetworkGameDialogImpl;
 class connectToServerDialogImpl;
 class createNetworkGameDialogImpl;
@@ -165,6 +166,7 @@ public slots:
 	void handSwitchRounds();
 
 	void startNewHand();
+	void startNewLocalGame(newGameDialogImpl* =0);
 
 	void stopTimer();
 	
@@ -173,14 +175,14 @@ public slots:
 	void userWidgetsBackgroudColor();
 	void breakButtonClicked();
 
-	void keyPressEvent ( QKeyEvent * event );
+	void keyPressEvent ( QKeyEvent*);
 	void switchLeftToolBox();
 	void switchRightToolBox();
 	void switchFullscreen();
 
 	void paintStartSplash();
 
-	void networkError(int errorID, int osErrorID);
+	void networkError(int, int);
 
 private: