diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 8b99023a..9de3e860 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -40,7 +40,7 @@ using namespace std; ConfigFile::ConfigFile(bool configFirstStart) { // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 17; + configRev = 18; // Pfad und Dateinamen setzen #ifdef _WIN32 @@ -187,10 +187,11 @@ void ConfigFile::updateConfig(ConfigState myConfigState) { configList.push_back(ConfigInfo("Opponent5Avatar", CONFIG_TYPE_STRING, "")); configList.push_back(ConfigInfo("Opponent6Name", CONFIG_TYPE_STRING, "Player 6")); configList.push_back(ConfigInfo("Opponent6Avatar", CONFIG_TYPE_STRING, "")); + configList.push_back(ConfigInfo("LogOnOff", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("LogDir", CONFIG_TYPE_STRING, logDir)); configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2")); + configList.push_back(ConfigInfo("LogInterval", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("DataDir", CONFIG_TYPE_STRING, dataDir)); - configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2")); if(myConfigState == NONEXISTING) { diff --git a/src/gui/qt/log/log.cpp b/src/gui/qt/log/log.cpp index 61ecaac6..84a1895e 100644 --- a/src/gui/qt/log/log.cpp +++ b/src/gui/qt/log/log.cpp @@ -31,63 +31,65 @@ Log::Log(mainWindowImpl* w, ConfigFile *c) : myW(w), myConfig(c) { myW->setLog(this); - if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())).exists()) { - - myLogDir = new QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())); - myLogFile = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss")+".html"); - - //Logo-Pixmap extrahieren - QPixmap::QPixmap(":graphics/resources/graphics/logoChip3D.png").save(myLogDir->absolutePath()+"/logo.png"); - -// myW->textBrowser_Log->append(myLogFile->fileName()); - - myLogFile->open( QIODevice::WriteOnly ); - QTextStream stream( myLogFile ); - stream << "\n"; - stream << "\n"; - stream << ""; - stream << "\n"; - stream << "\n"; - stream << "\n"; - stream << "

Log-File for PokerTH 0.4 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"

\n"; -// stream << "\n"; -// stream << "\n"; - myLogFile->close(); - - linesInFile = 3; - - //Zu alte Dateien löschen!!! - int daysUntilWaste = myConfig->readConfigInt("LogStoreDuration"); - int i; + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled + if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())).exists()) { + + myLogDir = new QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())); + myLogFile = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss")+".html"); + + //Logo-Pixmap extrahieren + QPixmap::QPixmap(":graphics/resources/graphics/logoChip3D.png").save(myLogDir->absolutePath()+"/logo.png"); + + // myW->textBrowser_Log->append(myLogFile->fileName()); + + myLogFile->open( QIODevice::WriteOnly ); + QTextStream stream( myLogFile ); + stream << "\n"; + stream << "\n"; + stream << ""; + stream << "\n"; + stream << "\n"; + stream << "\n"; + stream << "

Log-File for PokerTH 0.4 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"

\n"; + // stream << "\n"; + // stream << "\n"; + myLogFile->close(); + + linesInFile = 3; + + //Zu alte Dateien löschen!!! + int daysUntilWaste = myConfig->readConfigInt("LogStoreDuration"); + int i; + + QStringList filters("pokerth-log*"); + QStringList logFileList = myLogDir->entryList(filters, QDir::Files); - QStringList filters("pokerth-log*"); - QStringList logFileList = myLogDir->entryList(filters, QDir::Files); + for(i=0; i daysUntilWaste) { - // cout << logFileList.at(i).toStdString() << endl; - - QString dateString = logFileList.at(i); - dateString.remove("pokerth-log-"); - dateString.remove(10,14); - - QDate dateOfFile(QDate::fromString(dateString, Qt::ISODate)); - QDate today(QDate::currentDate()); - - // cout << dateOfFile.daysTo(today) << endl; - - if (dateOfFile.daysTo(today) > daysUntilWaste) { - - // cout << QString::QString(myLogDir->absolutePath()+"/"+logFileList.at(i)).toStdString() << endl; - QFile fileToDelete(myLogDir->absolutePath()+"/"+logFileList.at(i)); - fileToDelete.remove(); + // cout << QString::QString(myLogDir->absolutePath()+"/"+logFileList.at(i)).toStdString() << endl; + QFile fileToDelete(myLogDir->absolutePath()+"/"+logFileList.at(i)); + fileToDelete.remove(); + } + } - } - - } - else { cout << "Log directory doesn't exists. Cannot create log files"; } - + } + else { cout << "Log directory doesn't exists. Cannot create log files"; } + } } Log::~Log() @@ -124,16 +126,18 @@ void Log::logPlayerActionMsg(string playerName, int action, int setValue) { myW->textBrowser_Log->append(msg); - myLogFile->open( QIODevice::ReadWrite ); - QTextStream stream( myLogFile ); - for(i=0; i<=linesInFile; i++) { stream.readLine(); } - stream << msg+"
\n"; -// stream << "\n"; -// stream << "\n"; - myLogFile->close(); - - linesInFile++; - + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled + myLogFile->open( QIODevice::ReadWrite ); + QTextStream stream( myLogFile ); + for(i=0; i<=linesInFile; i++) { stream.readLine(); } + stream << msg+"
\n"; + // stream << "\n"; + // stream << "\n"; + myLogFile->close(); + + linesInFile++; + } } void Log::logNewGameHandMsg(int gameID, int handID) { @@ -142,151 +146,169 @@ void Log::logNewGameHandMsg(int gameID, int handID) { myW->textBrowser_Log->append("## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##"); - myLogFile->open( QIODevice::ReadWrite ); - QTextStream stream( myLogFile ); - for(i=0; i<=linesInFile; i++) { stream.readLine(); } + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled - stream << "

####################   Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+"   ####################
"; - stream << "CASH: "; - - //Aktive Spieler zählen - int activePlayersCounter = 0; - HandInterface *currentHand = myW->getSession().getCurrentGame()->getCurrentHand(); - for (k=0; kgetPlayerArray()[k]->getMyActiveStatus() == 1) activePlayersCounter++; - } - k = 0; - if(activePlayersCounter > 2) { - - for(i=0; igetStartQuantityPlayers(); i++) { - - if(currentHand->getPlayerArray()[i]->getMyActiveStatus()) { - //print cash only for active players - - - if(currentHand->getPlayerArray()[i]->getMyButton() == 1) { - if(k==1) { stream << ", "; } - k=1; - stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+" (Dealer): "+QString::number(currentHand->getPlayerArray()[i]->getMyCash(),10)+"$"; - } - else { - if(k==1) { stream << ", "; } - k=1; - stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+": "+QString::number(currentHand->getPlayerArray()[i]->getMyCash()+currentHand->getPlayerArray()[i]->getMySet(),10)+"$"; - } - } - } - } - else { - for(i=0; igetStartQuantityPlayers(); i++) { - if(currentHand->getPlayerArray()[i]->getMyActiveStatus()) { - //print cash only for active players - if(currentHand->getPlayerArray()[i]->getMyButton() == 3) { - if(k==1) { stream << ", "; } - k=1; - stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+" (Dealer): "+QString::number(currentHand->getPlayerArray()[i]->getMyCash()+currentHand->getPlayerArray()[i]->getMySet(),10)+"$"; - } - else { - if(k==1) { stream << ", "; } - k=1; - stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+": "+QString::number(currentHand->getPlayerArray()[i]->getMyCash()+currentHand->getPlayerArray()[i]->getMySet(),10)+"$"; - } - } - } - } - stream << "
BLINDS: "; - for(i=0; iopen( QIODevice::ReadWrite ); + QTextStream stream( myLogFile ); + for(i=0; i<=linesInFile; i++) { stream.readLine(); } + + stream << "

####################   Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+"   ####################
"; + stream << "CASH: "; - j = 0; //Aktive Spieler zählen int activePlayersCounter = 0; + HandInterface *currentHand = myW->getSession().getCurrentGame()->getCurrentHand(); for (k=0; kgetPlayerArray()[k]->getMyAction() != 1 && currentHand->getPlayerArray()[k]->getMyActiveStatus() == 1) activePlayersCounter++; + if (currentHand->getPlayerArray()[k]->getMyActiveStatus() == 1) activePlayersCounter++; } - if(activePlayersCounter < 3) { j=1; } + k = 0; + if(activePlayersCounter > 2) { + + for(i=0; igetStartQuantityPlayers(); i++) { + + if(currentHand->getPlayerArray()[i]->getMyActiveStatus()) { + //print cash only for active players + + + if(currentHand->getPlayerArray()[i]->getMyButton() == 1) { + if(k==1) { stream << ", "; } + k=1; + stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+" (Dealer): "+QString::number(currentHand->getPlayerArray()[i]->getMyCash(),10)+"$"; + } + else { + if(k==1) { stream << ", "; } + k=1; + stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+": "+QString::number(currentHand->getPlayerArray()[i]->getMyCash()+currentHand->getPlayerArray()[i]->getMySet(),10)+"$"; + } + } + } + } + else { + for(i=0; igetStartQuantityPlayers(); i++) { + if(currentHand->getPlayerArray()[i]->getMyActiveStatus()) { + //print cash only for active players + if(currentHand->getPlayerArray()[i]->getMyButton() == 3) { + if(k==1) { stream << ", "; } + k=1; + stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+" (Dealer): "+QString::number(currentHand->getPlayerArray()[i]->getMyCash()+currentHand->getPlayerArray()[i]->getMySet(),10)+"$"; + } + else { + if(k==1) { stream << ", "; } + k=1; + stream << QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str())+": "+QString::number(currentHand->getPlayerArray()[i]->getMyCash()+currentHand->getPlayerArray()[i]->getMySet(),10)+"$"; + } + } + } + } + stream << "
BLINDS: "; + for(i=0; igetDealerPosition()+j)%5 << endl; - - switch (currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMyButton()) { - case 2 : stream << QString::fromUtf8(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMyName().c_str())+" ("+QString::number(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMySet(),10)+"$), "; - break; - case 3 : stream << QString::fromUtf8(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMyName().c_str())+" ("+QString::number(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMySet(),10)+"$)"; - break; - default :; + j = 0; + //Aktive Spieler zählen + int activePlayersCounter = 0; + for (k=0; kgetPlayerArray()[k]->getMyAction() != 1 && currentHand->getPlayerArray()[k]->getMyActiveStatus() == 1) activePlayersCounter++; + } + if(activePlayersCounter < 3) { j=1; } + + // cout << activePlayersCounter << endl; + // cout << (i+currentHand->getDealerPosition()+j)%5 << endl; + + switch (currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMyButton()) { + case 2 : stream << QString::fromUtf8(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMyName().c_str())+" ("+QString::number(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMySet(),10)+"$), "; + break; + case 3 : stream << QString::fromUtf8(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMyName().c_str())+" ("+QString::number(currentHand->getPlayerArray()[(i+currentHand->getDealerPosition()+j)%MAX_NUMBER_OF_PLAYERS]->getMySet(),10)+"$)"; + break; + default :; + } } + + stream << "

PREFLOP"; + stream << "
\n"; + + myLogFile->close(); + + linesInFile = linesInFile++; } - - stream << "

PREFLOP"; - stream << "
\n"; - - myLogFile->close(); - - linesInFile = linesInFile++; - } void Log::logPlayerWinsMsg(int playerID, int pot) { int i; HandInterface *currentHand = myW->getSession().getCurrentGame()->getCurrentHand(); - - myLogFile->open( QIODevice::ReadWrite ); - QTextStream stream( myLogFile ); - for(i=0; i<=linesInFile; i++) { stream.readLine(); } - -// if (cardsValueInt != -1) { -// myW->textBrowser_Log->append(QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName())+" wins "+QString::number(pot,10)+"$ with "+translateCardsValueCode(cardsValueInt).at(0)+"!!! "); -// stream << "
"+QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName())+" wins "+QString::number(pot,10)+"$!!!

\n"; -// } -// else { + myW->textBrowser_Log->append(QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName().c_str())+" wins "+QString::number(pot,10)+"$!!! "); - stream << "
"+QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName().c_str())+" wins "+QString::number(pot,10)+"$!!!

\n"; -// } - myLogFile->close(); - - linesInFile++; + + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled + myLogFile->open( QIODevice::ReadWrite ); + QTextStream stream( myLogFile ); + for(i=0; i<=linesInFile; i++) { stream.readLine(); } + + // if (cardsValueInt != -1) { + // myW->textBrowser_Log->append(QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName())+" wins "+QString::number(pot,10)+"$ with "+translateCardsValueCode(cardsValueInt).at(0)+"!!! "); + // stream << "
"+QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName())+" wins "+QString::number(pot,10)+"$!!!

\n"; + // } + // else { + + stream << "
"+QString::fromUtf8(currentHand->getPlayerArray()[playerID]->getMyName().c_str())+" wins "+QString::number(pot,10)+"$!!!

\n"; + // } + myLogFile->close(); + + linesInFile++; + } } void Log::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4, int card5) { int i; - - myLogFile->open( QIODevice::ReadWrite ); - QTextStream stream( myLogFile ); - for(i=0; i<=linesInFile; i++) { stream.readLine(); } - QString round; + switch (roundID) { case 1: round = "Flop"; myW->textBrowser_Log->append("--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]"); - stream << "
"+round.toUpper()+" [board cards "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+""+translateCardCode(card3).at(1)+"]"+"
\n"; break; case 2: round = "Turn"; myW->textBrowser_Log->append("--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]"); - stream << "
"+round.toUpper()+" [board cards "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+""+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+""+translateCardCode(card4).at(1)+"]"+"
\n"; break; case 3: round = "River"; myW->textBrowser_Log->append("--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]"); - stream << "
"+round.toUpper()+" [board cards "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+""+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+""+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+""+translateCardCode(card5).at(1)+"]"+"
\n"; break; default: round = "ERROR"; } + + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled - myLogFile->close(); - linesInFile++; + myLogFile->open( QIODevice::ReadWrite ); + QTextStream stream( myLogFile ); + for(i=0; i<=linesInFile; i++) { stream.readLine(); } + switch (roundID) { + + case 1: round = "Flop"; + stream << "
"+round.toUpper()+" [board cards "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+""+translateCardCode(card3).at(1)+"]"+"
\n"; + break; + case 2: round = "Turn"; + stream << "
"+round.toUpper()+" [board cards "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+""+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+""+translateCardCode(card4).at(1)+"]"+"
\n"; + break; + case 3: round = "River"; + stream << "
"+round.toUpper()+" [board cards "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+""+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+""+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+""+translateCardCode(card5).at(1)+"]"+"
\n"; + break; + default: round = "ERROR"; + } + + myLogFile->close(); + linesInFile++; + } } void Log::logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt, string showHas) { int i; - myLogFile->open( QIODevice::ReadWrite ); - QTextStream stream( myLogFile ); - for(i=0; i<=linesInFile; i++) { stream.readLine(); } - if (cardsValueInt != -1) { QString tempHandName; @@ -393,16 +415,31 @@ void Log::logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int } myW->textBrowser_Log->append(QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" \""+tempHandName+"\""); - stream << QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" [ "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+"] - "+tempHandName+"
\n"; + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled + myLogFile->open( QIODevice::ReadWrite ); + QTextStream stream( myLogFile ); + for(i=0; i<=linesInFile; i++) { stream.readLine(); } + stream << QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" [ "+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+"] - "+tempHandName+"
\n"; + myLogFile->close(); + linesInFile++; + } } else { myW->textBrowser_Log->append(QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"]"); - stream << QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" ["+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+"]"+"
\n"; - + + if(myConfig->readConfigInt("LogOnOff")) { + //if write logfiles is enabled + myLogFile->open( QIODevice::ReadWrite ); + QTextStream stream( myLogFile ); + for(i=0; i<=linesInFile; i++) { stream.readLine(); } + stream << QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" ["+translateCardCode(card1).at(0)+""+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+""+translateCardCode(card2).at(1)+"]"+"
\n"; + myLogFile->close(); + linesInFile++; + } } - myLogFile->close(); - linesInFile++; + } QStringList Log::translateCardCode(int cardCode) { diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index d1e90da9..148ed5ca 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -1030,7 +1030,7 @@ p, li { white-space: pre-wrap; } 6 - + Enable/Disable Logging diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 90f5a0f6..6043ea98 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -111,9 +111,11 @@ void settingsDialogImpl::exec() { lineEdit_OwnFlipsideFilename->setText(QString::fromUtf8(myConfig->readConfigString("FlipsideOwnFile").c_str())); //Log + groupBox_logOnOff->setChecked(myConfig->readConfigInt("LogOnOff")); lineEdit_logDir->setText(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str())); spinBox_logStoreDuration->setValue(myConfig->readConfigInt("LogStoreDuration")); - + comboBox_logInterval->setCurrentIndex(myConfig->readConfigInt("LogInterval")); + QDialog::exec(); } @@ -242,6 +244,7 @@ void settingsDialogImpl::isAccepted() { } // Log + myConfig->writeConfigInt("LogOnOff", groupBox_logOnOff->isChecked()); if(QDir::QDir(lineEdit_logDir->text()).exists() && lineEdit_logDir->text() != "") { myConfig->writeConfigString("LogDir", lineEdit_logDir->text().toUtf8().constData()); } else { QMessageBox::warning(this, tr("Settings Error"), @@ -252,6 +255,7 @@ void settingsDialogImpl::isAccepted() { } myConfig->writeConfigInt("LogStoreDuration", spinBox_logStoreDuration->value()); + myConfig->writeConfigInt("LogInterval", comboBox_logInterval->currentIndex()); //Wenn alles richtig eingegeben wurde --> Dialog schließen if(settingsCorrect) { this->hide(); }