From 8114a710e7fac6c0ff03ec1210cf50fa8a9a2d81 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 9 Feb 2007 22:56:03 +0000 Subject: [PATCH] logfiles work on windows now --- src/gui/qt/log.cpp | 23 ++++++++++++++--------- src/gui/qt/mainwindow/mainwindowimpl.cpp | 5 +++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/gui/qt/log.cpp b/src/gui/qt/log.cpp index e14adb9c..6db16ec3 100644 --- a/src/gui/qt/log.cpp +++ b/src/gui/qt/log.cpp @@ -31,15 +31,17 @@ Log::Log(mainWindowImpl* w) : myW(w) if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromStdString(myConfig->readConfigString("LogDir"))).exists()) { #ifdef _WIN32 - myLogDir = new QDir(QString::fromStdString(myConfig->readConfigString("LogDir")).replace("\\","/")); + myLogDir = new QDir(QString::fromStdString(myConfig->readConfigString("LogDir"))); #else myLogDir = new QDir(QString::fromStdString(myConfig->readConfigString("LogDir"))); #endif - myLogFile = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh:mm:ss")+".html"); + myLogFile = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss")+".html"); //Logo-Pixmap extrahieren QPixmap::QPixmap(":graphics/graphics/logo-140-100.png").save(myLogDir->absolutePath()+"/logo.png"); +// myW->textBrowser_Log->append(myLogFile->fileName()); + myLogFile->open( QIODevice::WriteOnly ); QTextStream stream( myLogFile ); stream << "\n"; @@ -57,8 +59,8 @@ Log::Log(mainWindowImpl* w) : myW(w) int daysUntilWaste = myConfig->readConfigInt("LogStoreDuration"); int i; - QStringList logFileList = myLogDir->entryList(QDir::Files); - logFileList.removeFirst(); + QStringList filters("pokerth-log*"); + QStringList logFileList = myLogDir->entryList(filters, QDir::Files); for(i=0; igetMaxQuantityPlayers(); i++) { - if(myW->getActualHand()->getPlayerArray()[i]->getMyButton() == 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())+": "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$, "; + 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; + case 2 : stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Small Blind): "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$, "; + break; + case 3 : stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Big Blind): "+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)+"$, "; } } stream << "

\n"; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index cb7e8af1..51664e3c 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -77,8 +77,13 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) setupUi(this); //Schriftgrößen festlegen +#ifdef _WIN32 tmpFont.setPixelSize(11); textBrowser_Log->setFont(tmpFont); +#else + tmpFont.setPixelSize(10); + textBrowser_Log->setFont(tmpFont); +#endif tmpFont.setPixelSize(18); label_Pot->setFont(tmpFont); tmpFont.setPixelSize(13);