Fixed a bug when screenshots weren't added to the VDF-file if latest

copied screenshot was a dupe. Major refactoring (partially conforms to
the MVC pattern). Minor UI improvement.

README.md

@@ -2,6 +2,6 @@
 
 SteaScree: Steam Cloud Screenshot Uploader
 
-SteaScree is a simple cross-platform open-source utility which allows an uploading of screenshots to the Steam Cloud taken without a use of Steam in-game overlay. You just pick screenshots and game and SteaScree will do the rest.
+SteaScree is a simple cross-platform open-source utility which makes screenshots taken without the use of Steam's in-game overlay uploadable to the Steam Cloud. You just pick pics and a game and SteaScree will do the rest.
 
-Latest installers for all platforms are always available at https://steascree.download.
+Latest installers for all platforms are always available at https://steascree.download.

SteaScree.pro

@@ -1,26 +1,23 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-08-20T12:24:15
-#
-#-------------------------------------------------
+QT          +=  core gui network
 
-QT          += core gui network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET      = SteaScree
+TARGET      =   SteaScree
 
-TEMPLATE    = app
+TEMPLATE    =   app
 
-SOURCES     += main.cpp\
-               mainwindow.cpp
+SOURCES     +=  main.cpp\
+                mainwindow.cpp \
+                model.cpp
 
-HEADERS     += mainwindow.h
+HEADERS     +=  mainwindow.h \
+                model.h
 
-FORMS       += mainwindow.ui
+FORMS       +=  mainwindow.ui
 
-VERSION     = 1.0.3.0
+VERSION     =   1.0.4.0
 
-macx:ICON   = res/icons/SteaScree.icns
+macx:ICON   =   res/icons/SteaScree.icns
 
 win32:RC_ICONS                  = res/icons/SteaScree.ico
 win32:QMAKE_TARGET_COMPANY      = Foyl

main.cpp

@@ -1,4 +1,5 @@
 #include "mainwindow.h"
+#include "model.h"
 
 #include <QApplication>
 
@@ -11,7 +12,111 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName("SteaScree");
 
     MainWindow w;
+    Model m;
+
+    QObject::connect(&w, &MainWindow::getOS,
+                     &m, &Model::returnOS);
+
+    QObject::connect(&m, &Model::sendOS,
+                     &w, &MainWindow::setButtonPadding);
+
+    QObject::connect(&m, &Model::addWidgetItemToScreenshotList,
+                     &w, &MainWindow::addWidgetItemToScreenshotList);
+
+    QObject::connect(&m, &Model::resizeScreenshotListColumns,
+                     &w, &MainWindow::resizeScreenshotListColumns);
+
+    QObject::connect(&w, &MainWindow::getSteamDir,
+                     &m, &Model::returnSteamDir);
+
+    QObject::connect(&m, &Model::sendSteamDir,
+                     &w, &MainWindow::locateSteamDir);
+
+    QObject::connect(&w, &MainWindow::setUserDataPaths,
+                     &m, &Model::setUserDataPaths);
+
+    QObject::connect(&w, &MainWindow::pushButtonAddScreenshots_clicked,
+                     &m, &Model::returnLastSelectedScreenshotDir);
+
+    QObject::connect(&m, &Model::sendLastSelectedScreenshotDir,
+                     &w, &MainWindow::returnScreenshotsSelected);
+
+    QObject::connect(&w, &MainWindow::sendScreenshotsSelected,
+                     &m, &Model::addScreenshotsToPool);
+
+    QObject::connect(&w, &MainWindow::pushButtonPrepare_clicked,
+                     &m, &Model::returnLinesState);
+
+    QObject::connect(&m, &Model::sendLinesState,
+                     &w, &MainWindow::prepareScreenshots);
+
+    QObject::connect(&m, &Model::disableWidgets,
+                     &w, &MainWindow::setWidgetsDisabled);
+
+    QObject::connect(&w, &MainWindow::clearScreenshotPathsPool,
+                     &m, &Model::clearScreenshotPathsPool);
+
+    QObject::connect(&w, &MainWindow::clearCopyingStatusLabels,
+                     &m, &Model::clearCopyingStatusLabels);
+
+    QObject::connect(&w, &MainWindow::getScreenshotPathsPoolLength,
+                     &m, &Model::returnScreenshotPathPoolLength);
+
+    QObject::connect(&m, &Model::sendScreenshotPathPoolLength,
+                     &w, &MainWindow::setVisibleProgressBar);
+
+    QObject::connect(&w, &MainWindow::writeVDF,
+                     &m, &Model::writeVDF);
+
+    QObject::connect(&w, &MainWindow::pushScreenshots,
+                     &m, &Model::pushScreenshots);
+
+    QObject::connect(&w, &MainWindow::getVDFStatus,
+                     &m, &Model::returnVDFStatus);
+
+    QObject::connect(&m, &Model::sendVDFStatus,
+                     &w, &MainWindow::warnOnMissingVDF);
+
+    QObject::connect(&m, &Model::moveWindow,
+                     &w, &MainWindow::moveWindow);
+
+    QObject::connect(&m, &Model::setLabelStatusErrorVisible,
+                     &w, &MainWindow::setLabelStatusErrorVisible);
+
+    QObject::connect(&w, &MainWindow::sendSettings,
+                     &m, &Model::writeSettings);
+
+    QObject::connect(&m, &Model::clearWidgets,
+                     &w, &MainWindow::setComboBoxesCleared);
+
+    QObject::connect(&m, &Model::sendToComboBox,
+                     &w, &MainWindow::insertIntoComboBox);
+
+    QObject::connect(&m, &Model::setIndexOfComboBoxGameID,
+                     &w, &MainWindow::setIndexOfComboBoxGameID);
+
+    QObject::connect(&m, &Model::setLabelsOnMissingStuff,
+                     &w, &MainWindow::setLabelsOnMissingStuff);
+
+    QObject::connect(&m, &Model::getComboBoxUserIDCurrentText,
+                     &w, &MainWindow::returnComboBoxUserIDCurrentText,
+                     Qt::DirectConnection);
+
+    QObject::connect(&w, &MainWindow::sendComboBoxUserIDCurrentText,
+                     &m, &Model::setSelectedUserID);
+
+    QObject::connect(&m, &Model::sendLabelsText,
+                     &w, &MainWindow::setLabelsText);
+
+    QObject::connect(&m, &Model::setProgressBarValue,
+                     &w, &MainWindow::setProgressBarValue);
+
+    QObject::connect(&m, &Model::deleteCopiedWidgetItem,
+                     &w, &MainWindow::deleteCopiedWidgetItem);
+
     w.show();
+    w.bootStrap();
+    m.bootStrap();
 
     return a.exec();
 }