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

Browse Source
This commit is contained in:
doitux
2007-01-20 01:38:40 +00:00
parent ed989f2a64
commit 11fd7987d6
7 changed files with 229 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/configfile.cpp
+1
View File
@@ -56,6 +56,7 @@ QString ConfigFile::readConfig(QString varName, QString defaultvalue)
stream << "opponent2name=Player 2\n"; stream << "opponent2name=Player 2\n";
stream << "opponent3name=Player 3\n"; stream << "opponent3name=Player 3\n";
stream << "opponent4name=Player 4\n"; stream << "opponent4name=Player 4\n";
stream << "showtoolbox=1\n";
configFile.close(); configFile.close();
} }
src/gui/qt/mainwindow.ui
+29 -1
View File
@@ -498,6 +498,9 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="focusPolicy" >
<enum>Qt::ClickFocus</enum>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>PokerTH - The Open-Source Texas Holdem Engine</string> <string>PokerTH - The Open-Source Texas Holdem Engine</string>
</property> </property>
@@ -554,6 +557,18 @@
<property name="enabled" > <property name="enabled" >
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="minimumSize" >
<size>
<width>382</width>
<height>212</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>382</width>
<height>212</height>
</size>
</property>
<property name="palette" > <property name="palette" >
<palette> <palette>
<active> <active>
@@ -1446,7 +1461,20 @@
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
src/gui/qt/mainwindowimpl.cpp
+27 -4
View File
@@ -59,10 +59,16 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
if ( !progDir1.exists() ) { progDir1.mkdir(progDir1.absPath()); } if ( !progDir1.exists() ) { progDir1.mkdir(progDir1.absPath()); }
myConfigFile = new ConfigFile;
setupUi(this); setupUi(this);
int i; int i;
bool ok;
//Toolbox verstecken?
if (!myConfigFile->readConfig("showtoolbox", "1").toInt(&ok,10)) { groupBox_tools->hide(); }
pushButton_raise->setDisabled(TRUE); pushButton_raise->setDisabled(TRUE);
pushButton_call->setDisabled(TRUE); pushButton_call->setDisabled(TRUE);
@@ -187,17 +193,18 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
void mainWindowImpl::callNewGameDialog() { void mainWindowImpl::callNewGameDialog() {
ConfigFile configFile;
//wenn Dialogfenster gezeigt werden soll //wenn Dialogfenster gezeigt werden soll
bool ok; bool ok;
if(configFile.readConfig("showgamesettingsdialogonnewgame", "1").toInt(&ok,10)) { if(myConfigFile->readConfig("showgamesettingsdialogonnewgame", "1").toInt(&ok,10)) {
newGameDialogImpl *v = new newGameDialogImpl(); newGameDialogImpl *v = new newGameDialogImpl();
v->exec(); v->exec();
if (v->result() == QDialog::Accepted ) { if (v->result() == QDialog::Accepted ) {
if(actualGame) { if(actualGame) {
mySession->deleteGame(); mySession->deleteGame();
actualGame = 0; actualGame = 0;
@@ -248,7 +255,7 @@ void mainWindowImpl::callNewGameDialog() {
label_Pot->setText("<p align='center'><span style='font-size:x-large; font-weight:bold'>Pot Total</span></p>"); label_Pot->setText("<p align='center'><span style='font-size:x-large; font-weight:bold'>Pot Total</span></p>");
label_Sets->setText("<p align='center'><span style='font-size:medium; font-weight:bold'>Sets:</span></p>"); label_Sets->setText("<p align='center'><span style='font-size:medium; font-weight:bold'>Sets:</span></p>");
guiGameSpeed = configFile.readConfig("gamespeed","4").toInt(&ok,10); guiGameSpeed = myConfigFile->readConfig("gamespeed","4").toInt(&ok,10);
// debugMode = v->checkBox_debugMode->isChecked(); // debugMode = v->checkBox_debugMode->isChecked();
//Tools und Board aufhellen und enablen //Tools und Board aufhellen und enablen
@@ -259,11 +266,13 @@ void mainWindowImpl::callNewGameDialog() {
//Speeds //Speeds
setSpeeds(); setSpeeds();
//positioning Slider //positioning Slider
horizontalSlider_speed->setValue(guiGameSpeed); horizontalSlider_speed->setValue(guiGameSpeed);
//Start Game!!! //Start Game!!!
mySession->startGame(configFile.readConfig("numberofplayers","5").toInt(&ok,10), configFile.readConfig("startcash","2000").toInt(&ok,10), configFile.readConfig("smallblind","10").toInt(&ok,10)); mySession->startGame(myConfigFile->readConfig("numberofplayers","5").toInt(&ok,10), myConfigFile->readConfig("startcash","2000").toInt(&ok,10), myConfigFile->readConfig("smallblind","10").toInt(&ok,10));
} }
@@ -279,6 +288,15 @@ void mainWindowImpl::callSettingsDialog() {
settingsDialogImpl *v = new settingsDialogImpl(); settingsDialogImpl *v = new settingsDialogImpl();
v->exec(); v->exec();
if (v->result()) {
bool ok;
//Toolbox verstecken?
if (!myConfigFile->readConfig("showtoolbox", "1").toInt(&ok,10)) { groupBox_tools->hide(); }
else { groupBox_tools->show(); }
}
} }
@@ -1348,3 +1366,8 @@ void mainWindowImpl::breakButtonClicked() {
} }
} }
void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
// cout << event->key()/*.toStdString()*/ << endl;
}
src/gui/qt/mainwindowimpl.h
+4
View File
@@ -30,6 +30,7 @@
class Game; class Game;
class Session; class Session;
class Log; class Log;
class ConfigFile;
class BoardInterface; class BoardInterface;
class HandInterface; class HandInterface;
@@ -155,12 +156,15 @@ public slots:
void timerBlockerFalse(); void timerBlockerFalse();
void breakButtonClicked(); void breakButtonClicked();
void keyPressEvent ( QKeyEvent * event );
private: private:
Game *actualGame; Game *actualGame;
HandInterface *actualHand; HandInterface *actualHand;
Session *mySession; Session *mySession;
Log *myLog; Log *myLog;
ConfigFile *myConfigFile;
QTimer *potDistributeTimer; QTimer *potDistributeTimer;
src/gui/qt/settingsdialog.ui
+157 -87
View File
@@ -44,7 +44,7 @@
</item> </item>
<item> <item>
<property name="text" > <property name="text" >
<string>Log</string> <string>Interface</string>
</property> </property>
</item> </item>
<item> <item>
@@ -52,6 +52,11 @@
<string>Player Nicks</string> <string>Player Nicks</string>
</property> </property>
</item> </item>
<item>
<property name="text" >
<string>Log Messages</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
@@ -67,6 +72,27 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_showGameSettingsDialogOnNewGame" >
<property name="text" >
<string>Show game settings dialog on every new game</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Game-Speed</string>
</property>
</widget>
</item>
<item row="7" column="0" > <item row="7" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@@ -80,20 +106,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="6" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_showGameSettingsDialogOnNewGame" >
<property name="text" >
<string>show game settings dialog on every new game</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Start Cash</string>
</property>
</widget>
</item>
<item row="4" column="1" > <item row="4" column="1" >
<widget class="QSpinBox" name="spinBox_smallBlind" > <widget class="QSpinBox" name="spinBox_smallBlind" >
<property name="maximum" > <property name="maximum" >
@@ -104,10 +116,37 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="3" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>Game-Speed</string> <string>Start Cash</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Small Blind</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Number of Players</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_5" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Game Settings</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -121,13 +160,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Small Blind</string>
</property>
</widget>
</item>
<item row="5" column="1" > <item row="5" column="1" >
<widget class="QSpinBox" name="spinBox_gameSpeed" > <widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="maximum" > <property name="maximum" >
@@ -151,36 +183,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Number of Players</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_5" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Game Settings</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_3" > <widget class="QWidget" name="page_2" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
@@ -188,7 +193,27 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_13" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Interface</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_5" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -201,23 +226,10 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0" > <item row="2" column="0" >
<widget class="Line" name="line_2" > <widget class="QCheckBox" name="checkBox_showToolbox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_6" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" > <property name="text" >
<string>Log Settings</string> <string>Show Toolbox</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -316,7 +328,49 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_2" /> <widget class="QWidget" name="page_3" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_6" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Log Messages</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
@@ -344,22 +398,6 @@
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>settingsDialog</receiver>
<slot>hide()</slot>
<hints>
<hint type="sourcelabel" >
<x>227</x>
<y>316</y>
</hint>
<hint type="destinationlabel" >
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
@@ -392,5 +430,37 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>settingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>243</x>
<y>315</y>
</hint>
<hint type="destinationlabel" >
<x>243</x>
<y>169</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>settingsDialog</receiver>
<slot>hide()</slot>
<hints>
<hint type="sourcelabel" >
<x>243</x>
<y>315</y>
</hint>
<hint type="destinationlabel" >
<x>243</x>
<y>169</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>
src/gui/qt/settingsdialogimpl.cpp
+8 -2
View File
@@ -47,13 +47,16 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, const char *name)
spinBox_gameSpeed->setValue(config.readConfig("gamespeed", "4").toInt(&ok,10)); spinBox_gameSpeed->setValue(config.readConfig("gamespeed", "4").toInt(&ok,10));
checkBox_showGameSettingsDialogOnNewGame->setChecked(config.readConfig("showgamesettingsdialogonnewgame", "1").toInt(&ok,10)); checkBox_showGameSettingsDialogOnNewGame->setChecked(config.readConfig("showgamesettingsdialogonnewgame", "1").toInt(&ok,10));
//Interface
checkBox_showToolbox->setChecked(config.readConfig("showtoolbox", "1").toInt(&ok,10));
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) );
} }
void settingsDialogImpl::accept() { void settingsDialogImpl::isAccepted() {
//Daten speichern //Daten speichern
ConfigFile config; ConfigFile config;
@@ -72,4 +75,7 @@ void settingsDialogImpl::accept() {
config.writeConfig("gamespeed", QString::number(spinBox_gameSpeed->value(),10)); config.writeConfig("gamespeed", QString::number(spinBox_gameSpeed->value(),10));
config.writeConfig("showgamesettingsdialogonnewgame", QString::number(checkBox_showGameSettingsDialogOnNewGame->isChecked(),10)); config.writeConfig("showgamesettingsdialogonnewgame", QString::number(checkBox_showGameSettingsDialogOnNewGame->isChecked(),10));
//Interface
config.writeConfig("showtoolbox", QString::number(checkBox_showToolbox->isChecked(),10));
} }
src/gui/qt/settingsdialogimpl.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
public slots: public slots:
void accept(); void isAccepted();
}; };
#endif #endif