diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index f67d96ea..ec2d1209 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -51,7 +51,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
}
// !!!! Revisionsnummer der Configdefaults !!!!!
- configRev = 27;
+ configRev = 28;
//standard defaults
logOnOffDefault = "1";
@@ -171,6 +171,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
configList.push_back(ConfigInfo("ServerPort", CONFIG_TYPE_INT, "7234"));
configList.push_back(ConfigInfo("InternetServerAddress", CONFIG_TYPE_STRING, "pokerth.dyndns.org"));
configList.push_back(ConfigInfo("InternetServerPort", CONFIG_TYPE_INT, "7234"));
+ configList.push_back(ConfigInfo("InternetServerPassword", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("InternetServerUseIpv6", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("InternetServerUseSctp", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("UseInternetGamePassword", CONFIG_TYPE_INT, "0"));
diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui
index f8dd2801..951bd417 100644
--- a/src/gui/qt/mainwindow.ui
+++ b/src/gui/qt/mainwindow.ui
@@ -6186,19 +6186,12 @@
Internet Game ...
+
+ Ctrl+I
+
-
- MyRightTabWidget
- QTabWidget
-
-
-
- MyStatusLabel
- QLabel
-
-
MySetLabel
QLabel
@@ -6209,6 +6202,16 @@
QTabWidget
+
+ MyRightTabWidget
+ QTabWidget
+
+
+
+ MyStatusLabel
+ QLabel
+
+
spinBox_set
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 9e4eb7b2..d71ccf90 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -809,10 +809,27 @@ p, li { white-space: pre-wrap; }
6
- -
-
+
-
+
- Server Address:
+ Use SCTP
+
+
+
+ -
+
+
+ Use IPv6
+
+
+
+ -
+
+
+ <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a>
+
+
+ true
@@ -823,6 +840,16 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a>
+
+
+ true
+
+
+
-
@@ -836,6 +863,13 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Server Address:
+
+
+
-
@@ -843,37 +877,17 @@ p, li { white-space: pre-wrap; }
- -
-
+
-
+
- <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a>
-
-
- true
+ Server Password:
-
-
-
- <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a>
-
-
- true
-
-
-
- -
-
-
- Use IPv6
-
-
-
- -
-
-
- Use SCTP
+
+
+ QLineEdit::Password
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 93c20ca8..a1998cc2 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -121,6 +121,7 @@ void settingsDialogImpl::exec() {
//Internet Game Settings
lineEdit_InternetServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerAddress").c_str()));
spinBox_InternetServerPort->setValue(myConfig->readConfigInt("InternetServerPort"));
+ lineEdit_InternetServerPassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerPassword").c_str()));
checkBox_InternetServerUseIpv6->setChecked(myConfig->readConfigInt("InternetServerUseIpv6"));
checkBox_InternetServerUseSctp->setChecked(myConfig->readConfigInt("InternetServerUseSctp"));
checkBox_UseInternetGamePassword->setChecked(myConfig->readConfigInt("UseInternetGamePassword"));
@@ -212,6 +213,7 @@ void settingsDialogImpl::isAccepted() {
//Internet Game Settings
myConfig->writeConfigString("InternetServerAddress", lineEdit_InternetServerAddress->text().toUtf8().constData());
myConfig->writeConfigInt("InternetServerPort", spinBox_InternetServerPort->value());
+ myConfig->writeConfigString("InternetServerPassword", lineEdit_InternetServerPassword->text().toUtf8().constData());
myConfig->writeConfigInt("InternetServerUseIpv6", checkBox_InternetServerUseIpv6->isChecked());
myConfig->writeConfigInt("InternetServerUseSctp", checkBox_InternetServerUseSctp->isChecked());
myConfig->writeConfigInt("UseInternetGamePassword", checkBox_UseInternetGamePassword->isChecked());