From 9b8493c30499e06bbef7b96ff415f80c140c1a7f Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Fri, 1 Apr 2022 09:10:51 -0300
Subject: feat: Use a single progress dialog when doing multiple tasks

This puts all mod downloading tasks inside a SequentialTask, which is,
for more than one task, a multi step task. This is handled by the
ProgressDialog by showing both the global progress of tasks executed,
and the individual progress of each of them.
---
 launcher/ui/pages/instance/ModFolderPage.cpp | 37 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'launcher/ui/pages/instance')

diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 599f0e11..fcb6022d 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -58,6 +58,7 @@
 
 #include "Version.h"
 #include "ui/dialogs/ProgressDialog.h"
+#include "tasks/SequentialTask.h"
 
 namespace {
     // FIXME: wasteful
@@ -394,25 +395,25 @@ void ModFolderPage::on_actionInstall_mods_triggered()
         return;
     }
     ModDownloadDialog mdownload(m_mods, this, m_inst);
-    if(mdownload.exec()) {
-        for(auto task : mdownload.getTasks()){
-            connect(task, &Task::failed, [this, task](QString reason) {
-                task->deleteLater();
-                CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
-            });
-            connect(task, &Task::succeeded, [this, task]() {
-                QStringList warnings = task->warnings();
-                if (warnings.count()) {
-                    CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'),
-                                                 QMessageBox::Warning)->show();
-                }
-                task->deleteLater();
-            });
-            ProgressDialog loadDialog(this);
-            loadDialog.setSkipButton(true, tr("Abort"));
-            loadDialog.execWithTask(task);
-            m_mods->update();
+    if (mdownload.exec()) {
+        SequentialTask* tasks = new SequentialTask(this);
+        connect(tasks, &Task::failed, [this, tasks](QString reason) {
+            CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
+            tasks->deleteLater();
+        });
+        connect(tasks, &Task::succeeded, [this, tasks]() {
+            QStringList warnings = tasks->warnings();
+            if (warnings.count()) { CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show(); }
+            tasks->deleteLater();
+        });
+
+        for (auto task : mdownload.getTasks()) {
+            tasks->addTask(task);
         }
+        ProgressDialog loadDialog(this);
+        loadDialog.setSkipButton(true, tr("Abort"));
+        loadDialog.execWithTask(tasks);
+        m_mods->update();
     }
 }
 
-- 
cgit