From 8ac5673c00830d82c62e392dbf04d94adcc8b7ee Mon Sep 17 00:00:00 2001 From: doitux Date: Wed, 26 Sep 2007 00:08:45 +0000 Subject: [PATCH] adds activePlayerList and runningPlayerList (XII) - BUGGY!!! - last sable rev866 --- src/engine/local_engine/localberopreflop.cpp | 6 +++--- src/gui/qt/mainwindow/mainwindowimpl.cpp | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/engine/local_engine/localberopreflop.cpp b/src/engine/local_engine/localberopreflop.cpp index bbfcf32e..ef754e0b 100644 --- a/src/engine/local_engine/localberopreflop.cpp +++ b/src/engine/local_engine/localberopreflop.cpp @@ -146,7 +146,7 @@ void LocalBeRoPreflop::run() { // determine next player - cout << "playerID begin preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; +// cout << "playerID begin preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; it = getCurrentPlayersTurnIt(); @@ -156,9 +156,9 @@ void LocalBeRoPreflop::run() { if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) setCurrentPlayersTurnIt(getMyHand()->getRunningPlayerList()->begin()); - if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) cout << "!!!" << endl; +// if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) cout << "!!!" << endl; - cout << "playerID middle preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; +// cout << "playerID middle preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; // exceptions // if next player is small blind and only all-in-big-blind with less than smallblind amount is nonfold too -> preflop is over diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 51ab863e..34657e19 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -2083,7 +2083,7 @@ void mainWindowImpl::postRiverRunAnimation3() { actionLabelArray[i]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/action_winner.png")); //show winnercards if more than one player is active - if ( currentHand->getActivePlayerList()->size() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) { + if ( currentHand->getRunningPlayerList()->size() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) { int j; int bestHandPos[5]; @@ -2407,10 +2407,7 @@ void mainWindowImpl::nextRoundCleanGui() { //Clean breakbutton blinkingStartButtonAnimationTimer->stop(); - QPalette tempPalette = pushButton_break->palette(); - tempPalette.setColor(QPalette::Button, QColor(40,82,0)); - tempPalette.setColor(QPalette::ButtonText, QColor(240,240,240)); - pushButton_break->setPalette(tempPalette); + pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}"); blinkingStartButtonAnimationTimer->stop(); QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); @@ -2484,11 +2481,7 @@ void mainWindowImpl::breakButtonClicked() { else { blinkingStartButtonAnimationTimer->stop(); //Set default Color - QPalette tempPalette = pushButton_break->palette(); - tempPalette.setColor(QPalette::Button, QColor(40,82,0)); - tempPalette.setColor(QPalette::ButtonText, QColor(240,240,240)); - pushButton_break->setPalette(tempPalette); - + pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}"); QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); pushButton_break->setMinimumSize(width+10,20);