This commit is contained in:
doitux
@@ -34,7 +34,7 @@ using namespace std;
|
||||
ConfigFile::ConfigFile()
|
||||
{
|
||||
// !!!! Revisionsnummer der Configdefaults !!!!!
|
||||
configRev = 11;
|
||||
configRev = 12;
|
||||
|
||||
// Pfad und Dateinamen setzen
|
||||
#ifdef _WIN32
|
||||
@@ -149,6 +149,9 @@ void ConfigFile::createDefaultConfig() {
|
||||
TiXmlElement * confElement4 = new TiXmlElement( "GameSpeed" );
|
||||
config->LinkEndChild( confElement4 );
|
||||
confElement4->SetAttribute("value", 4);
|
||||
TiXmlElement * confElement32 = new TiXmlElement( "EngineVersion" );
|
||||
config->LinkEndChild( confElement32 );
|
||||
confElement32->SetAttribute("value", 0);
|
||||
TiXmlElement * confElement14 = new TiXmlElement( "PauseBetweenHands" );
|
||||
config->LinkEndChild( confElement14 );
|
||||
confElement14->SetAttribute("value", 0);
|
||||
@@ -171,6 +174,9 @@ void ConfigFile::createDefaultConfig() {
|
||||
TiXmlElement * confElement27 = new TiXmlElement( "NetGameSpeed" );
|
||||
config->LinkEndChild( confElement27 );
|
||||
confElement27->SetAttribute("value", 4);
|
||||
TiXmlElement * confElement33 = new TiXmlElement( "NetEngineVersion" );
|
||||
config->LinkEndChild( confElement33 );
|
||||
confElement33->SetAttribute("value", 0);
|
||||
TiXmlElement * confElement28 = new TiXmlElement( "ServerPassword" );
|
||||
config->LinkEndChild( confElement28 );
|
||||
confElement28->SetAttribute("value", "");
|
||||
|
||||
+167
-119
@@ -5,8 +5,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>579</width>
|
||||
<height>382</height>
|
||||
<width>591</width>
|
||||
<height>434</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
@@ -204,13 +204,76 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="8" column="0" colspan="2" >
|
||||
<item row="9" 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="6" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_gameSpeed" >
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="singleStep" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>2</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0" >
|
||||
<widget class="QLabel" name="label_14" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise 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="10" column="0" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</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>Local Game Default Settings</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2" >
|
||||
<widget class="Line" name="line_3" >
|
||||
<property name="orientation" >
|
||||
@@ -228,73 +291,6 @@ p, li { white-space: pre-wrap; }
|
||||
</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="6" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_gameSpeed" >
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="singleStep" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" >
|
||||
<widget class="QLabel" name="label" >
|
||||
<property name="text" >
|
||||
<string>Game-Speed:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="0" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="7" column="0" colspan="2" >
|
||||
<widget class="QCheckBox" name="checkBox_pauseBetweenHands" >
|
||||
<property name="text" >
|
||||
<string>Pause between Hands (Press "Start" Button to go on)</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="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>Local Game Default Settings</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" >
|
||||
<widget class="QLabel" name="label_3" >
|
||||
<property name="text" >
|
||||
@@ -302,16 +298,6 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>2</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_startCash" >
|
||||
<property name="maximum" >
|
||||
@@ -322,6 +308,27 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" >
|
||||
<widget class="QLabel" name="label" >
|
||||
<property name="text" >
|
||||
<string>Game-Speed:</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="8" column="0" colspan="2" >
|
||||
<widget class="QCheckBox" name="checkBox_pauseBetweenHands" >
|
||||
<property name="text" >
|
||||
<string>Pause between Hands (Press "Start" Button to go on)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_handsBeforeRaiseSmallBlind" >
|
||||
<property name="minimum" >
|
||||
@@ -332,10 +339,24 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0" >
|
||||
<widget class="QLabel" name="label_14" >
|
||||
<item row="7" column="1" >
|
||||
<widget class="QComboBox" name="comboBox_engineVersion" >
|
||||
<item>
|
||||
<property name="text" >
|
||||
<string>0.4 (actual - under development)</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text" >
|
||||
<string>0.3 (previous)</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0" >
|
||||
<widget class="QLabel" name="label_17" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise Small Blind:</string>
|
||||
<string>Engine Version:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -433,23 +454,27 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="3" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netHandsBeforeRaiseSmallBlind" >
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>9</number>
|
||||
<item row="4" column="0" >
|
||||
<widget class="QLabel" name="label_36" >
|
||||
<property name="text" >
|
||||
<string>Game-Speed for Computer Opponents:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netStartCash" >
|
||||
<item row="1" column="0" >
|
||||
<widget class="QLabel" name="label_13" >
|
||||
<property name="text" >
|
||||
<string>Start Cash:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netQuantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1000</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -470,13 +495,6 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" >
|
||||
<widget class="QLabel" name="label_36" >
|
||||
<property name="text" >
|
||||
<string>Game-Speed for Computer Opponents:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" >
|
||||
<widget class="QLabel" name="label_35" >
|
||||
<property name="text" >
|
||||
@@ -484,6 +502,33 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netHandsBeforeRaiseSmallBlind" >
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>9</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netStartCash" >
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1000</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" >
|
||||
<widget class="QLabel" name="label_33" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise Small Blind:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netGameSpeed" >
|
||||
<property name="maximum" >
|
||||
@@ -497,27 +542,24 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" >
|
||||
<widget class="QSpinBox" name="spinBox_netQuantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item row="5" column="1" >
|
||||
<widget class="QComboBox" name="comboBox_netEngineVersion" >
|
||||
<item>
|
||||
<property name="text" >
|
||||
<string>0.4 (actual - under development)</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text" >
|
||||
<string>0.3 (previous)</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" >
|
||||
<widget class="QLabel" name="label_13" >
|
||||
<item row="5" column="0" >
|
||||
<widget class="QLabel" name="label_18" >
|
||||
<property name="text" >
|
||||
<string>Start Cash:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" >
|
||||
<widget class="QLabel" name="label_33" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise Small Blind:</string>
|
||||
<string>Engine Version:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -773,6 +815,12 @@ p, li { white-space: pre-wrap; }
|
||||
</item>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QListWidget" name="listWidget" >
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>150</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<size>
|
||||
<width>150</width>
|
||||
|
||||
@@ -48,6 +48,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent)
|
||||
spinBox_gameSpeed->setValue(myConfig.readConfigInt("GameSpeed"));
|
||||
checkBox_pauseBetweenHands->setChecked(myConfig.readConfigInt("PauseBetweenHands"));
|
||||
checkBox_showGameSettingsDialogOnNewGame->setChecked(myConfig.readConfigInt("ShowGameSettingsDialogOnNewGame"));
|
||||
comboBox_engineVersion->setCurrentIndex(myConfig.readConfigInt("EngineVersion"));
|
||||
|
||||
//Network Game Settings
|
||||
spinBox_netQuantityPlayers->setValue(myConfig.readConfigInt("NetNumberOfPlayers"));
|
||||
@@ -55,9 +56,11 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent)
|
||||
spinBox_netSmallBlind->setValue(myConfig.readConfigInt("NetSmallBlind"));
|
||||
spinBox_netHandsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("NetHandsBeforeRaiseSmallBlind"));
|
||||
spinBox_netGameSpeed->setValue(myConfig.readConfigInt("NetGameSpeed"));
|
||||
comboBox_netEngineVersion->setCurrentIndex(myConfig.readConfigInt("NetEngineVersion"));
|
||||
spinBox_serverPort->setValue(myConfig.readConfigInt("ServerPort"));
|
||||
lineEdit_serverPassword->setText(QString::fromStdString(myConfig.readConfigString("ServerPassword")));
|
||||
checkBox_useIpv6->setChecked(myConfig.readConfigInt("ServerUseIpv6"));
|
||||
|
||||
|
||||
//Interface
|
||||
checkBox_showLeftToolbox->setChecked(myConfig.readConfigInt("ShowLeftToolBox"));
|
||||
@@ -110,6 +113,7 @@ void settingsDialogImpl::isAccepted() {
|
||||
myConfig.writeConfigInt("SmallBlind", spinBox_smallBlind->value());
|
||||
myConfig.writeConfigInt("HandsBeforeRaiseSmallBlind", spinBox_handsBeforeRaiseSmallBlind->value());
|
||||
myConfig.writeConfigInt("GameSpeed", spinBox_gameSpeed->value());
|
||||
myConfig.writeConfigInt("EngineVersion", comboBox_engineVersion->currentIndex());
|
||||
myConfig.writeConfigInt("PauseBetweenHands", checkBox_pauseBetweenHands->isChecked());
|
||||
myConfig.writeConfigInt("ShowGameSettingsDialogOnNewGame", checkBox_showGameSettingsDialogOnNewGame->isChecked());
|
||||
|
||||
@@ -119,6 +123,7 @@ void settingsDialogImpl::isAccepted() {
|
||||
myConfig.writeConfigInt("NetSmallBlind", spinBox_netSmallBlind->value());
|
||||
myConfig.writeConfigInt("NetHandsBeforeRaiseSmallBlind", spinBox_netHandsBeforeRaiseSmallBlind->value());
|
||||
myConfig.writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value());
|
||||
myConfig.writeConfigInt("NetEngineVersion", comboBox_netEngineVersion->currentIndex());
|
||||
myConfig.writeConfigInt("ServerPort", spinBox_serverPort->value());
|
||||
myConfig.writeConfigString("ServerPassword", lineEdit_serverPassword->text().toStdString());
|
||||
myConfig.writeConfigInt("ServerUseIpv6", checkBox_useIpv6->isChecked());
|
||||
|
||||
Reference in New Issue
Block a user