sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui fixes

Browse Source
This commit is contained in:
doitux
2007-09-30 00:42:14 +00:00
parent 1ed4eeec87
commit 10740df0fb
5 changed files with 114 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog.ui
+48 -42
View File
@@ -13,7 +13,7 @@
<string>Game Lobby</string>
</property>
<layout class="QGridLayout" >
<item rowspan="4" row="0" column="0" >
<item rowspan="3" row="0" column="0" >
<widget class="QTreeWidget" name="treeWidget_NickList" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
@@ -79,7 +79,7 @@
</column>
</widget>
</item>
<item rowspan="4" row="0" column="2" >
<item rowspan="3" row="0" column="2" >
<widget class="QGroupBox" name="groupBox_GameInfo" >
<property name="enabled" >
<bool>false</bool>
@@ -133,34 +133,6 @@
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>16</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<spacer>
<property name="orientation" >
@@ -211,7 +183,7 @@
<number>6</number>
</property>
<item row="3" column="0" >
<widget class="QLabel" name="label_5" >
<widget class="QLabel" name="label_gameDesc4" >
<property name="text" >
<string>Hands before raise blinds:</string>
</property>
@@ -225,14 +197,14 @@
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_7" >
<widget class="QLabel" name="label_gameDesc1" >
<property name="text" >
<string>Maximum number of players:</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<widget class="QLabel" name="label_gameDesc3" >
<property name="text" >
<string>Small Blind:</string>
</property>
@@ -260,14 +232,14 @@
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label" >
<widget class="QLabel" name="label_gameDesc2" >
<property name="text" >
<string>Start Cash:</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_2" >
<widget class="QLabel" name="label_gameDesc5" >
<property name="text" >
<string>Timeout for player action (sec):</string>
</property>
@@ -297,8 +269,33 @@
</item>
<item row="5" column="0" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>0</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_Leave" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Leave Game</string>
</property>
@@ -342,6 +339,22 @@
</property>
</spacer>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>0</width>
<height>28</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_CreateGame" >
<property name="text" >
@@ -359,13 +372,6 @@
</layout>
</item>
<item row="2" column="1" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Lobby-Chat</string>
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+27
View File
@@ -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();
}
}
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
+1
View File
@@ -91,6 +91,7 @@ public slots:
void checkChatInputLength(QString string);
void keyPressEvent(QKeyEvent * event);
void hideShowGameDescription(bool show);
private:
src/gui/qt/settingsdialog.ui
+30 -4
View File
@@ -551,6 +551,19 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@@ -666,8 +679,8 @@ p, li { white-space: pre-wrap; }
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>141</height>
<width>400</width>
<height>161</height>
</size>
</property>
</spacer>
@@ -827,6 +840,19 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@@ -1057,8 +1083,8 @@ p, li { white-space: pre-wrap; }
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
<width>400</width>
<height>16</height>
</size>
</property>
</spacer>
src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp
+8 -2
View File
@@ -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() {