diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 048622c7..a12194ad 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -13,7 +13,7 @@
Game Lobby
- -
+
-
@@ -79,7 +79,7 @@
- -
+
-
false
@@ -133,34 +133,6 @@
6
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 16
- 27
-
-
-
-
-
@@ -211,7 +183,7 @@
6
-
-
+
Hands before raise blinds:
@@ -225,14 +197,14 @@
-
-
+
Maximum number of players:
-
-
+
Small Blind:
@@ -260,14 +232,14 @@
-
-
+
Start Cash:
-
-
+
Timeout for player action (sec):
@@ -297,8 +269,33 @@
-
+
+ 0
+
+
-
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 0
+ 27
+
+
+
+
-
+
+
+ 0
+ 0
+
+
Leave Game
@@ -342,6 +339,22 @@
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 0
+ 28
+
+
+
+
-
@@ -359,13 +372,6 @@
-
-
-
- Qt::Horizontal
-
-
-
- -
Lobby-Chat
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 7155809b..d32433e3 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -47,6 +47,8 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
void gameLobbyDialogImpl::exec()
{
+ hideShowGameDescription(FALSE);
+
assert(mySession);
mySession->terminateIrcClient();
mySession->startIrcClient();
@@ -122,6 +124,8 @@ void gameLobbyDialogImpl::createGame()
QString gameString(tr("game"));
currentGameName = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()) + QString("'s "+ gameString);
+ hideShowGameDescription(TRUE);
+
label_SmallBlind->setText(QString::number(gameData.smallBlind));
label_StartCash->setText(QString::number(gameData.startMoney));
label_MaximumNumberOfPlayers->setText(QString::number(gameData.maxNumberOfPlayers));
@@ -181,6 +185,8 @@ void gameLobbyDialogImpl::gameSelected(QTreeWidgetItem* item, QTreeWidgetItem*)
assert(mySession);
GameInfo info(mySession->getClientGameInfo(item->data(0, Qt::UserRole).toUInt()));
+
+ hideShowGameDescription(TRUE);
label_SmallBlind->setText(QString::number(info.data.smallBlind));
label_StartCash->setText(QString::number(info.data.startMoney));
label_MaximumNumberOfPlayers->setText(QString::number(info.data.maxNumberOfPlayers));
@@ -307,6 +313,7 @@ void gameLobbyDialogImpl::clearDialog()
groupBox_GameInfo->setEnabled(false);
currentGameName = "";
+ hideShowGameDescription(FALSE);
label_SmallBlind->setText("");
label_StartCash->setText("");
label_MaximumNumberOfPlayers->setText("");
@@ -430,6 +437,7 @@ void gameLobbyDialogImpl::leftGameDialogUpdate() {
groupBox_GameInfo->setEnabled(false);
currentGameName = "";
+ hideShowGameDescription(FALSE);
label_SmallBlind->setText("");
label_StartCash->setText("");
label_MaximumNumberOfPlayers->setText("");
@@ -493,3 +501,22 @@ void gameLobbyDialogImpl::keyPressEvent ( QKeyEvent * event ) {
if (event->key() == Qt::Key_Enter) { sendChatMessage(); }
}
+
+void gameLobbyDialogImpl::hideShowGameDescription(bool show) {
+
+ if(show) {
+ label_gameDesc1->show();
+ label_gameDesc2->show();
+ label_gameDesc3->show();
+ label_gameDesc4->show();
+ label_gameDesc5->show();
+
+ }
+ else {
+ label_gameDesc1->hide();
+ label_gameDesc2->hide();
+ label_gameDesc3->hide();
+ label_gameDesc4->hide();
+ label_gameDesc5->hide();
+ }
+}
\ No newline at end of file
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
index 9f6eabcb..a9508a1d 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
@@ -91,6 +91,7 @@ public slots:
void checkChatInputLength(QString string);
void keyPressEvent(QKeyEvent * event);
+ void hideShowGameDescription(bool show);
private:
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index f616673b..3dc6a8d6 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -551,6 +551,19 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 10
+
+
+
+
@@ -666,8 +679,8 @@ p, li { white-space: pre-wrap; }
- 20
- 141
+ 400
+ 161
@@ -827,6 +840,19 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 10
+
+
+
+
@@ -1057,8 +1083,8 @@ p, li { white-space: pre-wrap; }
- 20
- 40
+ 400
+ 16
diff --git a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
index 040be51e..9012aee5 100644
--- a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
@@ -42,8 +42,14 @@ void manualBlindsOrderDialogImpl::exec() {
void manualBlindsOrderDialogImpl::addBlindValueToList() {
- listWidget_blinds->addItem(QString::number(spinBox_input->value(),10));
- sortBlindsList();
+ if(listWidget_blinds->count() == 30) {
+ QMessageBox::warning(this, tr("Manual Blinds Order"),
+ tr("You cannot set more than 30 manual blinds."),
+ QMessageBox::Close); }
+ else {
+ listWidget_blinds->addItem(QString::number(spinBox_input->value(),10));
+ sortBlindsList();
+ }
}
void manualBlindsOrderDialogImpl::removeBlindFromList() {