start implementing 10 player mode

This commit is contained in:
doitux
2009-03-25 22:59:01 +00:00
parent a69e2ec4b0
commit d7bfab7d4e
71 changed files with 5179 additions and 4331 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

+7 -1
View File
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
myQtToolsInterface = CreateQtToolsWrapper();
// !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 58;
configRev = 59;
//standard defaults
logOnOffDefault = "1";
@@ -231,6 +231,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
configList.push_back(ConfigInfo("Opponent5Avatar", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("Opponent6Name", CONFIG_TYPE_STRING, "Player 6"));
configList.push_back(ConfigInfo("Opponent6Avatar", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("Opponent7Name", CONFIG_TYPE_STRING, "Player 7"));
configList.push_back(ConfigInfo("Opponent7Avatar", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("Opponent8Name", CONFIG_TYPE_STRING, "Player 8"));
configList.push_back(ConfigInfo("Opponent8Avatar", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("Opponent9Name", CONFIG_TYPE_STRING, "Player 9"));
configList.push_back(ConfigInfo("Opponent9Avatar", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("LogOnOff", CONFIG_TYPE_INT, logOnOffDefault));
configList.push_back(ConfigInfo("LogDir", CONFIG_TYPE_STRING, logDir));
configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2"));
+1 -1
View File
@@ -21,7 +21,7 @@
#define GAME_DEFS_H
#define MIN_NUMBER_OF_PLAYERS 2
#define MAX_NUMBER_OF_PLAYERS 7
#define MAX_NUMBER_OF_PLAYERS 10
#define MIN_GUI_SPEED 1
#define MAX_GUI_SPEED 11
+117 -116
View File
@@ -1,7 +1,8 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>changeCompleteBlindsDialog</class>
<widget class="QDialog" name="changeCompleteBlindsDialog" >
<property name="geometry" >
<widget class="QDialog" name="changeCompleteBlindsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,99 +10,99 @@
<height>397</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Change Blinds Settings</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<layout class="QGridLayout">
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<widget class="QLabel" name="label_3">
<property name="text">
<string>First small blind:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_firstSmallBlind" >
<property name="minimum" >
<widget class="QSpinBox" name="spinBox_firstSmallBlind">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>500</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox_6" >
<property name="title" >
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
<string>Raise blinds:</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin" >
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin" >
<property name="bottomMargin">
<number>9</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_raiseBlindsAtHands" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_raiseBlindsAtHands">
<property name="text">
<string>Every:</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QSpinBox" name="spinBox_raiseSmallBlindEveryHands" >
<property name="minimum" >
<item row="0" column="1">
<widget class="QSpinBox" name="spinBox_raiseSmallBlindEveryHands">
<property name="minimum">
<number>1</number>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QLabel" name="label_47" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<item row="0" column="2">
<widget class="QLabel" name="label_47">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>hands</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="radioButton_raiseBlindsAtMinutes" >
<property name="text" >
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_raiseBlindsAtMinutes">
<property name="text">
<string>Every:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="spinBox_raiseSmallBlindEveryMinutes" >
<property name="minimum" >
<item row="1" column="1">
<widget class="QSpinBox" name="spinBox_raiseSmallBlindEveryMinutes">
<property name="minimum">
<number>1</number>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QLabel" name="label_50" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<item row="1" column="2">
<widget class="QLabel" name="label_50">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>minutes</string>
</property>
</widget>
@@ -109,34 +110,34 @@
</layout>
</widget>
</item>
<item row="1" column="1" >
<widget class="QGroupBox" name="groupBox_7" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<property name="title">
<string>Raise mode:</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_alwaysDoubleBlinds" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_alwaysDoubleBlinds">
<property name="text">
<string>Always double blinds</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="radioButton_manualBlindsOrder" >
<property name="text" >
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_manualBlindsOrder">
<property name="text">
<string>Manual blinds order:</string>
</property>
</widget>
@@ -144,36 +145,36 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="enabled" >
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title" >
<property name="title">
<string>Manual blinds order:</string>
</property>
<layout class="QGridLayout" >
<item rowspan="2" row="0" column="0" >
<layout class="QGridLayout" >
<property name="horizontalSpacing" >
<layout class="QGridLayout">
<item row="0" column="0" rowspan="2">
<layout class="QGridLayout">
<property name="horizontalSpacing">
<number>4</number>
</property>
<item rowspan="2" row="0" column="0" >
<widget class="QListWidget" name="listWidget_blinds" />
<item row="0" column="0" rowspan="2">
<widget class="QListWidget" name="listWidget_blinds"/>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="pushButton_delete" >
<property name="text" >
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_delete">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="1" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>121</height>
@@ -181,28 +182,28 @@
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QSpinBox" name="spinBox_input" >
<property name="maximum" >
<number>9999</number>
<item row="2" column="0">
<widget class="QSpinBox" name="spinBox_input">
<property name="maximum">
<number>100000</number>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QPushButton" name="pushButton_add" >
<property name="text" >
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_add">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1" >
<item row="0" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -210,53 +211,53 @@
</property>
</spacer>
</item>
<item row="1" column="1" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Afterwards:</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_afterThisAlwaysDoubleBlinds" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_afterThisAlwaysDoubleBlinds">
<property name="text">
<string>Always double blinds</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<item row="1" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QRadioButton" name="radioButton_afterThisAlwaysRaiseAbout" >
<property name="text" >
<widget class="QRadioButton" name="radioButton_afterThisAlwaysRaiseAbout">
<property name="text">
<string>Always raise by:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_afterThisAlwaysRaiseValue" >
<property name="maximum" >
<number>9999</number>
<widget class="QSpinBox" name="spinBox_afterThisAlwaysRaiseValue">
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<widget class="QLabel" name="label">
<property name="text">
<string>$</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" >
<widget class="QRadioButton" name="radioButton_afterThisStayAtLastBlind" >
<property name="text" >
<item row="2" column="0">
<widget class="QRadioButton" name="radioButton_afterThisStayAtLastBlind">
<property name="text">
<string>Keep last blind</string>
</property>
</widget>
@@ -267,13 +268,13 @@
</layout>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<item row="3" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -305,11 +306,11 @@
<receiver>changeCompleteBlindsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>237</x>
<y>387</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -321,11 +322,11 @@
<receiver>changeCompleteBlindsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>279</x>
<y>387</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
@@ -337,11 +338,11 @@
<receiver>spinBox_afterThisAlwaysRaiseValue</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>327</x>
<y>302</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>389</x>
<y>304</y>
</hint>
@@ -353,11 +354,11 @@
<receiver>groupBox_2</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>297</x>
<y>116</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>306</x>
<y>164</y>
</hint>
+94 -123
View File
@@ -1,119 +1,108 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>createInternetGameDialog</class>
<widget class="QDialog" name="createInternetGameDialog" >
<property name="geometry" >
<widget class="QDialog" name="createInternetGameDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>275</width>
<height>291</height>
<width>302</width>
<height>329</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Create Internet Game</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<property name="spacing">
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Internet Game Settings</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Maximum number of players:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_quantityPlayers</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
<property name="minimum" >
<item row="0" column="1" colspan="3">
<widget class="QSpinBox" name="spinBox_quantityPlayers">
<property name="minimum">
<number>2</number>
</property>
<property name="maximum" >
<number>7</number>
<property name="maximum">
<number>10</number>
</property>
<property name="value" >
<number>7</number>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Start Cash:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_startCash</cstring>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="suffix" >
<item row="1" column="1" colspan="3">
<widget class="QSpinBox" name="spinBox_startCash">
<property name="suffix">
<string/>
</property>
<property name="prefix" >
<property name="prefix">
<string>$</string>
</property>
<property name="minimum" >
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum" >
<number>5000</number>
<property name="maximum">
<number>1000000</number>
</property>
<property name="singleStep" >
<property name="singleStep">
<number>50</number>
</property>
<property name="value" >
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="4" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<item row="2" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Blinds</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings">
<property name="text">
<string>Use saved blinds settings</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="radioButton_changeBlindsSettings" >
<property name="text" >
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text">
<string>Change blinds settings ...</string>
</property>
</widget>
@@ -121,85 +110,76 @@
</layout>
</widget>
</item>
<item row="3" column="0" colspan="3" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<item row="3" column="0" colspan="3">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Game Speed for computer opponents:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_gameSpeed</cstring>
</property>
</widget>
</item>
<item row="3" column="3" >
<widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="minimum" >
<item row="3" column="3">
<widget class="QSpinBox" name="spinBox_gameSpeed">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>11</number>
</property>
<property name="value" >
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Timeout for player action:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_netTimeOutPlayerAction</cstring>
</property>
</widget>
</item>
<item row="4" column="2" colspan="2" >
<widget class="QSpinBox" name="spinBox_netTimeOutPlayerAction" >
<property name="suffix" >
<item row="4" column="2" colspan="2">
<widget class="QSpinBox" name="spinBox_netTimeOutPlayerAction">
<property name="suffix">
<string> s</string>
</property>
<property name="minimum" >
<property name="minimum">
<number>5</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>60</number>
</property>
<property name="value" >
<property name="value">
<number>20</number>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<item row="5" column="0" colspan="4">
<layout class="QHBoxLayout">
<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" >
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkBox_Password" >
<property name="text" >
<widget class="QCheckBox" name="checkBox_Password">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_Password" >
<property name="enabled" >
<widget class="QLineEdit" name="lineEdit_Password">
<property name="enabled">
<bool>false</bool>
</property>
<property name="echoMode" >
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
@@ -209,29 +189,20 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<item row="1" column="0">
<layout class="QHBoxLayout">
<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" >
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>181</width>
<height>20</height>
@@ -240,15 +211,15 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_createGame" >
<property name="text" >
<widget class="QPushButton" name="pushButton_createGame">
<property name="text">
<string>Create Game</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_cancel" >
<property name="text" >
<widget class="QPushButton" name="pushButton_cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
@@ -277,11 +248,11 @@
<receiver>createInternetGameDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>205</x>
<y>294</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>87</x>
<y>215</y>
</hint>
@@ -293,11 +264,11 @@
<receiver>createInternetGameDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>286</x>
<y>294</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>288</x>
<y>190</y>
</hint>
@@ -309,11 +280,11 @@
<receiver>lineEdit_Password</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>76</x>
<y>239</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>146</x>
<y>235</y>
</hint>
+81 -89
View File
@@ -1,101 +1,102 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>createNetworkGameDialog</class>
<widget class="QDialog" name="createNetworkGameDialog" >
<property name="geometry" >
<widget class="QDialog" name="createNetworkGameDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>275</width>
<height>263</height>
<width>302</width>
<height>302</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Create Network Game</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Network Game Settings</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>9</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Maximum number of players:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_quantityPlayers</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
<property name="minimum" >
<item row="0" column="1" colspan="3">
<widget class="QSpinBox" name="spinBox_quantityPlayers">
<property name="minimum">
<number>2</number>
</property>
<property name="maximum" >
<number>7</number>
<property name="maximum">
<number>10</number>
</property>
<property name="value" >
<number>7</number>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Start Cash:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_startCash</cstring>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="suffix" >
<item row="1" column="1" colspan="3">
<widget class="QSpinBox" name="spinBox_startCash">
<property name="suffix">
<string/>
</property>
<property name="prefix" >
<property name="prefix">
<string>$</string>
</property>
<property name="minimum" >
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum" >
<number>5000</number>
<property name="maximum">
<number>1000000</number>
</property>
<property name="value" >
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="4" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<item row="2" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Blinds</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings">
<property name="text">
<string>Use saved blinds settings</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="radioButton_changeBlindsSettings" >
<property name="text" >
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text">
<string>Change blinds settings ...</string>
</property>
</widget>
@@ -103,51 +104,51 @@
</layout>
</widget>
</item>
<item row="3" column="0" colspan="3" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<item row="3" column="0" colspan="3">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Game Speed for computer opponents:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_gameSpeed</cstring>
</property>
</widget>
</item>
<item row="3" column="3" >
<widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="minimum" >
<item row="3" column="3">
<widget class="QSpinBox" name="spinBox_gameSpeed">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>11</number>
</property>
<property name="value" >
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Timeout for player action:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_netTimeOutPlayerAction</cstring>
</property>
</widget>
</item>
<item row="4" column="2" colspan="2" >
<widget class="QSpinBox" name="spinBox_netTimeOutPlayerAction" >
<property name="suffix" >
<item row="4" column="2" colspan="2">
<widget class="QSpinBox" name="spinBox_netTimeOutPlayerAction">
<property name="suffix">
<string> s</string>
</property>
<property name="minimum" >
<property name="minimum">
<number>5</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>60</number>
</property>
<property name="value" >
<property name="value">
<number>20</number>
</property>
</widget>
@@ -155,29 +156,20 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<item row="1" column="0">
<layout class="QHBoxLayout">
<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" >
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>181</width>
<height>20</height>
@@ -186,15 +178,15 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_createGame" >
<property name="text" >
<widget class="QPushButton" name="pushButton_createGame">
<property name="text">
<string>Create Game</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_cancel" >
<property name="text" >
<widget class="QPushButton" name="pushButton_cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
@@ -221,11 +213,11 @@
<receiver>createNetworkGameDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>223</x>
<y>292</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>87</x>
<y>215</y>
</hint>
@@ -237,11 +229,11 @@
<receiver>createNetworkGameDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>304</x>
<y>292</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>288</x>
<y>190</y>
</hint>
+2812 -2356
View File
File diff suppressed because it is too large Load Diff
+74 -88
View File
@@ -200,6 +200,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
buttonLabelArray[4] = textLabel_Button4;
buttonLabelArray[5] = textLabel_Button5;
buttonLabelArray[6] = textLabel_Button6;
buttonLabelArray[7] = textLabel_Button7;
buttonLabelArray[8] = textLabel_Button8;
buttonLabelArray[9] = textLabel_Button9;
// cashLabelArray init
cashLabelArray[0] = textLabel_Cash0;
@@ -209,15 +212,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
cashLabelArray[4] = textLabel_Cash4;
cashLabelArray[5] = textLabel_Cash5;
cashLabelArray[6] = textLabel_Cash6;
// cashTopLabelArray init
cashTopLabelArray[0] = textLabel_TopCash0;
cashTopLabelArray[1] = textLabel_TopCash1;
cashTopLabelArray[2] = textLabel_TopCash2;
cashTopLabelArray[3] = textLabel_TopCash3;
cashTopLabelArray[4] = textLabel_TopCash4;
cashTopLabelArray[5] = textLabel_TopCash5;
cashTopLabelArray[6] = textLabel_TopCash6;
cashLabelArray[7] = textLabel_Cash7;
cashLabelArray[8] = textLabel_Cash8;
cashLabelArray[9] = textLabel_Cash9;
// playerNameLabelArray init
playerNameLabelArray[0] = label_PlayerName0;
@@ -227,6 +224,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
playerNameLabelArray[4] = label_PlayerName4;
playerNameLabelArray[5] = label_PlayerName5;
playerNameLabelArray[6] = label_PlayerName6;
playerNameLabelArray[7] = label_PlayerName7;
playerNameLabelArray[8] = label_PlayerName8;
playerNameLabelArray[9] = label_PlayerName9;
// playerAvatarLabelArray init
playerAvatarLabelArray[0] = label_Avatar0;
@@ -236,6 +236,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
playerAvatarLabelArray[4] = label_Avatar4;
playerAvatarLabelArray[5] = label_Avatar5;
playerAvatarLabelArray[6] = label_Avatar6;
playerAvatarLabelArray[7] = label_Avatar7;
playerAvatarLabelArray[8] = label_Avatar8;
playerAvatarLabelArray[9] = label_Avatar9;
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
playerAvatarLabelArray[i]->setMyW(this);
playerAvatarLabelArray[i]->setMyId(i);
@@ -249,6 +252,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
setLabelArray[4] = textLabel_Set4;
setLabelArray[5] = textLabel_Set5;
setLabelArray[6] = textLabel_Set6;
setLabelArray[7] = textLabel_Set7;
setLabelArray[8] = textLabel_Set8;
setLabelArray[9] = textLabel_Set9;
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { setLabelArray[i]->setMyW(this); }
// statusLabelArray init
@@ -259,6 +265,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
actionLabelArray[4] = textLabel_Status4;
actionLabelArray[5] = textLabel_Status5;
actionLabelArray[6] = textLabel_Status6;
actionLabelArray[7] = textLabel_Status7;
actionLabelArray[8] = textLabel_Status8;
actionLabelArray[9] = textLabel_Status9;
textLabel_Status0->setMyW(this);
@@ -270,6 +279,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
groupBoxArray[4] = groupBox4;
groupBoxArray[5] = groupBox5;
groupBoxArray[6] = groupBox6;
groupBoxArray[7] = groupBox7;
groupBoxArray[8] = groupBox8;
groupBoxArray[9] = groupBox9;
// boardCardsArray init
boardCardsArray[0] = pixmapLabel_cardBoard0;
@@ -293,6 +305,12 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
holeCardsArray[5][1] = pixmapLabel_card5b;
holeCardsArray[6][0] = pixmapLabel_card6a;
holeCardsArray[6][1] = pixmapLabel_card6b;
holeCardsArray[7][0] = pixmapLabel_card7a;
holeCardsArray[7][1] = pixmapLabel_card7b;
holeCardsArray[8][0] = pixmapLabel_card8a;
holeCardsArray[8][1] = pixmapLabel_card8b;
holeCardsArray[9][0] = pixmapLabel_card9a;
holeCardsArray[9][1] = pixmapLabel_card9b;
// Farben initalisieren
active.setRgb(86,170,86);
@@ -307,8 +325,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
font2String = "font-family: \"Nimbus Sans L\";";
QString textBrowserFontsize= "11";
QString cashFontSize = "11";
QString setLabelFontSize = "13";
QString playerNameLabelFontSize = "14";
QString setLabelFontSize = "11";
QString playerNameLabelFontSize = "11";
QString mediumTableFontSize = "13";
QString handLabelFontSize = "18";
QString labelPotFontSize = "19";
@@ -324,8 +342,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
#endif
QString textBrowserFontsize= "10";
QString cashFontSize = "10";
QString setLabelFontSize = "12";
QString playerNameLabelFontSize = "13";
QString setLabelFontSize = "10";
QString playerNameLabelFontSize = "11";
QString mediumTableFontSize = "13";
QString handLabelFontSize = "17";
QString labelPotFontSize = "18";
@@ -347,20 +365,10 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
// tabWidget_Left->setStyleSheet("QTabWidget::pane { border: 1px solid #286400; border-radius: 2px; background-color: #145300; }");
#endif
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
cashTopLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #F0F0F0; }");
cashLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #F0F0F0; }");
}
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
setLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }");
}
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
cashLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #FFFF00; }");
setLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #FFFF00; }");
playerNameLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }");
}
@@ -404,15 +412,13 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
label_voteStarterNick->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
label_votestartedby->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }");
// statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }");
//Groupbox Background
for (i=1; i<MAX_NUMBER_OF_PLAYERS; i++) {
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }");
groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }");
//Human player button
pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked_hover.png);}");
pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked_hover.png);}");
@@ -469,9 +475,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
if(myConfig->readConfigInt("ShowStatusbarMessages")) {
#ifdef __APPLE__
statusBar()->showMessage(tr("Cmd+N to start a new game"));
// statusBar()->showMessage(tr("Cmd+N to start a new game"));
#else
statusBar()->showMessage(tr("Ctrl+N to start a new game"));
// statusBar()->showMessage(tr("Ctrl+N to start a new game"));
#endif
}
@@ -641,6 +647,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent4Name->text().toUtf8().constData());
(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent5Name->text().toUtf8().constData());
(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent6Name->text().toUtf8().constData());
(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent7Name->text().toUtf8().constData());
(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent8Name->text().toUtf8().constData());
(*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent9Name->text().toUtf8().constData());
mySettingsDialog->setPlayerNickIsChanged(FALSE);
refreshPlayerName();
@@ -657,6 +666,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent4Avatar->getMyLink().toUtf8().constData());
(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent5Avatar->getMyLink().toUtf8().constData());
(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent6Avatar->getMyLink().toUtf8().constData());
(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent7Avatar->getMyLink().toUtf8().constData());
(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent8Avatar->getMyLink().toUtf8().constData());
(*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent9Avatar->getMyLink().toUtf8().constData());
//avatar refresh
refreshPlayerAvatar();
@@ -682,10 +694,10 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
if(myConfig->readConfigInt("AntiPeekMode")) {
holeCardsArray[0][0]->setPixmap(*flipside, TRUE);
tempCardsPixmapArray[0] = QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[0], 10)+".png"));
holeCardsArray[0][0]->setFrontPixmap(tempCardsPixmapArray[0]);
holeCardsArray[0][0]->setHiddenFrontPixmap(tempCardsPixmapArray[0]);
holeCardsArray[0][1]->setPixmap(*flipside, TRUE);
tempCardsPixmapArray[1]= QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[1], 10)+".png"));
holeCardsArray[0][1]->setFrontPixmap(tempCardsPixmapArray[1]);
holeCardsArray[0][1]->setHiddenFrontPixmap(tempCardsPixmapArray[1]);
}
else {
tempCardsPixmapArray[0]= QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[0], 10)+".png"));
@@ -950,11 +962,11 @@ void gameTableImpl::refreshCash() {
if((*it_c)->getMyActiveStatus()) {
cashLabelArray[(*it_c)->getMyID()]->setText("$"+QString::number((*it_c)->getMyCash(),10));
cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:");
// cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:");
} else {
cashLabelArray[(*it_c)->getMyID()]->setText("");
cashTopLabelArray[(*it_c)->getMyID()]->setText("");
// cashTopLabelArray[(*it_c)->getMyID()]->setText("");
}
}
}
@@ -971,31 +983,22 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
if((*it_c)->getMyTurn()) {
//Groupbox glow wenn der Spiele dran ist.
if((*it_c)->getMyID()==0) {
groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }");
}
else {
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }");
}
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }");
} else {
//Groupbox auf Hintergrundfarbe setzen wenn der Spiele nicht dran aber aktiv ist.
if((*it_c)->getMyActiveStatus()) {
if((*it_c)->getMyID()==0) {
groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }");
//show buttons
for(j=0; j<6; j++) {
userWidgetsArray[j]->show();
}
}
else {
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }");
}
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
//Groupbox verdunkeln wenn der Spiele inactive ist.
else {
if((*it_c)->getMyID()==0) {
groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }");
//hide buttons
for(j=0; j<6; j++) {
userWidgetsArray[j]->hide();
@@ -1004,9 +1007,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
holeCardsArray[0][0]->signalFastFlipCards(FALSE);
holeCardsArray[0][1]->signalFastFlipCards(FALSE);
}
else {
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }");
}
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
}
}
@@ -1017,7 +1018,6 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
//inactive
case 0: {
if (!playerID) {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }");
//hide buttons
for(j=0; j<6; j++) {
userWidgetsArray[j]->hide();
@@ -1026,43 +1026,28 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
holeCardsArray[0][0]->signalFastFlipCards(FALSE);
holeCardsArray[0][1]->signalFastFlipCards(FALSE);
}
else {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }");
}
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
break;
//active but fold
case 1: {
if (!playerID) {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }");
//show buttons
for(j=0; j<6; j++) {
userWidgetsArray[j]->show();
}
}
else {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }");
}
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
break;
//active in action
case 2: {
if (!playerID) {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }");
}
else {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }");
}
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }");
}
break;
//active not in action
case 3: {
if (!playerID) {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }");
}
else {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }");
}
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
break;
default: {}
@@ -1160,14 +1145,15 @@ void gameTableImpl::dealHoleCards() {
for(j=0; j<2; j++) {
if((*it_c)->getMyActiveStatus()) {
if (( (*it_c)->getMyID() == 0) || DEBUG_MODE) {
tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
if(myConfig->readConfigInt("AntiPeekMode")) {
holeCardsArray[(*it_c)->getMyID()][j]->setPixmap(*flipside, TRUE);
tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
holeCardsArray[(*it_c)->getMyID()][j]->setFrontPixmap(tempCardsPixmapArray[j]);
holeCardsArray[(*it_c)->getMyID()][j]->setFront(*flipside);
holeCardsArray[(*it_c)->getMyID()][j]->setHiddenFrontPixmap(tempCardsPixmapArray[j]);
}
else {
tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
holeCardsArray[(*it_c)->getMyID()][j]->setPixmap(tempCardsPixmapArray[j],FALSE);
holeCardsArray[(*it_c)->getMyID()][j]->setFront(tempCardsPixmapArray[j]);
}
}
else {
@@ -1543,9 +1529,9 @@ void gameTableImpl::meInAction() {
if(myConfig->readConfigInt("ShowStatusbarMessages")) {
if ( myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0 ) {
statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000);
// // statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000);
} else {
statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000);
// statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000);
}
}
@@ -1637,7 +1623,7 @@ void gameTableImpl::myFold(){
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(0);
statusBar()->clearMessage();
// statusBar()->clearMessage();
//Spiel läuft weiter
myActionDone();
@@ -1653,7 +1639,7 @@ void gameTableImpl::myCheck() {
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(0);
statusBar()->clearMessage();
// statusBar()->clearMessage();
//Spiel läuft weiter
myActionDone();
@@ -1727,7 +1713,7 @@ void gameTableImpl::myCall(){
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(0);
statusBar()->clearMessage();
// statusBar()->clearMessage();
//Spiel läuft weiter
myActionDone();
@@ -1777,7 +1763,7 @@ void gameTableImpl::mySet(){
currentHand->getBoard()->collectSets();
refreshPot();
statusBar()->clearMessage();
// statusBar()->clearMessage();
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(0);
@@ -1807,7 +1793,7 @@ void gameTableImpl::myAllIn(){
currentHand->getBoard()->collectSets();
refreshPot();
statusBar()->clearMessage();
// statusBar()->clearMessage();
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(0);
@@ -2284,7 +2270,7 @@ void gameTableImpl::postRiverRunAnimation5() {
for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) {
cashTopLabelArray[(*it_c)->getMyID()]->setText("");
// cashTopLabelArray[(*it_c)->getMyID()]->setText("");
}
}
}
@@ -2294,7 +2280,7 @@ void gameTableImpl::postRiverRunAnimation5() {
for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) {
if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) {
cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:");
// cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:");
}
}
}
@@ -2520,7 +2506,7 @@ void gameTableImpl::nextRoundCleanGui() {
pushButton_break->setText(tr("Stop"));
}
//Clear Statusbarmessage
statusBar()->clearMessage();
// statusBar()->clearMessage();
//fix press mouse button during bankrupt with anti-peek-mode
this->mouseOverFlipCards(FALSE);
@@ -2697,13 +2683,13 @@ void gameTableImpl::changePlayingMode() {
switch (mode) {
case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); }
// case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); }
break;
case 1: { statusBar()->showMessage(tr("Auto mode set: Check or call any."), 5000); }
// case 1: { statusBar()->showMessage(tr("Auto mode set: Check or call any."), 5000); }
break;
case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); }
// case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); }
break;
default: { cout << "changePlayingMode ERROR!!!!" << endl; }
default: { /*cout << "changePlayingMode ERROR!!!!" << endl;*/ }
}
+11 -25
View File
@@ -13,7 +13,7 @@
#include "gametableimpl.h"
// using namespace std;
MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent)
MyCardsPixmapLabel::MyCardsPixmapLabel(QGroupBox* parent)
: QLabel(parent), myW(NULL)
{
@@ -46,7 +46,7 @@ MyCardsPixmapLabel::~MyCardsPixmapLabel()
void MyCardsPixmapLabel::startFadeOut(int speed) {
frameOpacity = 0.0;
frameOpacity = 1.0;
if(speed <= 4) { opacityRaiseInterval = 0.01; }
if(speed > 4 && speed <= 7) { opacityRaiseInterval = 0.02; }
@@ -54,7 +54,7 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
if(speed != 11) {
fadeOutAction = TRUE;
frameOpacity = 0.0;
frameOpacity = 1.0;
fadeOutTimer->start(40);
}
@@ -63,8 +63,8 @@ void MyCardsPixmapLabel::startFadeOut(int speed) {
void MyCardsPixmapLabel::nextFadeOutFrame() {
if (frameOpacity < 0.75) {
frameOpacity += opacityRaiseInterval;
if (frameOpacity > 0.25) {
frameOpacity -= opacityRaiseInterval;
update();
}
else {
@@ -141,35 +141,23 @@ void MyCardsPixmapLabel::setPixmap(const QPixmap &pic, const bool flipsideIs) {
QLabel::setPixmap(pic);
isFlipside = flipsideIs;
}
void MyCardsPixmapLabel::setFrontPixmap ( const QPixmap &pic ) {
void MyCardsPixmapLabel::setHiddenFrontPixmap ( const QPixmap &pic ) {
myHiddenFront = pic.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);;
}
void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
if (!(flipCardsAction1 || flipCardsAction2)) {
if (!(flipCardsAction1 || flipCardsAction2 || fadeOutAction)) {
QLabel::paintEvent(event);
}
if (fadeOutAction) {
if (fadeOutAction && !fastFlipCardsFront) {
QPainter painter(this);
// painter.setPen(QColor(74,131,83));
painter.setBrush(QColor(74,131,83));
// painter.setBrush(palette().color(QPalette::Background));
// painter.setBrush(QColor(0,0,0));
painter.setOpacity(frameOpacity);
// painter.drawRect(this->geometry());
if(objectName().contains("pixmapLabel_cardBoard"))
painter.drawRect(-1,-1,80,115);
else
painter.drawRect(-1,-1,81,112);
painter.drawPixmap(0,0, front);
}
if (flipCardsAction1) {
@@ -193,12 +181,10 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
if (fastFlipCardsFront && !flipCardsAction1 && !flipCardsAction2) {
if(objectName().contains("pixmapLabel_card0")) {
QPainter painter4(this);
painter4.drawPixmap(0,0, myHiddenFront);
if(fadeOutAction) {
painter4.setBrush(QColor(74,131,83));
painter4.setOpacity(0.75);
painter4.drawRect(-1,-1,81,112);
painter4.setOpacity(0.25);
}
painter4.drawPixmap(0,0, myHiddenFront);
}
}
}
+5 -2
View File
@@ -23,7 +23,7 @@ class MyCardsPixmapLabel : public QLabel
{
Q_OBJECT
public:
MyCardsPixmapLabel(QFrame*);
MyCardsPixmapLabel(QGroupBox*);
~MyCardsPixmapLabel();
@@ -48,7 +48,7 @@ signals:
public slots:
void setPixmap ( const QPixmap &, const bool );
void setFrontPixmap ( const QPixmap &);
void setHiddenFrontPixmap ( const QPixmap &);
void nextFadeOutFrame();
void nextFlipCardsFrame();
@@ -60,6 +60,9 @@ public slots:
void mousePressEvent ( QMouseEvent *);
void mouseReleaseEvent ( QMouseEvent *);
void setFront ( const QPixmap& theValue ) { front = theValue; }
private:
gameTableImpl* myW;
+1 -1
View File
@@ -15,7 +15,7 @@
using namespace std;
MyStatusLabel::MyStatusLabel(QFrame* parent)
MyStatusLabel::MyStatusLabel(QGroupBox* parent)
: QLabel(parent) {
mousePress = FALSE;
+1 -1
View File
@@ -23,7 +23,7 @@ class MyStatusLabel : public QLabel
{
Q_OBJECT
public:
MyStatusLabel(QFrame*);
MyStatusLabel(QGroupBox*);
~MyStatusLabel();
+62 -58
View File
@@ -1,7 +1,8 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>manualBlindsOrderDialog</class>
<widget class="QDialog" name="manualBlindsOrderDialog" >
<property name="geometry" >
<widget class="QDialog" name="manualBlindsOrderDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,31 +10,31 @@
<height>362</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Manual Blinds Order</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="horizontalSpacing" >
<layout class="QGridLayout">
<item row="0" column="0">
<layout class="QGridLayout">
<property name="horizontalSpacing">
<number>4</number>
</property>
<item rowspan="2" row="0" column="0" >
<widget class="QListWidget" name="listWidget_blinds" />
<item row="0" column="0" rowspan="2">
<widget class="QListWidget" name="listWidget_blinds"/>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="pushButton_delete" >
<property name="text" >
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_delete">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="1" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>121</height>
@@ -41,80 +42,83 @@
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QSpinBox" name="spinBox_input" >
<property name="prefix" >
<item row="2" column="0">
<widget class="QSpinBox" name="spinBox_input">
<property name="prefix">
<string>$</string>
</property>
<property name="maximum" >
<number>5000</number>
<property name="minimum">
<number>1</number>
</property>
<property name="value" >
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QPushButton" name="pushButton_add" >
<property name="text" >
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_add">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Afterwards:</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>2</number>
</property>
<property name="bottomMargin" >
<property name="bottomMargin">
<number>2</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_alwaysDoubleBlinds" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_alwaysDoubleBlinds">
<property name="text">
<string>Always double blinds</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<item row="1" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QRadioButton" name="radioButton_alwaysRaiseAbout" >
<property name="text" >
<widget class="QRadioButton" name="radioButton_alwaysRaiseAbout">
<property name="text">
<string>Always raise by:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_alwaysRaiseValue" >
<property name="prefix" >
<widget class="QSpinBox" name="spinBox_alwaysRaiseValue">
<property name="prefix">
<string>$</string>
</property>
<property name="maximum" >
<property name="maximum">
<number>5000</number>
</property>
<property name="singleStep" >
<property name="singleStep">
<number>5</number>
</property>
<property name="value" >
<property name="value">
<number>5</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" >
<widget class="QRadioButton" name="radioButton_stayAtLastBlind" >
<property name="text" >
<item row="2" column="0">
<widget class="QRadioButton" name="radioButton_stayAtLastBlind">
<property name="text">
<string>Keep last blind</string>
</property>
</widget>
@@ -122,13 +126,13 @@
</layout>
</widget>
</item>
<item row="2" column="0" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -153,11 +157,11 @@
<receiver>manualBlindsOrderDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>228</x>
<y>394</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -169,11 +173,11 @@
<receiver>manualBlindsOrderDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>270</x>
<y>400</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
@@ -185,11 +189,11 @@
<receiver>spinBox_alwaysRaiseValue</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>109</x>
<y>307</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>173</x>
<y>303</y>
</hint>
+65 -64
View File
@@ -1,98 +1,99 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>newGameDialog</class>
<widget class="QDialog" name="newGameDialog" >
<property name="geometry" >
<widget class="QDialog" name="newGameDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>207</width>
<height>235</height>
<width>225</width>
<height>271</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Start Local Game</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Local Game Settings</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Number of players:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_quantityPlayers</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2" >
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
<property name="minimum" >
<item row="0" column="1" colspan="2">
<widget class="QSpinBox" name="spinBox_quantityPlayers">
<property name="minimum">
<number>2</number>
</property>
<property name="maximum" >
<number>7</number>
<property name="maximum">
<number>10</number>
</property>
<property name="value" >
<number>7</number>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Start Cash:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_startCash</cstring>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="prefix" >
<item row="1" column="1" colspan="2">
<widget class="QSpinBox" name="spinBox_startCash">
<property name="prefix">
<string>$</string>
</property>
<property name="minimum" >
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum" >
<number>5000</number>
<property name="maximum">
<number>1000000</number>
</property>
<property name="singleStep" >
<property name="singleStep">
<number>50</number>
</property>
<property name="value" >
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Blinds</string>
</property>
<layout class="QGridLayout" >
<property name="topMargin" >
<layout class="QGridLayout">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_useSavedBlindsSettings">
<property name="text">
<string>Use saved blinds settings</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="radioButton_changeBlindsSettings" >
<property name="text" >
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_changeBlindsSettings">
<property name="text">
<string>Change blinds settings ...</string>
</property>
</widget>
@@ -100,25 +101,25 @@
</layout>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Game Speed:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBox_gameSpeed</cstring>
</property>
</widget>
</item>
<item row="3" column="2" >
<widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="minimum" >
<item row="3" column="2">
<widget class="QSpinBox" name="spinBox_gameSpeed">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>11</number>
</property>
<property name="value" >
<property name="value">
<number>4</number>
</property>
</widget>
@@ -126,13 +127,13 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -154,11 +155,11 @@
<receiver>newGameDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -170,11 +171,11 @@
<receiver>newGameDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
+1792 -1393
View File
File diff suppressed because it is too large Load Diff
@@ -72,6 +72,9 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
connect( lineEdit_Opponent4Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent5Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent6Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent7Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent8Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent9Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( pushButton_openFlipsidePicture, SIGNAL( clicked() ), this, SLOT( setFlipsidePicFileName()) );
connect( pushButton_openLogDir, SIGNAL( clicked() ), this, SLOT( setLogDir()) );
connect( pushButton_HumanPlayerAvatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile0()) );
@@ -81,7 +84,9 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
connect( pushButton_Opponent4Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile4()) );
connect( pushButton_Opponent5Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) );
connect( pushButton_Opponent6Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) );
connect( pushButton_Opponent7Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile7()) );
connect( pushButton_Opponent8Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile8()) );
connect( pushButton_Opponent9Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile9()) );
connect( pushButton_editManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callManualBlindsOrderDialog()) );
connect( pushButton_netEditManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callNetManualBlindsOrderDialog()) );
@@ -91,25 +96,17 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
// connect( spinBox_firstSmallBlind, SIGNAL( valueChanged(int) ), this, SLOT ( checkProperFirstSmallBlind(int)));
connect( radioButton_netManualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() ));
connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() )); //temporarely unused until ai is enabled in network
connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() ));
connect( comboBox_switchLanguage, SIGNAL( currentIndexChanged (int) ), this, SLOT ( setLanguageChanged(int) ));
connect(groupBox_automaticServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxAutomaticServerConfig(bool)));
connect(groupBox_manualServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxManualServerConfig(bool)));
// label_36->hide();
// spinBox_netGameSpeed->hide();
//
}
void settingsDialogImpl::exec() {
// stackedWidget->removeWidget(page_4);
// listWidget->takeItem(2);
// page_4->hide();
playerNickIsChanged = FALSE;
//Player Nicks
@@ -127,6 +124,12 @@ void settingsDialogImpl::exec() {
pushButton_Opponent5Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent5Avatar").c_str()));
lineEdit_Opponent6Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent6Name").c_str()));
pushButton_Opponent6Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent6Avatar").c_str()));
lineEdit_Opponent7Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent7Name").c_str()));
pushButton_Opponent7Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent7Avatar").c_str()));
lineEdit_Opponent8Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent8Name").c_str()));
pushButton_Opponent8Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent8Avatar").c_str()));
lineEdit_Opponent9Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent9Name").c_str()));
pushButton_Opponent9Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent9Avatar").c_str()));
//refresh AvatarIcons
pushButton_HumanPlayerAvatar->setIcon(QIcon(pushButton_HumanPlayerAvatar->getMyLink()));
@@ -136,6 +139,9 @@ void settingsDialogImpl::exec() {
pushButton_Opponent4Avatar->setIcon(QIcon(pushButton_Opponent4Avatar->getMyLink()));
pushButton_Opponent5Avatar->setIcon(QIcon(pushButton_Opponent5Avatar->getMyLink()));
pushButton_Opponent6Avatar->setIcon(QIcon(pushButton_Opponent6Avatar->getMyLink()));
pushButton_Opponent7Avatar->setIcon(QIcon(pushButton_Opponent7Avatar->getMyLink()));
pushButton_Opponent8Avatar->setIcon(QIcon(pushButton_Opponent8Avatar->getMyLink()));
pushButton_Opponent9Avatar->setIcon(QIcon(pushButton_Opponent9Avatar->getMyLink()));
//Local Game Settings
spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NumberOfPlayers"));
@@ -289,6 +295,15 @@ void settingsDialogImpl::isAccepted() {
myConfig->writeConfigString("Opponent6Name", lineEdit_Opponent6Name->text().toUtf8().constData());
myConfig->writeConfigString("Opponent6Avatar", pushButton_Opponent6Avatar->getMyLink().toUtf8().constData());
myConfig->writeConfigString("Opponent7Name", lineEdit_Opponent7Name->text().toUtf8().constData());
myConfig->writeConfigString("Opponent7Avatar", pushButton_Opponent7Avatar->getMyLink().toUtf8().constData());
myConfig->writeConfigString("Opponent8Name", lineEdit_Opponent8Name->text().toUtf8().constData());
myConfig->writeConfigString("Opponent8Avatar", pushButton_Opponent8Avatar->getMyLink().toUtf8().constData());
myConfig->writeConfigString("Opponent9Name", lineEdit_Opponent9Name->text().toUtf8().constData());
myConfig->writeConfigString("Opponent9Avatar", pushButton_Opponent9Avatar->getMyLink().toUtf8().constData());
// Local Game Settings
myConfig->writeConfigInt("NumberOfPlayers", spinBox_quantityPlayers->value());
myConfig->writeConfigInt("StartCash", spinBox_startCash->value());
@@ -525,6 +540,32 @@ void settingsDialogImpl::setAvatarFile6() {
}
}
void settingsDialogImpl::setAvatarFile7() {
callSelectAvatarDialog();
if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
pushButton_Opponent7Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
pushButton_Opponent7Avatar->setIcon(QIcon(pushButton_Opponent7Avatar->getMyLink()));
}
}
void settingsDialogImpl::setAvatarFile8() {
callSelectAvatarDialog();
if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
pushButton_Opponent8Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
pushButton_Opponent8Avatar->setIcon(QIcon(pushButton_Opponent8Avatar->getMyLink()));
}
}
void settingsDialogImpl::setAvatarFile9() {
callSelectAvatarDialog();
if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
pushButton_Opponent9Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
pushButton_Opponent9Avatar->setIcon(QIcon(pushButton_Opponent9Avatar->getMyLink()));
}
}
void settingsDialogImpl::setLogDir()
{
QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
@@ -60,6 +60,9 @@ public slots:
void setAvatarFile4();
void setAvatarFile5();
void setAvatarFile6();
void setAvatarFile7();
void setAvatarFile8();
void setAvatarFile9();
void callManualBlindsOrderDialog();
void callNetManualBlindsOrderDialog();
@@ -101,7 +104,6 @@ private:
bool languageIsChanged;
int changedLanguageIndex;
};
#endif