Last updates for 2.0

Author: Wano-k

dialogengineupdate.cpp

@@ -69,7 +69,8 @@ void DialogEngineUpdate::updateReleaseText(QJsonArray& tab) {
 void DialogEngineUpdate::updateLabel(QString label) {
     ui->label->setText(label);
     ui->scrollArea->hide();
-    setFixedSize(geometry().width(), geometry().height() - 300);
+    ui->checkBoxShow->hide();
+    setFixedSize(geometry().width(), geometry().height() - 370);
 }
 
 // -------------------------------------------------------
@@ -90,6 +91,7 @@ void DialogEngineUpdate::accept() {
     else
         QMessageBox::information(this, "Done!", "Download finished correctly!");
     m_progress.close();
+    qApp->quit();
     EngineUpdater::startEngineProcess();
 
     QDialog::accept();
@@ -99,7 +101,14 @@ void DialogEngineUpdate::accept() {
 
 void DialogEngineUpdate::reject() {
     this->hide();
+    qApp->quit();
     EngineUpdater::startEngineProcess();
 
     QDialog::reject();
 }
+
+// -------------------------------------------------------
+
+void DialogEngineUpdate::on_checkBoxShow_toggled(bool checked) {
+    m_engineUpdater.changeNeedUpdate(checked);
+}

dialogengineupdate.h

@@ -57,6 +57,9 @@ class DialogEngineUpdate : public QDialog
 public slots:
     virtual void accept();
     virtual void reject();
+
+private slots:
+    void on_checkBoxShow_toggled(bool checked);
 };
 
 #endif // DIALOGENGINEUPDATE_H

dialogengineupdate.ui

@@ -14,18 +14,6 @@
    <string>New update(s)!</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>15</number>
-   </property>
-   <property name="topMargin">
-    <number>10</number>
-   </property>
-   <property name="rightMargin">
-    <number>15</number>
-   </property>
-   <property name="bottomMargin">
-    <number>10</number>
-   </property>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="spacing">
@@ -63,7 +51,7 @@ Would you like to download it?</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>524</width>
+            <width>536</width>
             <height>368</height>
            </rect>
           </property>
@@ -73,14 +61,25 @@ Would you like to download it?</string>
       </layout>
      </item>
      <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QCheckBox" name="checkBoxShow">
+         <property name="text">
+          <string>Don't show this window again</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>

engineupdater.cpp

@@ -316,6 +316,19 @@ QString EngineUpdater::getVersionJson() const {
 
 // -------------------------------------------------------
 
+void EngineUpdater::changeNeedUpdate(bool checked) {
+    QString path = Common::pathCombine(Common::pathCombine(Common::pathCombine(
+                   QDir::currentPath(), "Engine"), "Content"),
+                   "engineSettings.json");
+    QJsonDocument doc;
+    Common::readOtherJSON(path, doc);
+    QJsonObject obj = doc.object();
+    obj["updater"] = !checked;
+    Common::writeOtherJSON(path, obj);
+}
+
+// -------------------------------------------------------
+
 void EngineUpdater::start() {
     emit needUpdate();
 }

engineupdater.h

@@ -90,6 +90,7 @@ class EngineUpdater : public QObject
     static int countObjUpdate(QJsonObject& obj);
     bool hasVersion() const;
     QString getVersionJson() const;
+    void changeNeedUpdate(bool checked);
     void start();
     void updateVersion(QJsonObject& obj, QString &version);
     bool download(EngineUpdateFileKind action, QJsonObject& obj,

main.cpp

@@ -23,6 +23,7 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QDir>
+#include <QTimer>
 
 int main(int argc, char *argv[])
 {
@@ -42,6 +43,7 @@ int main(int argc, char *argv[])
 
     if (!engineUpdater.readDocumentVersion()) {
         EngineUpdater::startEngineProcess();
+        QTimer::singleShot(5000, qApp, SLOT(quit()));
         return 0;
     }
 
@@ -62,8 +64,10 @@ int main(int argc, char *argv[])
                 dialog.updateReleaseText(tab);
                 dialog.show();
             }
-            else
+            else {
                 EngineUpdater::startEngineProcess();
+                QTimer::singleShot(5000, qApp, SLOT(quit()));
+            }
         }
         else {
             dialog.updateLabel("You can download the newest version of the "