Merge branch 'dev'

Author: awthwathje

CHANGELOG.md

@@ -1,5 +1,18 @@
 # SteaScree Changelog
 
+## 1.5.4
+* Qt 5.9.1.
+* Added "JPEG Quality" spinbox for situations, when SteaScree converts image to JPEG. It happens if the input image is too large for Steam Cloud or if it has non-JPEG format. Defaults to 95.
+* Slight redesign. Status field is now visible all the time.
+
+## 1.5.3
+* Now the app switches to debugging to file automatically, when the it is not ran in Qt Creator.
+
+## 1.5.2
+* Added a logic to save debug info to the debug.log file.
+* Fixed the bug when the app was crashing, if the Steam user personal name (nickname) was not found in config files. Closes issue #16.
+* Removed some unused methods.
+
 ## 1.4.1
 * Minor UI improvement.
 
@@ -53,4 +66,4 @@
 
 ## 1.0.0
 
-* Initial public release.
+* Initial public release.

SteaScree.pro

@@ -24,7 +24,7 @@ FORMS       +=  mainwindow.ui \
 RESOURCES   +=  \
                 images.qrc
 
-VERSION     =   1.4.1
+VERSION     =   1.5.4
 
 DEFINES     +=  APP_VERSION=\\\"$$VERSION\\\"
 

controller.cpp

@@ -31,6 +31,14 @@
 
 #include <QDebug>
 
+#include <QApplication>
+#include <QtGlobal>
+#include <QtDebug>
+#include <QTextStream>
+#include <QTextCodec>
+#include <QLocale>
+#include <QTime>
+
 
 Controller::Controller(QObject *parent) : QObject(parent)
 {    
@@ -84,13 +92,17 @@ void Controller::readSettings()
 
     settings->beginGroup("LastSelection");
     steamDir = settings->value("SteamDir", defaultSteamDir).toString();
-    if ( QDir(steamDir).exists() )
+    if (QDir(steamDir).exists())
         emit sendLabelsText(QStringList() << "label_steamDirValue", convertSlashes(steamDir));
     else
         emit sendLabelsText(QStringList() << "label_steamDirValue", "Not found, please locate manually");
     lastSelectedScreenshotDir = settings->value("Screenshots", QDir::currentPath()).toString();
     lastSelectedUserID = settings->value("UserID").toString();
     lastSelectedGameID = settings->value("GameID").toString();
+    quint32 jpegQuality = settings->value("JPEGQuality").toInt();
+    if (jpegQuality < 1 || jpegQuality > 100)
+        jpegQuality = defaultJpegQuality;
+    emit sendJpegQualityValue(jpegQuality);
     settings->endGroup();
 
     settings->beginGroup("Screenshots");
@@ -103,7 +115,7 @@ void Controller::readSettings()
 }
 
 
-void Controller::writeSettings(QSize size, QPoint pos, QString userID, QString gameID)
+void Controller::writeSettings(QSize size, QPoint pos, QString userID, QString gameID, quint32 jpegQuality)
 {
     settings->beginGroup("WindowGeometry");
     settings->setValue("Size", size);
@@ -117,6 +129,7 @@ void Controller::writeSettings(QSize size, QPoint pos, QString userID, QString g
         settings->setValue("UserID", userID);
     if ( !gameID.isEmpty() )
         settings->setValue("GameID", gameID);
+    settings->setValue("JPEGQuality", jpegQuality);
     settings->endGroup();
 
     settings->beginGroup("Screenshots");
@@ -136,7 +149,7 @@ void Controller::checkForUpdates()
 
 void Controller::handleUpdate(QNetworkReply *reply)
 {
-    if ( reply->error() == QNetworkReply::NoError ) {
+    if (reply->error() == QNetworkReply::NoError) {
 
         QByteArray raw = reply->readAll();
         QJsonDocument doc(QJsonDocument::fromJson(raw));
@@ -167,6 +180,7 @@ void Controller::writeSettingNeverOfferUpdate()
 void Controller::setUserDataPaths(QString dir)  // function to validate and set data paths and IDs
 {
     userDataDir = dir + "/userdata";
+
     QStringList userIDsCombined;
 
     vdfPaths.clear();                           // there may be multiple Steam installations in the system and thus multiple VDFs
@@ -191,19 +205,24 @@ void Controller::setUserDataPaths(QString dir)  // function to validate and set
 
             emit sendWidgetsDisabled(widgetList << "groupBox_screenshotQueue" << "treeWidget_screenshotList", false);
             emit sendLabelsText(QStringList() << "label_steamDirValue", convertSlashes(dir));
-            emit sendLabelsVisible(QStringList() << "label_status", false);
 
             steamDir = dir;
 
             QStringList userIDsCombinedWithNames;
             QListIterator<QString> i(vdfPaths);
             while ( i.hasNext() ) {
                 QString current = i.next();
+
                 QStringList splitted = current.split('/');
+
                 userID = splitted.takeAt(splitted.length() - 3);
+
                 someID = splitted.takeAt(splitted.length() - 2);
+
                 userIDsCombined << userID + "/" + someID;
+
                 QString personalName = getPersonalNameByUserID(userID);
+
                 userIDsCombinedWithNames << userID + "/" + someID + personalName;
             }
 
@@ -220,6 +239,7 @@ void Controller::setUserDataPaths(QString dir)  // function to validate and set
                 items = userIDsCombinedWithNames.replaceInStrings("/", "\\");
                 userID = userID.replace("/", "\\");
             }
+
             selectedUserID = userID;
 
             emit sendToComboBox("comboBox_userID", items);
@@ -228,18 +248,23 @@ void Controller::setUserDataPaths(QString dir)  // function to validate and set
 
             emit sendToComboBox("comboBox_gameID", QStringList() << "loading...");
 
+            emit sendStatusLabelText("ready", "");
+            emit sendLabelsVisible(QStringList() << "label_status", true);
+
             QNetworkAccessManager *nam = new QNetworkAccessManager(this);
 
             QObject::connect(nam, &QNetworkAccessManager::finished,
                              this, &Controller::getGameNames);
 
             nam->get(QNetworkRequest(QUrl("http://api.steampowered.com/ISteamApps/GetAppList/v2")));
 
-        } else
+        } else {
             emit sendLabelsOnMissingStuff(false, vdfFilename);
+        }
 
-    } else
+    } else {
         emit sendLabelsOnMissingStuff(true, vdfFilename);
+    }
 }
 
 
@@ -250,6 +275,7 @@ QString Controller::getPersonalNameByUserID(QString userID)
     {
         QDirIterator i(userDataDir + "/" + userID, QStringList() << "config.cfg", QDir::Files, QDirIterator::Subdirectories);
         while ( i.hasNext() ) {
+
             configFiles << i.next();
         }
     }
@@ -265,17 +291,21 @@ QString Controller::getPersonalNameByUserID(QString userID)
 
         while ( !text.atEnd() ) {
             QString line = text.readLine();
+
             lines << line;
         }
 
         vdf.close();
 
         QRegularExpression re("^name \"(?<name>.+)\"$");
         int pos = lines.indexOf(re);
+
         QRegularExpressionMatch matchNew;
 
-        if ( (lines[pos].contains(re, &matchNew)) )
+        if ( pos != -1 && (lines[pos].contains(re, &matchNew)) ) {
+
             return " <" + matchNew.captured("name") + ">";
+        }
     }
 
     return "";
@@ -451,12 +481,13 @@ void Controller::writeVDF()         // write to VDF from list of strings. previo
 }
 
 
-void Controller::prepareScreenshots(QString userID, QString gameID, MainWindow *mainWindow)   // this routine copies screenshots to the respective folders
+void Controller::prepareScreenshots(QString userID, QString gameID, quint32 jpegQuality, MainWindow *mainWindow)   // this routine copies screenshots to the respective folders
 {                                                                   // ...and manipulates a string list copy of the VDF (file is not written yet)
     someScreenshotsWereNotPrepared = false;
     QRegularExpression desc(" <.+>$");
     selectedUserID = userID.replace("\\", "/").remove(desc);
     selectedGameID = gameID.remove(desc);   // it's possible to enter game ID by hand or left what was auto-generated (with <...>)
+    selectedJpegQuality = jpegQuality;
 
     if ( lines.isEmpty() )
         lines = readVDF();
@@ -630,7 +661,7 @@ void Controller::prepareScreenshots(QString userID, QString gameID, MainWindow *
             else {
                 sendLabelsVisible(QStringList() << "label_progress" << "progressBar_status", false);
                 sendLabelsVisible(QStringList() << "label_status", true);
-                emit sendStatusLabelText("none of screenshots were copied", "#ab4e52");
+                emit sendStatusLabelText("none of screenshots were copied", warningColor);
                 screenshotPathsPool.clear();
             }
         }
@@ -734,7 +765,7 @@ void Controller::resizeAndSaveLargeScreenshot(Screenshot screenshot)
     saveThumbnail(filename, image, newWidth, newHeight);
 
     resizedImage = image.scaled(QSize(newWidth, newHeight), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    resizedImage.save(copyDest + filename, "jpg", 95);
+    resizedImage.save(copyDest + filename, "jpg", selectedJpegQuality);
 }
 
 
@@ -812,7 +843,7 @@ void Controller::pushScreenshots(QList<Screenshot> screenshotList)
                 if ( ((extension == "jpg") || (extension == "jpeg")) && (getEncodingProcessOfJpeg(&file) == "progressive") )
                     file.copy(copyDest + filename);                 // copy untouched JPEG file if it is really JPEG, is not large (or if user decided to try it upload anyway)
                 else                                                // ...only progressive JPEGs are copied as is, baseline or some unidentified jpegs are
-                    image.save(copyDest + filename, "jpg", 95);     // ...getting processed and saved by Qt to prevent Steam Cloud to reject them
+                    image.save(copyDest + filename, "jpg", selectedJpegQuality);    // ...getting processed and saved by Qt to prevent Steam Cloud to reject them
 
                 saveThumbnail(filename, image, width, height);      // ...see issue https://github.com/Foyl/SteaScree/issues/9
 
@@ -871,9 +902,9 @@ void Controller::pushScreenshots(QList<Screenshot> screenshotList)
         emit sendDirStatusLabelsVisible(true);
 
         if (someScreenshotsWereNotPrepared)
-            emit sendStatusLabelText("some screenshots were not copied", "#ab4e52");
+            emit sendStatusLabelText("some screenshots were not copied", warningColor);
         else
-            emit sendStatusLabelText("screenshots are ready for preparation", "grey");
+            emit sendStatusLabelText("screenshots are ready for preparation", "");
 
         emit sendWidgetsDisabled(QStringList() << "pushButton_prepare", false);
     }
@@ -941,12 +972,6 @@ void Controller::returnLastSelectedScreenshotDir()
 }
 
 
-void Controller::returnScreenshotPathPoolLength()
-{
-    emit sendProgressBarLength(screenshotPathsPool.length());
-}
-
-
 void Controller::returnSteamDir()
 {
     emit sendSteamDir(steamDir);

controller.h

@@ -44,6 +44,7 @@ class Controller : public QObject
     QString lastSelectedScreenshotDir;
     QString lastSelectedUserID;
     QString lastSelectedGameID;
+    quint32 selectedJpegQuality;
     QStringList copiedGames;
     QString copyDest;
     qint32 opening;
@@ -60,6 +61,16 @@ class Controller : public QObject
     QTreeWidgetDragAndDrop *treeWidget;
     const QStringList imageFormatsSupported = QStringList() << "jpg" << "jpeg" << "png" << "bmp" << "tif" << "tiff";
     bool someScreenshotsWereNotPrepared;
+    void pushScreenshots(QList<Screenshot> screenshotList);
+    void resizeAndSaveLargeScreenshot(Screenshot screenshot);
+    void getUserDecisionAboutLargeScreenshots(QList<Screenshot> screenshotList, MainWindow *mainWindow);
+    void saveThumbnail(QString filename, QImage image, quint32 width, quint32 height);
+    void checkForUpdates();
+    QString getPersonalNameByUserID(QString userID);
+    void getShortcutNames();
+    QString getEncodingProcessOfJpeg(QFile *file);
+    const QString warningColor = "#ab4e52";
+    const quint32 defaultJpegQuality = 95;
 
 
 #if defined(Q_OS_WIN32)
@@ -70,15 +81,6 @@ class Controller : public QObject
     const QString os = "macOS";
 #endif
 
-    void pushScreenshots(QList<Screenshot> screenshotList);
-    void resizeAndSaveLargeScreenshot(Screenshot screenshot);
-    void getUserDecisionAboutLargeScreenshots(QList<Screenshot> screenshotList, MainWindow *mainWindow);
-    void saveThumbnail(QString filename, QImage image, quint32 width, quint32 height);
-    void checkForUpdates();
-    QString getPersonalNameByUserID(QString userID);
-    void getShortcutNames();
-    QString getEncodingProcessOfJpeg(QFile *file);
-
 
 signals:
     void adjustButtons(QList<QPushButton*> buttonList, QString os);
@@ -105,17 +107,17 @@ class Controller : public QObject
     void setupStatusArea(quint32 progressBarMaximum);
     void sendDirStatusLabelsVisible(bool visible);
     void sendUpdateInfo(QString version, QString link);
+    void sendJpegQualityValue(quint32 jpegQualityValue);
 
 
 public slots:
     void getButtonList(QList<QPushButton *> buttonList);
-    void writeSettings(QSize size, QPoint pos, QString userID, QString gameID);
+    void writeSettings(QSize size, QPoint pos, QString userID, QString gameID, quint32 jpegQuality);
     void removeEntryFromScreenshotPathsPool(QString entry);
     void returnLastSelectedScreenshotDir();
     void clearScreenshotPathsPool();
     void clearState();
-    void returnScreenshotPathPoolLength();
-    void prepareScreenshots(QString userID, QString gameID, MainWindow *mainWindow);
+    void prepareScreenshots(QString userID, QString gameID, quint32 jpegQuality, MainWindow *mainWindow);
     void setUserDataPaths(QString dir);
     void returnSteamDir();
     void writeVDF();