Updater: Closing the download dialog

The dialog is deleted and the installation should begin if everything finished successfully.
skyjake · Jun 1, 2012 · 4db3aaf · 4db3aaf
1 parent 927846a
commit 4db3aaf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/doomsday/engine/portable/include/updater.h b/doomsday/engine/portable/include/updater.h
@@ -42,6 +42,7 @@ class Updater : public QObject
 
 public slots:
     void gotReply(QNetworkReply*);
+    void downloadCompleted(int result);
 
 private:
     struct Instance;

diff --git a/doomsday/engine/portable/src/updater.cpp b/doomsday/engine/portable/src/updater.cpp
@@ -62,12 +62,13 @@ struct Updater::Instance
 {
     Updater* self;
     QNetworkAccessManager* network;
+    DownloadDialog* download;
 
     VersionInfo latestVersion;
     QString latestPackageUri;
     QString latestLogUri;
 
-    Instance(Updater* up) : self(up)
+    Instance(Updater* up) : self(up), network(0), download(0)
     {
         network = new QNetworkAccessManager(self);
     }
@@ -121,11 +122,22 @@ struct Updater::Instance
         if(dlg.exec())
         {
             LOG_MSG("Download and install.");
-            DownloadDialog* downDlg = new DownloadDialog(latestPackageUri);
-            downDlg->show();
-            // The dialog will delete itself.
+            download = new DownloadDialog(latestPackageUri);
+            QObject::connect(download, SIGNAL(finished(int)), self, SLOT(downloadCompleted(int)));
+            download->show();
         }
     }
+
+    /**
+     * Start the installation process using the provided distribution package.
+     * The engine is shut down gracefully (game is always autosaved first).
+     *
+     * @param distribPackagePath  File path of the distribution package.
+     */
+    void startInstall(de::String distribPackagePath)
+    {
+
+    }
 };
 
 Updater::Updater(QObject *parent) : QObject(parent)
@@ -146,6 +158,18 @@ void Updater::gotReply(QNetworkReply* reply)
     d->handleReply(reply);
 }
 
+void Updater::downloadCompleted(int result)
+{
+    if(result == DownloadDialog::Accepted)
+    {
+        d->startInstall(d->download->downloadedFilePath());
+    }
+
+    // The download dialgo can be dismissed now.
+    d->download->deleteLater();
+    d->download = 0;
+}
+
 void Updater_Init(void)
 {
     updater = new Updater;