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

Browse Source
This commit is contained in:
doitux
2007-02-25 23:14:48 +00:00
parent fdc6cd2d63
commit 06ed84cb7b
5 changed files with 163 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+4 -1
View File
@@ -34,7 +34,7 @@ using namespace std;
ConfigFile::ConfigFile() ConfigFile::ConfigFile()
{ {
// !!!! Revisionsnummer der Configdefaults !!!!! // !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 7; configRev = 8;
// Pfad und Dateinamen setzen // Pfad und Dateinamen setzen
#ifdef _WIN32 #ifdef _WIN32
@@ -167,6 +167,9 @@ void ConfigFile::createDefaultConfig() {
TiXmlElement * confElement28 = new TiXmlElement( "ServerPassword" ); TiXmlElement * confElement28 = new TiXmlElement( "ServerPassword" );
config->LinkEndChild( confElement28 ); config->LinkEndChild( confElement28 );
confElement28->SetAttribute("value", ""); confElement28->SetAttribute("value", "");
TiXmlElement * confElement29 = new TiXmlElement( "ServerUseIpv6" );
config->LinkEndChild( confElement29 );
confElement29->SetAttribute("value", 0);
TiXmlElement * confElement6 = new TiXmlElement( "MyName" ); TiXmlElement * confElement6 = new TiXmlElement( "MyName" );
config->LinkEndChild( confElement6 ); config->LinkEndChild( confElement6 );
src/gui/qt/createnetworkgamedialog.ui
+135 -114
View File
@@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>314</width> <width>300</width>
<height>243</height> <height>281</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@@ -19,6 +19,139 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Network Game Settings</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="6" column="1" colspan="3" >
<widget class="QLineEdit" name="lineEdit_serverPassword" >
<property name="echoMode" >
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="6" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<string>Server Password:</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
<property name="maximum" >
<number>5</number>
</property>
<property name="minimum" >
<number>2</number>
</property>
<property name="value" >
<number>5</number>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="maximum" >
<number>5000</number>
</property>
<property name="minimum" >
<number>1000</number>
</property>
<property name="value" >
<number>2000</number>
</property>
</widget>
</item>
<item row="2" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_smallBlind" >
<property name="maximum" >
<number>500</number>
</property>
<property name="minimum" >
<number>5</number>
</property>
<property name="value" >
<number>10</number>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Game Speed for Computer Opponent:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Number of Players:</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Small Blind:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Start Cash:</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Hands before raise Small Blind:</string>
</property>
</widget>
</item>
<item row="3" column="2" colspan="2" >
<widget class="QSpinBox" name="spinBox_handsBeforeRaiseSmallBlind" >
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>9</number>
</property>
</widget>
</item>
<item row="4" column="3" >
<widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="maximum" >
<number>11</number>
</property>
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>4</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" > <item row="1" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" > <property name="margin" >
@@ -56,118 +189,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Network Game Settings</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="4" column="3" >
<widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="maximum" >
<number>11</number>
</property>
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>4</number>
</property>
</widget>
</item>
<item row="3" column="2" colspan="2" >
<widget class="QSpinBox" name="spinBox_handsBeforeRaiseSmallBlind" >
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>9</number>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Hands before raise Small Blind:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Start Cash:</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Small Blind:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Number of Players:</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Game Speed for Computer Opponent:</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_smallBlind" >
<property name="maximum" >
<number>500</number>
</property>
<property name="minimum" >
<number>5</number>
</property>
<property name="value" >
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="maximum" >
<number>5000</number>
</property>
<property name="minimum" >
<number>1000</number>
</property>
<property name="value" >
<number>2000</number>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
<property name="maximum" >
<number>5</number>
</property>
<property name="minimum" >
<number>2</number>
</property>
<property name="value" >
<number>5</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+12 -1
View File
@@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "createnetworkgamedialogimpl.h" #include "createnetworkgamedialogimpl.h"
#include "session.h" #include "session.h"
// #include "configfile.h" #include "configfile.h"
createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent) createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent)
: QDialog(parent) : QDialog(parent)
@@ -27,6 +27,17 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent)
setupUi(this); setupUi(this);
//Formulare Füllen
ConfigFile myConfig;
//Network Game Settings
spinBox_quantityPlayers->setValue(myConfig.readConfigInt("NetNumberOfPlayers"));
spinBox_startCash->setValue(myConfig.readConfigInt("NetStartCash"));
spinBox_smallBlind->setValue(myConfig.readConfigInt("NetSmallBlind"));
spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind"));
spinBox_gameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed"));
lineEdit_serverPassword->setText(QString::fromStdString(myConfig.readConfigString("ServerPassword")));
connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) );
connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) );
src/gui/qt/settingsdialog.ui
+10 -3
View File
@@ -22,7 +22,7 @@
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QStackedWidget" name="stackedWidget" > <widget class="QStackedWidget" name="stackedWidget" >
<property name="currentIndex" > <property name="currentIndex" >
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="page" > <widget class="QWidget" name="page" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
@@ -426,20 +426,27 @@ p, li { white-space: pre-wrap; }
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="1" column="1" >
<widget class="QLineEdit" name="lineEdit_serverPassword" > <widget class="QLineEdit" name="lineEdit_serverPassword" >
<property name="echoMode" > <property name="echoMode" >
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="label_37" > <widget class="QLabel" name="label_37" >
<property name="text" > <property name="text" >
<string>Server Password:</string> <string>Server Password:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="checkBox_useIpv6" >
<property name="text" >
<string>Use IPv6</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+2
View File
@@ -56,6 +56,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent)
spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind")); spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind"));
spinBox_netGameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed")); spinBox_netGameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed"));
lineEdit_serverPassword->setText(QString::fromStdString(myConfig.readConfigString("ServerPassword"))); lineEdit_serverPassword->setText(QString::fromStdString(myConfig.readConfigString("ServerPassword")));
checkBox_useIpv6->setChecked(myConfig.readConfigInt("ServerUseIpv6"));
//Interface //Interface
checkBox_showLeftToolbox->setChecked(myConfig.readConfigInt("ShowLeftToolBox")); checkBox_showLeftToolbox->setChecked(myConfig.readConfigInt("ShowLeftToolBox"));
@@ -118,6 +119,7 @@ void settingsDialogImpl::isAccepted() {
myConfig.writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value()); myConfig.writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value());
myConfig.writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value()); myConfig.writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value());
myConfig.writeConfigString("ServerPassword", lineEdit_serverPassword->text().toStdString()); myConfig.writeConfigString("ServerPassword", lineEdit_serverPassword->text().toStdString());
myConfig.writeConfigInt("ServerUseIpv6", checkBox_useIpv6->isChecked());
// Interface // Interface
myConfig.writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked()); myConfig.writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked());