diff --git a/pokerth_game.pro b/pokerth_game.pro
index f300b0b7..9fc7a8b9 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -3,8 +3,8 @@
TEMPLATE = app
CODECFORSRC = UTF-8
-#CONFIG += qt thread embed_manifest_exe release
-CONFIG += qt thread embed_manifest_exe warn_on debug
+CONFIG += qt thread embed_manifest_exe release
+#CONFIG += qt thread embed_manifest_exe warn_on debug
UI_DIR = uics
MOC_DIR = mocs
OBJECTS_DIR = obj
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index b12d7052..5d15e709 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -178,8 +178,8 @@ mac{
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
}
-#CONFIG += staticlib qt thread release
-CONFIG += staticlib qt thread warn_on debug
+CONFIG += staticlib qt thread release
+#CONFIG += staticlib qt thread warn_on debug
UI_DIR = uics
TARGET = lib/pokerth_lib
MOC_DIR = mocs
diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index ec2d1209..b0d937b1 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -145,7 +145,8 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
configList.push_back(ConfigInfo("ShowFadeOutCardsAnimation", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("ShowFlipCardsAnimation", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("ShowBlindButtons", CONFIG_TYPE_INT, "1"));
- configList.push_back(ConfigInfo("AntiPeekMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("PlaySoundEffects", CONFIG_TYPE_INT, "1"));
+ configList.push_back(ConfigInfo("AntiPeekMode", CONFIG_TYPE_INT, "0"));
+ configList.push_back(ConfigInfo("PlaySoundEffects", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("SoundVolume", CONFIG_TYPE_INT, "8"));
configList.push_back(ConfigInfo("FlipsideTux", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0"));
diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 437a166b..32d7c546 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -187,7 +187,7 @@
6
- -
+
-
Qt::Vertical
@@ -215,7 +215,7 @@
- -
+
-
6
@@ -277,14 +277,14 @@
- -
+
-
Leave
- -
+
-
0
@@ -391,6 +391,13 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Fill up with computer opponents
+
+
+
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index d0edf23f..c013db87 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -174,6 +174,7 @@ void gameLobbyDialogImpl::clearDialog()
pushButton_Leave->hide();
pushButton_Kick->hide();
pushButton_StartGame->hide();
+ checkBox_fillUpWithComputerOpponents->hide();
treeWidget_GameList->setColumnWidth(0,250);
treeWidget_GameList->setColumnWidth(1,75);
diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui
index 0b405564..ea12bb36 100644
--- a/src/gui/qt/mainwindow.ui
+++ b/src/gui/qt/mainwindow.ui
@@ -164,6 +164,9 @@
-
+
+ Qt::NoFocus
+
0
@@ -947,6 +950,9 @@
-
+
+ Qt::NoFocus
+
0
@@ -975,43 +981,6 @@
-
-
-
-
-
-
-
- 30
- 80
- 0
-
-
-
-
-
-
-
-
- 30
- 80
- 0
-
-
-
-
-
-
-
-
- 30
- 80
- 0
-
-
-
-
-
-
Qt::NoFocus
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 223b3ce6..44921891 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -414,6 +414,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
textBrowser_Log->setStyleSheet("QTextBrowser { "+ font1String +" font-size: 11px; color: white; background-color: #1D3B00; border:none; }");
#else
textBrowser_Log->setStyleSheet("QTextBrowser { "+ font1String +" font-size: 10px; color: white; background-color: #1D3B00; border:none; }");
+// textBrowser_Log->verticalScrollBar()->setStyleSheet("background: yellow");
+// textBrowser_Log->verticalScrollBar()->setAutoFillBackground ( TRUE );
textBrowser_Chat->setStyleSheet("QTextBrowser { "+ font1String +" font-size: 10px; color: white; background-color: #1D3B00; border:none; }");
lineEdit_ChatInput->setStyleSheet("QLineEdit { "+ font1String +" font-size: 10px; color: white; background-color: #1D3B00; border-top: 2px solid #286400; }");
#endif
diff --git a/src/gui/qt/startnetworkgamedialog.ui b/src/gui/qt/startnetworkgamedialog.ui
index 52203556..88868431 100644
--- a/src/gui/qt/startnetworkgamedialog.ui
+++ b/src/gui/qt/startnetworkgamedialog.ui
@@ -6,29 +6,53 @@
0
0
311
- 470
+ 547
Start Network Game
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
6
-
-
+
+ 6
+
+
-
Lobby-Chat
-
+
7
-
+
+ 7
+
+
+ 7
+
+
+ 7
+
+
+ 0
+
+
0
-
@@ -40,21 +64,30 @@
- -
+
-
Qt::Horizontal
- -
+
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -93,14 +126,23 @@
- -
+
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -137,6 +179,13 @@
+ -
+
+
+ Fill up with computer opponents
+
+
+
diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
index 886651d6..a1c40f67 100644
--- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp
@@ -138,20 +138,28 @@ void startNetworkGameDialogImpl::kickPlayer() {
void startNetworkGameDialogImpl::checkPlayerQuantity() {
- if (treeWidget->topLevelItemCount() >= 2 && isAdmin) {
- pushButton_startGame->setEnabled(true);
+ if(isAdmin){
+ pushButton_Kick->show();
+ pushButton_startGame->show();
+ checkBox_fillUpWithComputerOpponents->show();
+
+ if (treeWidget->topLevelItemCount() >= 2) {
+ pushButton_startGame->setEnabled(true);
+ }
+ else {
+ pushButton_startGame->setEnabled(false);
+ }
}
- else {
- pushButton_startGame->setEnabled(false);
- }
-
}
void startNetworkGameDialogImpl::clearDialog()
{
+ pushButton_Kick->hide();
+ pushButton_startGame->hide();
pushButton_Kick->setEnabled(false);
pushButton_startGame->setEnabled(false);
treeWidget->clear();
+ checkBox_fillUpWithComputerOpponents->hide();
}
void startNetworkGameDialogImpl::setSession(Session *session)