diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
index 7627c589..376b9cdc 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
@@ -64,6 +64,11 @@ void createInternetGameDialogImpl::fillFormular() {
//temporarely unused until ai is enabled in network
spinBox_gameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed"));
spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction"));
+ checkBox_Password->setChecked(myConfig->readConfigInt("UseInternetGamePassword"));
+ if(myConfig->readConfigInt("UseInternetGamePassword")) {
+ lineEdit_Password->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str()));
+ }
+
}
void createInternetGameDialogImpl::showDialog() {
diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 3c60c44f..aaf5e968 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -5,8 +5,8 @@
0
0
- 476
- 470
+ 636
+ 584
@@ -19,13 +19,124 @@
6
- -
-
-
-
- Game
+
-
+
+
+ Game Info
+
+
+
+ 9
-
+
+ 6
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+ TextLabel
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+ -
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Hands to raise small blind:</span></p></body></html>
+
+
+
+ -
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Small Blind:</span></p></body></html>
+
+
+
+ -
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Start Cash:</span></p></body></html>
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 10
+
+
+
+
+ -
+
+
+
+ 221
+ 0
+
+
+
+
+ In Game
+
+
+
+
+
-
@@ -56,6 +167,20 @@
+ -
+
+
+
+ Game
+
+
+
+
+ Player
+
+
+
+
-
@@ -91,13 +216,6 @@
- -
-
-
- Cancel
-
-
-
@@ -105,25 +223,7 @@
treeWidget_GameList
pushButton_CreateGame
- pushButton_Cancel
-
-
- pushButton_Cancel
- clicked()
- gameLobbyDialog
- reject()
-
-
- 465
- 213
-
-
- 276
- 163
-
-
-
-
+
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 4c34a6d2..9e4eb7b2 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -2536,12 +2536,12 @@ p, li { white-space: pre-wrap; }
setEnabled(bool)
- 294
- 299
+ 409
+ 334
- 462
- 300
+ 580
+ 336
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 635f996b..93c20ca8 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -51,7 +51,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
connect( pushButton_Opponent5Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) );
connect( pushButton_Opponent6Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) );
-// connect( checkBox_showIntro, SIGNAL( clicked() ), this, SLOT( callSelectAvatarDialog()) );
+ connect( checkBox_UseInternetGamePassword, SIGNAL( toggled(bool) ), this, SLOT( clearInternetGamePassword(bool)) );
//temporarely unused until ai is enabled in network
// label_36->hide();
@@ -124,7 +124,9 @@ void settingsDialogImpl::exec() {
checkBox_InternetServerUseIpv6->setChecked(myConfig->readConfigInt("InternetServerUseIpv6"));
checkBox_InternetServerUseSctp->setChecked(myConfig->readConfigInt("InternetServerUseSctp"));
checkBox_UseInternetGamePassword->setChecked(myConfig->readConfigInt("UseInternetGamePassword"));
- lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str()));
+ if(myConfig->readConfigInt("UseInternetGamePassword")) {
+ lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str()));
+ }
//Interface
checkBox_showLeftToolbox->setChecked(myConfig->readConfigInt("ShowLeftToolBox"));
@@ -346,3 +348,8 @@ void settingsDialogImpl::setLogDir()
if (!dir.isEmpty()) lineEdit_logDir->setText(dir);
}
+
+void settingsDialogImpl::clearInternetGamePassword(bool clear) {
+
+ if(!clear) { lineEdit_InternetGamePassword->clear(); }
+}
\ No newline at end of file
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
index 6a0f0b32..1dd9643d 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.h
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h
@@ -57,6 +57,8 @@ public slots:
void callSelectAvatarDialog() { mySelectAvatarDialogImpl->exec(); }
+ void clearInternetGamePassword(bool);
+
private:
bool playerNickIsChanged;