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

Statusbar message + bugfixes

Browse Source
This commit is contained in:
doitux
2007-02-10 21:52:05 +00:00
parent c2cd2e15ab
commit d803375e94
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/log.cpp
+20 -7
View File
@@ -142,11 +142,23 @@ void Log::logNewGameHandMsg(int gameID, int handID) {
stream << "<p><b>##### Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" #####</b></br>" << "\n";
stream << "CASH: ";
for(i=0; i<myW->getMaxQuantityPlayers(); 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; i<myW->getActualHand()->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 << "</br>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;
src/gui/qt/mainwindow/mainwindowimpl.cpp
+12 -2
View File
@@ -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; i<maxQuantityPlayers; i++) {
for (i=0; i<actualHand->getActualQuantityPlayers(); 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;