diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index ebb98d39..0c2369b4 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -34,7 +34,7 @@ using namespace std;
ConfigFile::ConfigFile()
{
// !!!! Revisionsnummer der Configdefaults !!!!!
- configRev = 7;
+ configRev = 8;
// Pfad und Dateinamen setzen
#ifdef _WIN32
@@ -167,6 +167,9 @@ void ConfigFile::createDefaultConfig() {
TiXmlElement * confElement28 = new TiXmlElement( "ServerPassword" );
config->LinkEndChild( confElement28 );
confElement28->SetAttribute("value", "");
+ TiXmlElement * confElement29 = new TiXmlElement( "ServerUseIpv6" );
+ config->LinkEndChild( confElement29 );
+ confElement29->SetAttribute("value", 0);
TiXmlElement * confElement6 = new TiXmlElement( "MyName" );
config->LinkEndChild( confElement6 );
diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui
index ba03829d..d85abac0 100644
--- a/src/gui/qt/createnetworkgamedialog.ui
+++ b/src/gui/qt/createnetworkgamedialog.ui
@@ -5,8 +5,8 @@
0
0
- 314
- 243
+ 300
+ 281
@@ -19,6 +19,139 @@
6
+ -
+
+
+ Network Game Settings
+
+
+
+ 9
+
+
+ 6
+
+
-
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Server Password:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ 5
+
+
+ 2
+
+
+ 5
+
+
+
+ -
+
+
+ 5000
+
+
+ 1000
+
+
+ 2000
+
+
+
+ -
+
+
+ 500
+
+
+ 5
+
+
+ 10
+
+
+
+ -
+
+
+ Game Speed for Computer Opponent:
+
+
+
+ -
+
+
+ Number of Players:
+
+
+
+ -
+
+
+ Small Blind:
+
+
+
+ -
+
+
+ Start Cash:
+
+
+
+ -
+
+
+ Hands before raise Small Blind:
+
+
+
+ -
+
+
+ 1
+
+
+ 9
+
+
+
+ -
+
+
+ 11
+
+
+ 1
+
+
+ 4
+
+
+
+
+
+
-
@@ -56,118 +189,6 @@
- -
-
-
- Network Game Settings
-
-
-
- 9
-
-
- 6
-
-
-
-
-
- 11
-
-
- 1
-
-
- 4
-
-
-
- -
-
-
- 1
-
-
- 9
-
-
-
- -
-
-
- Hands before raise Small Blind:
-
-
-
- -
-
-
- Start Cash:
-
-
-
- -
-
-
- Small Blind:
-
-
-
- -
-
-
- Number of Players:
-
-
-
- -
-
-
- Game Speed for Computer Opponent:
-
-
-
- -
-
-
- 500
-
-
- 5
-
-
- 10
-
-
-
- -
-
-
- 5000
-
-
- 1000
-
-
- 2000
-
-
-
- -
-
-
- 5
-
-
- 2
-
-
- 5
-
-
-
-
-
-
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
index 8ac0d701..8b062982 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "createnetworkgamedialogimpl.h"
#include "session.h"
-// #include "configfile.h"
+#include "configfile.h"
createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent)
: QDialog(parent)
@@ -27,6 +27,17 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent)
setupUi(this);
+ //Formulare Füllen
+ ConfigFile myConfig;
+
+ //Network Game Settings
+ spinBox_quantityPlayers->setValue(myConfig.readConfigInt("NetNumberOfPlayers"));
+ spinBox_startCash->setValue(myConfig.readConfigInt("NetStartCash"));
+ spinBox_smallBlind->setValue(myConfig.readConfigInt("NetSmallBlind"));
+ spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind"));
+ spinBox_gameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed"));
+ lineEdit_serverPassword->setText(QString::fromStdString(myConfig.readConfigString("ServerPassword")));
+
connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) );
connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) );
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 662b2502..2d1e3f9f 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -22,7 +22,7 @@
-
- 0
+ 2
@@ -426,20 +426,27 @@ p, li { white-space: pre-wrap; }
6
-
-
+
-
QLineEdit::Password
- -
+
-
Server Password:
+ -
+
+
+ Use IPv6
+
+
+
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index ee933b9c..3fcfcb96 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -56,6 +56,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent)
spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind"));
spinBox_netGameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed"));
lineEdit_serverPassword->setText(QString::fromStdString(myConfig.readConfigString("ServerPassword")));
+ checkBox_useIpv6->setChecked(myConfig.readConfigInt("ServerUseIpv6"));
//Interface
checkBox_showLeftToolbox->setChecked(myConfig.readConfigInt("ShowLeftToolBox"));
@@ -118,6 +119,7 @@ void settingsDialogImpl::isAccepted() {
myConfig.writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value());
myConfig.writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value());
myConfig.writeConfigString("ServerPassword", lineEdit_serverPassword->text().toStdString());
+ myConfig.writeConfigInt("ServerUseIpv6", checkBox_useIpv6->isChecked());
// Interface
myConfig.writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked());