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

New Settings (permanent Breakbutton, ShowFadeOut) added

Browse Source
This commit is contained in:
doitux
2007-01-28 14:48:18 +00:00
parent 20b99f758d
commit 7166a77d48
11 changed files with 2664 additions and 2552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+7 -1
View File
@@ -31,7 +31,7 @@ using namespace std;
ConfigFile::ConfigFile()
{
// !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 1;
configRev = 2;
// Pfad und Dateinamen setzen
#ifdef _WIN32
@@ -101,6 +101,9 @@ void ConfigFile::createDefaultConfig() {
TiXmlElement * confElement4 = new TiXmlElement( "GameSpeed" );
config->LinkEndChild( confElement4 );
confElement4->SetAttribute("value", 4);
TiXmlElement * confElement14 = new TiXmlElement( "PauseBetweenHands" );
config->LinkEndChild( confElement14 );
confElement14->SetAttribute("value", 0);
TiXmlElement * confElement5 = new TiXmlElement( "ShowGameSettingsDialogOnNewGame" );
config->LinkEndChild( confElement5 );
confElement5->SetAttribute("value", 1);
@@ -125,6 +128,9 @@ void ConfigFile::createDefaultConfig() {
TiXmlElement * confElement13 = new TiXmlElement( "ShowIntro" );
config->LinkEndChild( confElement13 );
confElement13->SetAttribute("value", 1);
TiXmlElement * confElement15 = new TiXmlElement( "ShowFadeOutCardsAnimation" );
config->LinkEndChild( confElement15 );
confElement15->SetAttribute("value", 1);
doc.SaveFile( configFileName );
src/engine/handinterface.h
+3
View File
@@ -62,6 +62,9 @@ public:
virtual void setStartCash(const int& theValue) =0;
virtual int getStartCash() const =0;
virtual void setActivePlayersCounter(const int& theValue) =0;
virtual int getActivePlayersCounter() const =0;
virtual void assignButtons() =0;
virtual void highlightRoundLabel() =0;
src/engine/local_engine/localhand.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ void LocalHand::switchRounds() {
// cout << "switchrounds" << endl;
//Aktive Spieler z�len --> wenn nur noch einer nicht-folded dann gleich den Pot verteilen
int activePlayersCounter = 0;
activePlayersCounter = 0;
for (i=0; i<myGui->getMaxQuantityPlayers(); i++) {
if (playerArray[i]->getMyAction() != 1 && playerArray[i]->getMyActiveStatus() == 1) activePlayersCounter++;
}
src/engine/local_engine/localhand.h
+8 -1
View File
@@ -72,11 +72,17 @@ public:
void setStartCash(const int& theValue) { startCash = theValue; }
int getStartCash() const { return startCash; }
void setActivePlayersCounter(const int& theValue) { activePlayersCounter = theValue; }
int getActivePlayersCounter() const { return activePlayersCounter; }
void assignButtons();
void highlightRoundLabel();
void switchRounds();
@@ -99,7 +105,8 @@ private:
int actualRound; //0 = preflop, 1 = flop, 2 = turn, 3 = river
int smallBlind;
int startCash;
int activePlayersCounter;
bool allInCondition;
};
src/gui/qt/cards/mycardspixmaplabel.cpp
+14 -6
View File
@@ -18,6 +18,7 @@ MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent)
{
fadeOutAction = FALSE;
frameOpacity = 0.0;
opacityRaiseIntervall = 0.01;
timer = new QTimer;
connect(timer, SIGNAL(timeout()), this, SLOT(nextFadeOutFrame()));
@@ -29,18 +30,25 @@ MyCardsPixmapLabel::~MyCardsPixmapLabel()
{
}
void MyCardsPixmapLabel::startFadeOut() {
fadeOutAction = TRUE;
frameOpacity = 0.0;
timer->start(40);
void MyCardsPixmapLabel::startFadeOut(int speed) {
if(speed <= 4) { opacityRaiseIntervall = 0.01; }
if(speed > 4 && speed <= 7) { opacityRaiseIntervall = 0.02; }
if(speed > 7 && speed <= 10) { opacityRaiseIntervall = 0.04; }
if(speed != 11) {
fadeOutAction = TRUE;
frameOpacity = 0.0;
timer->start(40);
}
}
void MyCardsPixmapLabel::nextFadeOutFrame() {
if (frameOpacity < 0.7) {
frameOpacity += 0.01;
if (frameOpacity < 0.65) {
frameOpacity += opacityRaiseIntervall;
update();
}
else {
src/gui/qt/cards/mycardspixmaplabel.h
+2 -1
View File
@@ -26,10 +26,11 @@ public:
~MyCardsPixmapLabel();
qreal frameOpacity;
qreal opacityRaiseIntervall;
QTimer *timer;
bool fadeOutAction;
void startFadeOut();
void startFadeOut(int);
void paintEvent(QPaintEvent * event);
public slots:
src/gui/qt/mainwindow.ui
+2135 -2074
View File
File diff suppressed because it is too large Load Diff
src/gui/qt/mainwindowimpl.cpp
+78 -72
View File
@@ -71,31 +71,31 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0"));
pixmapLabel_cardBoard0->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard0->setMaximumSize(QSize(57, 80));
gridLayout2->addWidget(pixmapLabel_cardBoard0, 0, 0, 1, 1);
gridLayout11->addWidget(pixmapLabel_cardBoard0, 0, 0, 1, 1);
MyCardsPixmapLabel *pixmapLabel_cardBoard1 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard1->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard1"));
pixmapLabel_cardBoard1->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard1->setMaximumSize(QSize(57, 80));
gridLayout2->addWidget(pixmapLabel_cardBoard1, 0, 1, 1, 1);
gridLayout11->addWidget(pixmapLabel_cardBoard1, 0, 1, 1, 1);
MyCardsPixmapLabel *pixmapLabel_cardBoard2 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard2->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard2"));
pixmapLabel_cardBoard2->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard2->setMaximumSize(QSize(57, 80));
gridLayout2->addWidget(pixmapLabel_cardBoard2, 0, 2, 1, 1);
gridLayout11->addWidget(pixmapLabel_cardBoard2, 0, 2, 1, 1);
MyCardsPixmapLabel *pixmapLabel_cardBoard3 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard3->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard3"));
pixmapLabel_cardBoard3->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard3->setMaximumSize(QSize(57, 80));
gridLayout2->addWidget(pixmapLabel_cardBoard3, 0, 3, 1, 1);
gridLayout11->addWidget(pixmapLabel_cardBoard3, 0, 3, 1, 1);
MyCardsPixmapLabel *pixmapLabel_cardBoard4 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard4->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard4"));
pixmapLabel_cardBoard4->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard4->setMaximumSize(QSize(57, 80));
gridLayout2->addWidget(pixmapLabel_cardBoard4, 0, 4, 1, 1);
gridLayout11->addWidget(pixmapLabel_cardBoard4, 0, 4, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card0a = new MyCardsPixmapLabel(frame5);
pixmapLabel_card0a->setObjectName(QString::fromUtf8("pixmapLabel_card0a"));
@@ -107,7 +107,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
pixmapLabel_card0a->setMinimumSize(QSize(80, 112));
pixmapLabel_card0a->setMaximumSize(QSize(80, 112));
pixmapLabel_card0a->setScaledContents(true);
gridLayout35->addWidget(pixmapLabel_card0a, 0, 0, 1, 1);
gridLayout2->addWidget(pixmapLabel_card0a, 0, 0, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card0b = new MyCardsPixmapLabel(frame5);
pixmapLabel_card0b->setObjectName(QString::fromUtf8("pixmapLabel_card0b"));
@@ -119,55 +119,55 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
pixmapLabel_card0b->setMinimumSize(QSize(80, 112));
pixmapLabel_card0b->setMaximumSize(QSize(80, 112));
pixmapLabel_card0b->setScaledContents(true);
gridLayout35->addWidget(pixmapLabel_card0b, 0, 1, 1, 1);
gridLayout2->addWidget(pixmapLabel_card0b, 0, 1, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card1a = new MyCardsPixmapLabel(frame8_2_2_2_5);
pixmapLabel_card1a->setObjectName(QString::fromUtf8("pixmapLabel_card1a"));
pixmapLabel_card1a->setMinimumSize(QSize(57, 80));
pixmapLabel_card1a->setMaximumSize(QSize(57, 80));
gridLayout9->addWidget(pixmapLabel_card1a, 0, 0, 1, 1);
gridLayout18->addWidget(pixmapLabel_card1a, 0, 0, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card1b = new MyCardsPixmapLabel(frame8_2_2_2_5);
pixmapLabel_card1b->setObjectName(QString::fromUtf8("pixmapLabel_card1b"));
pixmapLabel_card1b->setMinimumSize(QSize(57, 80));
pixmapLabel_card1b->setMaximumSize(QSize(57, 80));
gridLayout9->addWidget(pixmapLabel_card1b, 0, 1, 1, 1);
gridLayout18->addWidget(pixmapLabel_card1b, 0, 1, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card2a = new MyCardsPixmapLabel(frame8_2_2_2_4);
pixmapLabel_card2a->setObjectName(QString::fromUtf8("pixmapLabel_card2a"));
pixmapLabel_card2a->setMinimumSize(QSize(57, 80));
pixmapLabel_card2a->setMaximumSize(QSize(57, 80));
gridLayout15->addWidget(pixmapLabel_card2a, 0, 0, 1, 1);
gridLayout24->addWidget(pixmapLabel_card2a, 0, 0, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card2b = new MyCardsPixmapLabel(frame8_2_2_2_4);
pixmapLabel_card2b->setObjectName(QString::fromUtf8("pixmapLabel_card2b"));
pixmapLabel_card2b->setMinimumSize(QSize(57, 80));
pixmapLabel_card2b->setMaximumSize(QSize(57, 80));
gridLayout15->addWidget(pixmapLabel_card2b, 0, 1, 1, 1);
gridLayout24->addWidget(pixmapLabel_card2b, 0, 1, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card3a = new MyCardsPixmapLabel(frame8_2_2_2_6);
pixmapLabel_card3a->setObjectName(QString::fromUtf8("pixmapLabel_card3a"));
pixmapLabel_card3a->setMinimumSize(QSize(57, 80));
pixmapLabel_card3a->setMaximumSize(QSize(57, 80));
gridLayout21->addWidget(pixmapLabel_card3a, 0, 0, 1, 1);
gridLayout30->addWidget(pixmapLabel_card3a, 0, 0, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card3b = new MyCardsPixmapLabel(frame8_2_2_2_6);
pixmapLabel_card3b->setObjectName(QString::fromUtf8("pixmapLabel_card3b"));
pixmapLabel_card3b->setMinimumSize(QSize(57, 80));
pixmapLabel_card3b->setMaximumSize(QSize(57, 80));
gridLayout21->addWidget(pixmapLabel_card3b, 0, 1, 1, 1);
gridLayout30->addWidget(pixmapLabel_card3b, 0, 1, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card4a = new MyCardsPixmapLabel(frame8_2_2_2_7);
pixmapLabel_card4a->setObjectName(QString::fromUtf8("pixmapLabel_card4a"));
pixmapLabel_card4a->setMinimumSize(QSize(57, 80));
pixmapLabel_card4a->setMaximumSize(QSize(57, 80));
gridLayout27->addWidget(pixmapLabel_card4a, 0, 0, 1, 1);
gridLayout36->addWidget(pixmapLabel_card4a, 0, 0, 1, 1);
MyCardsPixmapLabel *pixmapLabel_card4b = new MyCardsPixmapLabel(frame8_2_2_2_7);
pixmapLabel_card4b->setObjectName(QString::fromUtf8("pixmapLabel_card4b"));
pixmapLabel_card4b->setMinimumSize(QSize(57, 80));
pixmapLabel_card4b->setMaximumSize(QSize(57, 80));
gridLayout27->addWidget(pixmapLabel_card4b, 0, 1, 1, 1);
gridLayout36->addWidget(pixmapLabel_card4b, 0, 1, 1, 1);
int i;
@@ -490,11 +490,21 @@ void mainWindowImpl::callSettingsDialog() {
//Toolbox verstecken?
if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); }
else { groupBox_tools->show(); }
//Falls Spielernamen geändert wurden --> neu zeichnen --> erst beim nächsten Neustart neu ausgelesen
if (v->getPlayerNickIsChanged()) {
cout << "wurst" << endl;
actualHand->getPlayerArray()[1]->setMyName(v->lineEdit_Opponent1Name->text().toStdString());
actualHand->getPlayerArray()[2]->setMyName(v->lineEdit_Opponent2Name->text().toStdString());
actualHand->getPlayerArray()[3]->setMyName(v->lineEdit_Opponent3Name->text().toStdString());
actualHand->getPlayerArray()[4]->setMyName(v->lineEdit_Opponent4Name->text().toStdString());
v->setPlayerNickIsChanged(FALSE);
refreshPlayerName();
}
}
}
void mainWindowImpl::setGame(Game *g) { actualGame = g; }
void mainWindowImpl::setHand(HandInterface* br) { actualHand = br; }
@@ -647,7 +657,6 @@ void mainWindowImpl::highlightRoundLabel(string tempround) {
}
void mainWindowImpl::refreshAll() {
refreshSet();
@@ -674,7 +683,6 @@ void mainWindowImpl::refreshPot() {
}
void mainWindowImpl::dealHoleCards() {
QPixmap flipside(":/othercards/cards/othercards/flipside.png");
@@ -799,7 +807,6 @@ void mainWindowImpl::dealFlopCards6() {
}
void mainWindowImpl::dealTurnCards0() { dealTurnCards0Timer->start(dealCardsSpeed*2); }
void mainWindowImpl::dealTurnCards1() {
@@ -827,7 +834,6 @@ void mainWindowImpl::dealTurnCards2() {
else { dealTurnCards2Timer->start(dealCardsSpeed); }
}
void mainWindowImpl::dealRiverCards0() { dealRiverCards0Timer->start(dealCardsSpeed*2); }
void mainWindowImpl::dealRiverCards1() {
@@ -983,6 +989,7 @@ void mainWindowImpl::myCheck() {
//Spiel läuft weiter
nextPlayerAnimation();
}
void mainWindowImpl::myCall(){
int tempHighestSet = 0;
@@ -1266,53 +1273,54 @@ void mainWindowImpl::postRiverRunAnimation3() {
actionLabelArray[i]->setText("<p align='center'><b>- Winner -</b></p>");
//nicht gewonnene Karten ausblenden
int j;
if ( actualHand->getActivePlayersCounter() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation", 1)) {
//index 0 testen
bool index0 = TRUE;
for(j=0; j<=4; j++) {
// cout << (actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] << endl;
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 0 ) { index0 = FALSE; }
}
if (index0) { holeCardsArray[i][0]->startFadeOut(); /*cout << "Fade Out index0" << endl;*/}
//index 1 testen
bool index1 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 1 ) { index1 = FALSE; }
}
if (index1) { holeCardsArray[i][1]->startFadeOut(); /*cout << "Fade Out index1" << endl;*/}
//index 2 testen
bool index2 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 2 ) { index2 = FALSE; }
}
if (index2) { boardCardsArray[0]->startFadeOut(); /*cout << "Fade Out index2" << endl;*/}
//index 3 testen
bool index3 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 3 ) { index3 = FALSE; }
}
if (index3) { boardCardsArray[1]->startFadeOut(); /*cout << "Fade Out index3" << endl;*/}
//index 4 testen
bool index4 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 4 ) { index4 = FALSE; }
}
if (index4) { boardCardsArray[2]->startFadeOut(); /*cout << "Fade Out index4" << endl;*/}
//index 5 testen
bool index5 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 5 ) { index5 = FALSE; }
}
if (index5) { boardCardsArray[3]->startFadeOut(); /*cout << "Fade Out index5" << endl;*/}
//index 6 testen
bool index6 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 6 ) { index6 = FALSE; }
}
if (index6) { boardCardsArray[4]->startFadeOut(); /*cout << "Fade Out index6" << endl;*/}
int j;
//index 0 testen --> Karte darf nicht im MyBestHand Position Array drin sein, es darf nicht nur ein Spieler Aktiv sein, die Config fordert die Animation
bool index0 = TRUE;
for(j=0; j<=4; j++) {
// cout << (actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] << endl;
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 0 ) { index0 = FALSE; }
}
if (index0) { holeCardsArray[i][0]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index0" << endl;*/}
//index 1 testen
bool index1 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 1 ) { index1 = FALSE; }
}
if (index1) { holeCardsArray[i][1]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index1" << endl;*/}
//index 2 testen
bool index2 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 2 ) { index2 = FALSE; }
}
if (index2) { boardCardsArray[0]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index2" << endl;*/}
//index 3 testen
bool index3 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 3 ) { index3 = FALSE; }
}
if (index3) { boardCardsArray[1]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index3" << endl;*/}
//index 4 testen
bool index4 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 4 ) { index4 = FALSE; }
}
if (index4) { boardCardsArray[2]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index4" << endl;*/}
//index 5 testen
bool index5 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 5 ) { index5 = FALSE; }
}
if (index5) { boardCardsArray[3]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index5" << endl;*/}
//index 6 testen
bool index6 = TRUE;
for(j=0; j<=4; j++) {
if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 6 ) { index6 = FALSE; }
}
if (index6) { boardCardsArray[4]->startFadeOut(guiGameSpeed); /*cout << "Fade Out index6" << endl;*/}
}
}
}
@@ -1404,7 +1412,6 @@ void mainWindowImpl::postRiverRunAnimation6() {
postRiverRunAnimation6Timer->start(newRoundSpeed);
}
void mainWindowImpl::startNewHand() {
if( !breakAfterActualHand){ actualGame->startHand();
@@ -1420,7 +1427,6 @@ else {
void mainWindowImpl::handSwitchRounds() { actualHand->switchRounds(); }
void mainWindowImpl::nextRoundCleanGui() {
int i;
@@ -1454,6 +1460,9 @@ void mainWindowImpl::nextRoundCleanGui() {
refreshAll();
//Wenn Pause zwischen den Hands in der Konfiguration steht den Stop Button drücken!
if (myConfig->readConfigInt("PauseBetweenHands", 0)) { pushButton_break->click(); }
}
void mainWindowImpl::stopTimer() {
@@ -1492,7 +1501,6 @@ void mainWindowImpl::stopTimer() {
}
void mainWindowImpl::userWidgetsBackgroudColor() {
@@ -1515,7 +1523,6 @@ void mainWindowImpl::userWidgetsBackgroudColor() {
}
}
void mainWindowImpl::setSpeeds() {
gameSpeed = (11-guiGameSpeed)*10;
@@ -1551,7 +1558,6 @@ void mainWindowImpl::paintStartSplash() {
mySplash->show();
}
void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
// cout << event->key() << endl;
src/gui/qt/settingsdialog.ui
+393 -395
View File
@@ -5,422 +5,420 @@
<rect>
<x>0</x>
<y>0</y>
<width>487</width>
<height>339</height>
<width>528</width>
<height>343</height>
</rect>
</property>
<property name="windowTitle" >
<string>PokerTH - Settings</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="geometry" >
<rect>
<x>9</x>
<y>302</y>
<width>469</width>
<height>28</height>
</rect>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<property name="spacing" >
<number>6</number>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QListWidget" name="listWidget" >
<property name="geometry" >
<rect>
<x>9</x>
<y>9</y>
<width>150</width>
<height>278</height>
</rect>
</property>
<property name="maximumSize" >
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text" >
<string>Game Settings</string>
</property>
</item>
<item>
<property name="text" >
<string>Interface</string>
</property>
</item>
<item>
<property name="text" >
<string>Player Nicks</string>
</property>
</item>
<item>
<property name="text" >
<string>Log Messages</string>
</property>
</item>
</widget>
<widget class="Line" name="line" >
<property name="geometry" >
<rect>
<x>9</x>
<y>293</y>
<width>469</width>
<height>16</height>
</rect>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QStackedWidget" name="stackedWidget" >
<property name="geometry" >
<rect>
<x>170</x>
<y>20</y>
<width>313</width>
<height>275</height>
</rect>
</property>
<property name="currentIndex" >
<number>0</number>
</property>
<widget class="QWidget" name="page" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
<item row="0" column="1" >
<widget class="QStackedWidget" name="stackedWidget" >
<property name="currentIndex" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="5" column="1" >
<widget class="QSpinBox" name="spinBox_handsBeforeRaiseSmallBlind" >
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<widget class="QWidget" name="page" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
</widget>
</item>
<item row="6" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Game-Speed</string>
<property name="spacing" >
<number>6</number>
</property>
</widget>
</item>
<item row="6" column="1" >
<widget class="QSpinBox" name="spinBox_gameSpeed" >
<property name="maximum" >
<number>11</number>
<item row="8" 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="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="1" column="0" colspan="3" >
<widget class="Line" name="line_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Small Blind</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_5" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Game Settings</string>
</property>
</widget>
</item>
<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="6" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Game-Speed</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="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="3" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Start Cash</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="5" column="1" >
<widget class="QSpinBox" name="spinBox_handsBeforeRaiseSmallBlind" >
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>9</number>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QSpinBox" name="spinBox_smallBlind" >
<property name="maximum" >
<number>500</number>
</property>
<property name="minimum" >
<number>5</number>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="maximum" >
<number>5000</number>
</property>
<property name="minimum" >
<number>1000</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>
</layout>
</widget>
<widget class="QWidget" name="page_2" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="minimum" >
<number>1</number>
<property name="spacing" >
<number>6</number>
</property>
<property name="singleStep" >
<number>1</number>
<item row="5" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0" >
<widget class="QCheckBox" name="checkBox_showFadeOutCardsAnimation" >
<property name="text" >
<string>Show Fade-Out Animation for Non-Winning Cards</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QCheckBox" name="checkBox_showToolbox" >
<property name="text" >
<string>Show Toolbox (F2 to switch on/off)</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="checkBox_showIntro" >
<property name="text" >
<string>Show Intro on Startup</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_5" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_13" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Interface</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_4" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</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 name="spacing" >
<number>6</number>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
<property name="maximum" >
<number>5</number>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_7" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Player Nicks</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>295</width>
<height>51</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Human Player:</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_10" >
<property name="text" >
<string>Opponent 2:</string>
</property>
</widget>
</item>
<item row="6" column="0" >
<widget class="QLabel" name="label_12" >
<property name="text" >
<string>Opponent 4:</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_11" >
<property name="text" >
<string>Opponent 3:</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Opponent 1:</string>
</property>
</widget>
</item>
<item row="6" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent4Name" />
</item>
<item row="5" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent3Name" />
</item>
<item row="4" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent2Name" />
</item>
<item row="3" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent1Name" />
</item>
<item row="2" column="1" >
<widget class="QLineEdit" name="lineEdit_humanPlayerName" />
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line_4" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="minimum" >
<number>2</number>
<property name="spacing" >
<number>6</number>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QSpinBox" name="spinBox_startCash" >
<property name="maximum" >
<number>5000</number>
</property>
<property name="minimum" >
<number>1000</number>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_5" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Game Settings</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Number of Players</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Small Blind</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Start Cash</string>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QSpinBox" name="spinBox_smallBlind" >
<property name="maximum" >
<number>500</number>
</property>
<property name="minimum" >
<number>5</number>
</property>
</widget>
</item>
<item row="8" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="7" 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="1" column="0" colspan="2" >
<widget class="Line" name="line_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
<item row="2" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_6" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Log Messages</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="0" column="0" >
<widget class="QListWidget" name="listWidget" >
<property name="maximumSize" >
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<property name="spacing" >
<number>6</number>
<item>
<property name="text" >
<string>Game Settings</string>
</property>
</item>
<item>
<property name="text" >
<string>Interface</string>
</property>
</item>
<item>
<property name="text" >
<string>Player Nicks</string>
</property>
</item>
<item>
<property name="text" >
<string>Log Messages</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<item row="1" column="0" >
<widget class="Line" name="line_5" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="checkBox_showToolbox" >
<property name="text" >
<string>Show Toolbox (F2 to switch on/off)</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_13" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Interface</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QCheckBox" name="checkBox_showIntro" >
<property name="text" >
<string>Show Intro on Startup</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_4" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="spacing" >
<number>6</number>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_7" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Player Nicks</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>295</width>
<height>51</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Human Player:</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_10" >
<property name="text" >
<string>Opponent 2:</string>
</property>
</widget>
</item>
<item row="6" column="0" >
<widget class="QLabel" name="label_12" >
<property name="text" >
<string>Opponent 4:</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_11" >
<property name="text" >
<string>Opponent 3:</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Opponent 1:</string>
</property>
</widget>
</item>
<item row="6" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent4Name" />
</item>
<item row="5" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent3Name" />
</item>
<item row="4" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent2Name" />
</item>
<item row="3" column="1" >
<widget class="QLineEdit" name="lineEdit_Opponent1Name" />
</item>
<item row="2" column="1" >
<widget class="QLineEdit" name="lineEdit_humanPlayerName" />
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line_4" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_6" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Log Messages</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
<tabstops>
<tabstop>listWidget</tabstop>
src/gui/qt/settingsdialogimpl.cpp
+12 -1
View File
@@ -28,6 +28,8 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, const char *name)
setupUi(this);
playerNickIsChanged = FALSE;
//Formulare Füllen
ConfigFile myConfig;
@@ -44,13 +46,20 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, const char *name)
spinBox_smallBlind->setValue(myConfig.readConfigInt("SmallBlind", 10));
spinBox_handsBeforeRaiseSmallBlind->setValue(myConfig.readConfigInt("HandsBeforeRaiseSmallBlind", 9));
spinBox_gameSpeed->setValue(myConfig.readConfigInt("GameSpeed", 4));
checkBox_pauseBetweenHands->setChecked(myConfig.readConfigInt("PauseBetweenHands", 0));
checkBox_showGameSettingsDialogOnNewGame->setChecked(myConfig.readConfigInt("ShowGameSettingsDialogOnNewGame", 1));
//Interface
checkBox_showToolbox->setChecked(myConfig.readConfigInt("ShowToolBox", 1));
checkBox_showIntro->setChecked(myConfig.readConfigInt("ShowIntro", 1));
checkBox_showFadeOutCardsAnimation->setChecked(myConfig.readConfigInt("ShowFadeOutCardsAnimation", 1));
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) );
connect( lineEdit_humanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent3Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent4Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
}
@@ -73,10 +82,12 @@ void settingsDialogImpl::isAccepted() {
myConfig.writeConfigInt("SmallBlind", spinBox_smallBlind->value());
myConfig.writeConfigInt("HandsBeforeRaiseSmallBlind", spinBox_handsBeforeRaiseSmallBlind->value());
myConfig.writeConfigInt("GameSpeed", spinBox_gameSpeed->value());
myConfig.writeConfigInt("PauseBetweenHands", checkBox_pauseBetweenHands->isChecked());
myConfig.writeConfigInt("ShowGameSettingsDialogOnNewGame", checkBox_showGameSettingsDialogOnNewGame->isChecked());
// Interface
myConfig.writeConfigInt("ShowToolBox", checkBox_showToolbox->isChecked());
myConfig.writeConfigInt("ShowIntro", checkBox_showIntro->isChecked());
myConfig.writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked());
}
src/gui/qt/settingsdialogimpl.h
+11
View File
@@ -22,15 +22,26 @@
#include "ui_settingsdialog.h"
class QLineEdit;
class settingsDialogImpl: public QDialog, public Ui::settingsDialog {
Q_OBJECT
public:
settingsDialogImpl(QWidget *parent = 0, const char *name = 0);
void setPlayerNickIsChanged(bool theValue) { playerNickIsChanged = theValue; }
bool getPlayerNickIsChanged() const { return playerNickIsChanged; }
public slots:
void isAccepted();
void playerNickChanged() { setPlayerNickIsChanged(TRUE); };
private:
bool playerNickIsChanged;
};
#endif