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

shows new blinds settings in lobby dialog

Browse Source
This commit is contained in:
doitux
2007-10-03 00:32:17 +00:00
parent 6ec214562f
commit 4f03bf1fc8
3 changed files with 191 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog.ui
+137 -82
View File
@@ -98,7 +98,7 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>259</width> <width>270</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@@ -163,111 +163,166 @@
</layout> </layout>
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
<layout class="QGridLayout" > <layout class="QHBoxLayout" >
<property name="leftMargin" > <item>
<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>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="3" column="0" >
<widget class="QLabel" name="label_gameDesc4" >
<property name="text" >
<string>Hands before raise blinds:</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="label_SmallBlind" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_gameDesc1" > <widget class="QLabel" name="label_gameDesc1" >
<property name="text" > <property name="text" >
<string>Maximum number of players:</string> <string>Maximum number of players: </string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item>
<widget class="QLabel" name="label_gameDesc3" >
<property name="text" >
<string>Small Blind:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_StartCash" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_MaximumNumberOfPlayers" > <widget class="QLabel" name="label_MaximumNumberOfPlayers" >
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" >
<widget class="QLabel" name="label_HandsToRaiseSmallBlind" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<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_gameDesc5" >
<property name="text" >
<string>Timeout for player action (sec):</string>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QLabel" name="label_TimeoutForPlayerAction" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="4" column="0" > <item row="4" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_gameDesc2" >
<property name="text" >
<string>Start Cash: </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_StartCash" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_gameDesc3" >
<property name="text" >
<string>First small blind: </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_SmallBlind" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_gameDesc4" >
<property name="text" >
<string>Blinds raise intervall: </string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_blindsRaiseIntervall" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="7" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_gameDesc5" >
<property name="text" >
<string>Blinds raise mode: </string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_blindsRaiseMode" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="8" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_gameDesc6" >
<property name="text" >
<string>Manual blinds list:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_blindsList" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="9" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_gameDesc7" >
<property name="text" >
<string>Timeout for player action (sec): </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_TimeoutForPlayerAction" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="10" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>125</width> <width>248</width>
<height>71</height> <height>91</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0" > <item row="11" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+54 -5
View File
@@ -123,7 +123,28 @@ void gameLobbyDialogImpl::createGame()
label_SmallBlind->setText(QString::number(gameData.smallBlind)); label_SmallBlind->setText(QString::number(gameData.smallBlind));
label_StartCash->setText(QString::number(gameData.startMoney)); label_StartCash->setText(QString::number(gameData.startMoney));
label_MaximumNumberOfPlayers->setText(QString::number(gameData.maxNumberOfPlayers)); label_MaximumNumberOfPlayers->setText(QString::number(gameData.maxNumberOfPlayers));
label_HandsToRaiseSmallBlind->setText(QString::number(gameData.handsBeforeRaise));
if(gameData.raiseIntervalMode == RAISE_ON_HANDNUMBER) { label_blindsRaiseIntervall->setText(QString::number(gameData.raiseSmallBlindEveryHandsValue)+" "+tr("hands")); }
else { label_blindsRaiseIntervall->setText(QString::number(gameData.raiseSmallBlindEveryMinutesValue)+" "+tr("minutes")); }
if(gameData.raiseMode == DOUBLE_BLINDS) {
label_blindsRaiseMode->setText(tr("double blinds"));
label_blindsList->hide();
label_gameDesc6->hide();
}
else {
label_blindsRaiseMode->setText(tr("manual blinds order"));
label_blindsList->show();
label_gameDesc6->show();
QString blindsListString;
std::list<int>::iterator it1;
for(it1= gameData.manualBlindsList.begin(); it1 != gameData.manualBlindsList.end(); it1++) {
blindsListString.append(QString::number(*it1,10)).append(", ");
}
blindsListString.remove(blindsListString.length()-2,2);
label_blindsList->setText(blindsListString);
}
label_TimeoutForPlayerAction->setText(QString::number(gameData.playerActionTimeoutSec)); label_TimeoutForPlayerAction->setText(QString::number(gameData.playerActionTimeoutSec));
mySession->clientCreateGame(gameData, myConfig->readConfigString("MyName") + "'s "+ gameString.toUtf8().constData(), myCreateInternetGameDialog->lineEdit_Password->text().toUtf8().constData()); mySession->clientCreateGame(gameData, myConfig->readConfigString("MyName") + "'s "+ gameString.toUtf8().constData(), myCreateInternetGameDialog->lineEdit_Password->text().toUtf8().constData());
@@ -184,7 +205,28 @@ void gameLobbyDialogImpl::gameSelected(QTreeWidgetItem* item, QTreeWidgetItem*)
label_SmallBlind->setText(QString::number(info.data.smallBlind)); label_SmallBlind->setText(QString::number(info.data.smallBlind));
label_StartCash->setText(QString::number(info.data.startMoney)); label_StartCash->setText(QString::number(info.data.startMoney));
label_MaximumNumberOfPlayers->setText(QString::number(info.data.maxNumberOfPlayers)); label_MaximumNumberOfPlayers->setText(QString::number(info.data.maxNumberOfPlayers));
label_HandsToRaiseSmallBlind->setText(QString::number(info.data.handsBeforeRaise));
if(info.data.raiseIntervalMode == RAISE_ON_HANDNUMBER) { label_blindsRaiseIntervall->setText(QString::number(info.data.raiseSmallBlindEveryHandsValue)+" "+tr("hands")); }
else { label_blindsRaiseIntervall->setText(QString::number(info.data.raiseSmallBlindEveryMinutesValue)+" "+tr("minutes")); }
if(info.data.raiseMode == DOUBLE_BLINDS) {
label_blindsRaiseMode->setText(tr("double blinds"));
label_blindsList->hide();
label_gameDesc6->hide();
}
else {
label_blindsRaiseMode->setText(tr("manual blinds order"));
label_blindsList->show();
label_gameDesc6->show();
QString blindsListString;
std::list<int>::iterator it1;
for(it1= info.data.manualBlindsList.begin(); it1 != info.data.manualBlindsList.end(); it1++) {
blindsListString.append(QString::number(*it1,10)).append(", ");
}
blindsListString.remove(blindsListString.length()-2,2);
label_blindsList->setText(blindsListString);
}
label_TimeoutForPlayerAction->setText(QString::number(info.data.playerActionTimeoutSec)); label_TimeoutForPlayerAction->setText(QString::number(info.data.playerActionTimeoutSec));
treeWidget_connectedPlayers->clear(); treeWidget_connectedPlayers->clear();
@@ -311,7 +353,9 @@ void gameLobbyDialogImpl::clearDialog()
label_SmallBlind->setText(""); label_SmallBlind->setText("");
label_StartCash->setText(""); label_StartCash->setText("");
label_MaximumNumberOfPlayers->setText(""); label_MaximumNumberOfPlayers->setText("");
label_HandsToRaiseSmallBlind->setText(""); label_blindsRaiseIntervall->setText("");
label_blindsRaiseMode->setText("");
label_blindsList->setText("");
label_TimeoutForPlayerAction->setText(""); label_TimeoutForPlayerAction->setText("");
treeWidget_GameList->clear(); treeWidget_GameList->clear();
@@ -435,7 +479,9 @@ void gameLobbyDialogImpl::leftGameDialogUpdate() {
label_SmallBlind->setText(""); label_SmallBlind->setText("");
label_StartCash->setText(""); label_StartCash->setText("");
label_MaximumNumberOfPlayers->setText(""); label_MaximumNumberOfPlayers->setText("");
label_HandsToRaiseSmallBlind->setText(""); label_blindsRaiseIntervall->setText("");
label_blindsRaiseMode->setText("");
label_blindsList->setText("");
label_TimeoutForPlayerAction->setText(""); label_TimeoutForPlayerAction->setText("");
treeWidget_connectedPlayers->clear(); treeWidget_connectedPlayers->clear();
@@ -504,7 +550,8 @@ void gameLobbyDialogImpl::hideShowGameDescription(bool show) {
label_gameDesc3->show(); label_gameDesc3->show();
label_gameDesc4->show(); label_gameDesc4->show();
label_gameDesc5->show(); label_gameDesc5->show();
label_gameDesc6->show();
label_gameDesc7->show();
} }
else { else {
label_gameDesc1->hide(); label_gameDesc1->hide();
@@ -512,5 +559,7 @@ void gameLobbyDialogImpl::hideShowGameDescription(bool show) {
label_gameDesc3->hide(); label_gameDesc3->hide();
label_gameDesc4->hide(); label_gameDesc4->hide();
label_gameDesc5->hide(); label_gameDesc5->hide();
label_gameDesc6->hide();
label_gameDesc7->hide();
} }
} }
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
-1
View File
@@ -23,7 +23,6 @@
#include "sdlplayer.h" #include "sdlplayer.h"
#include "mainwindowimpl.h" #include "mainwindowimpl.h"
class Session; class Session;
class ConfigFile; class ConfigFile;
class LobbyChat; class LobbyChat;