diff --git a/TODO b/TODO index 973bbac2..47041073 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ #todo items for future releases -- save games to continue at the saved game-state \ No newline at end of file +- save games to continue at the saved game-state# +- blinking start-stop button when click start is needed for next round \ No newline at end of file diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 15b9eac6..5644d2cc 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -39,20 +39,38 @@ ConfigFile::ConfigFile() // Pfad und Dateinamen setzen #ifdef _WIN32 const char *appDataPath = getenv("AppData"); - if (appDataPath) - { //Programmordner erstellen - configFileName = appDataPath; - configFileName += "\\pokerth\\"; - mkdir(configFileName.c_str()); - //Log-File Ordner auch erstellen - logDir = configFileName; - logDir += "log-files\\"; - mkdir(logDir.c_str()); - //data Ordner auch erstellen - dataDir = configFileName; - dataDir += "data\\"; - mkdir(dataDir.c_str()); + if (appDataPath && appDataPath[0] != 0) { + configFileName = appDataPath; } + else { + configFileName = getcwd(); + //Testen ob das Verzeichnis beschreibbar ist + ofstream tmpFile; +         const char *tmpFileName = "pokerth_test.tmp"; +         tmpFile.open(tmpFileName); + if (tmpFile) { + // Erfolgreich, Verzeichnis beschreibbar. + // Datei wieder loeschen. + tmpFile.close(); + remove(tmpFileName); + } + else { + // Fehlgeschlagen, Verzeichnis nicht beschreibbar + configFileName = "C:\\Windows\\Temp\\"; + } + } + //Programmordner erstellen + configFileName += "\\pokerth\\"; + mkdir(configFileName.c_str()); + //Log-File Ordner auch erstellen + logDir = configFileName; + logDir += "log-files\\"; + mkdir(logDir.c_str()); + //data Ordner auch erstellen + dataDir = configFileName; + dataDir += "data\\"; + mkdir(dataDir.c_str()); + #else //Programmordner erstellen const char *homePath = getenv("HOME"); diff --git a/src/gui/qt/log/log.cpp b/src/gui/qt/log/log.cpp index a48fe5d7..b00d24ec 100644 --- a/src/gui/qt/log/log.cpp +++ b/src/gui/qt/log/log.cpp @@ -56,36 +56,38 @@ Log::Log(mainWindowImpl* w) : myW(w) myLogFile->close(); linesInFile = 3; - } - //Zu alte Dateien löschen!!! - int daysUntilWaste = myConfig->readConfigInt("LogStoreDuration"); - int i; + //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 << QString::QString(myLogDir->absolutePath()+"/"+logFileList.at(i)).toStdString() << endl; + QFile fileToDelete(myLogDir->absolutePath()+"/"+logFileList.at(i)); + fileToDelete.remove(); + } - for(i=0; i daysUntilWaste) { - -// 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"; } } diff --git a/src/gui/qt/resources/guiv2/table.png b/src/gui/qt/resources/guiv2/table.png index 5467c66f..713016eb 100644 Binary files a/src/gui/qt/resources/guiv2/table.png and b/src/gui/qt/resources/guiv2/table.png differ diff --git a/src/gui/qt/resources/opponentBoxActiveGlow.png b/src/gui/qt/resources/opponentBoxActiveGlow.png deleted file mode 100644 index 7216999e..00000000 Binary files a/src/gui/qt/resources/opponentBoxActiveGlow.png and /dev/null differ diff --git a/src/gui/qt/resources/playerBoxActiveGlow.png b/src/gui/qt/resources/playerBoxActiveGlow.png deleted file mode 100644 index d9e42cd1..00000000 Binary files a/src/gui/qt/resources/playerBoxActiveGlow.png and /dev/null differ diff --git a/src/gui/qt/resources/playerBoxInactiveGlow.png b/src/gui/qt/resources/playerBoxInactiveGlow.png deleted file mode 100644 index e0aded0f..00000000 Binary files a/src/gui/qt/resources/playerBoxInactiveGlow.png and /dev/null differ diff --git a/src/gui/qt/resources/playeraction_03.png b/src/gui/qt/resources/playeraction_03.png deleted file mode 100644 index af21dad7..00000000 Binary files a/src/gui/qt/resources/playeraction_03.png and /dev/null differ diff --git a/src/gui/qt/resources/playeraction_05.png b/src/gui/qt/resources/playeraction_05.png deleted file mode 100644 index aa624bb9..00000000 Binary files a/src/gui/qt/resources/playeraction_05.png and /dev/null differ diff --git a/src/gui/qt/resources/playeraction_07.png b/src/gui/qt/resources/playeraction_07.png deleted file mode 100644 index 962171c6..00000000 Binary files a/src/gui/qt/resources/playeraction_07.png and /dev/null differ