diff --git a/src/gui/qt/log.cpp b/src/gui/qt/log.cpp index ac5259a7..1c980258 100644 --- a/src/gui/qt/log.cpp +++ b/src/gui/qt/log.cpp @@ -142,11 +142,23 @@ void Log::logNewGameHandMsg(int gameID, int handID) { stream << "

##### Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" #####
" << "\n"; stream << "CASH: "; - for(i=0; igetMaxQuantityPlayers(); i++) { - switch (myW->getActualHand()->getPlayerArray()[i]->getMyButton()) { - case 1 : stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Dealer): "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$, "; - break; - default : stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+": "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$, "; + for(i=0; igetActualHand()->getActualQuantityPlayers(); i++) { + + if(myW->getActualHand()->getPlayerArray()[i]->getMyButton() == 1) { + if(i == myW->getActualHand()->getActualQuantityPlayers()-1) { + stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Dealer): "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$"; + } + else { + stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Dealer): "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$, "; + } + } + else { + if(i == myW->getActualHand()->getActualQuantityPlayers()-1) { + stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+": "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$"; + } + else { + stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+": "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$, "; + } } } stream << "
BLINDS: "; @@ -160,8 +172,9 @@ void Log::logNewGameHandMsg(int gameID, int handID) { } if(activePlayersCounter < 3) { j=1; } - cout << activePlayersCounter << endl; - cout << (i+myW->getActualHand()->getDealerPosition()+j)%5 << endl; +// cout << activePlayersCounter << endl; +// cout << (i+myW->getActualHand()->getDealerPosition()+j)%5 << endl; + switch (myW->getActualHand()->getPlayerArray()[(i+myW->getActualHand()->getDealerPosition()+j)%5]->getMyButton()) { case 2 : stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[(i+myW->getActualHand()->getDealerPosition()+j)%5]->getMyName())+" ("+QString::number(myW->getActualHand()->getPlayerArray()[(i+myW->getActualHand()->getDealerPosition()+j)%5]->getMySet(),10)+"$), "; break; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 51664e3c..e956053f 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -389,6 +389,9 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) // QShortcut *startNewGameKeys = new QShortcut(QKeySequence(Qt::Key_Control + Qt::Key_N), this); // connect( startNewGameKeys, SIGNAL(activated() ), actionNewGame, SLOT( trigger() ) ); + //Statusbar + statusBar()->showMessage(tr("Ctrl+N to start a new Game")); + //Connects connect(dealFlopCards0Timer, SIGNAL(timeout()), this, SLOT( dealFlopCards1() )); connect(dealFlopCards1Timer, SIGNAL(timeout()), this, SLOT( dealFlopCards2() )); @@ -602,7 +605,7 @@ void mainWindowImpl::refreshButton() { QPixmap onePix(":/graphics/graphics/1px.png"); int i; - for (i=0; igetActualQuantityPlayers(); i++) { if (actualHand->getPlayerArray()[i]->getMyButton()==1) { buttonLabelArray[i]->setPixmap(dealerButton); } @@ -1686,7 +1689,14 @@ void mainWindowImpl::nextRoundCleanGui() { //Wenn Pause zwischen den Hands in der Konfiguration steht den Stop Button drücken! if (myConfig->readConfigInt("PauseBetweenHands")) { pushButton_break->click(); } + else { + //FIX STRG+N Bug + pushButton_break->setEnabled(TRUE); + breakAfterActualHand=FALSE; + } + //Clear Statusbarmessage + statusBar()->clearMessage(); } void mainWindowImpl::stopTimer() { @@ -1787,7 +1797,7 @@ void mainWindowImpl::paintStartSplash() { void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) { - cout << event->key() << endl; +// cout << event->key() << endl; bool ctrlPressed = FALSE;