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/dialogs/ProgressDialog.cpp       | 22 ++++++++++++--
 launcher/ui/dialogs/ProgressDialog.h         |  5 +++-
 launcher/ui/dialogs/ProgressDialog.ui        | 45 +++++++++++++++++-----------
 launcher/ui/pages/instance/ModFolderPage.cpp | 37 ++++++++++++-----------
 4 files changed, 69 insertions(+), 40 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp
index 4b092859..648bd88b 100644
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@@ -81,6 +81,12 @@ int ProgressDialog::execWithTask(Task *task)
     connect(task, SIGNAL(status(QString)), SLOT(changeStatus(const QString &)));
     connect(task, SIGNAL(progress(qint64, qint64)), SLOT(changeProgress(qint64, qint64)));
 
+    m_is_multi_step = task->isMultiStep();
+    if(!m_is_multi_step){
+        ui->globalStatusLabel->setHidden(true);
+        ui->globalProgressBar->setHidden(true);
+    }
+
     // if this didn't connect to an already running task, invoke start
     if(!task->isRunning())
     {
@@ -152,14 +158,24 @@ void ProgressDialog::onTaskSucceeded()
 
 void ProgressDialog::changeStatus(const QString &status)
 {
-    ui->statusLabel->setText(status);
+    ui->statusLabel->setText(task->getStepStatus());
+    ui->globalStatusLabel->setText(status);
     updateSize();
 }
 
 void ProgressDialog::changeProgress(qint64 current, qint64 total)
 {
-    ui->taskProgressBar->setMaximum(total);
-    ui->taskProgressBar->setValue(current);
+    ui->globalProgressBar->setMaximum(total);
+    ui->globalProgressBar->setValue(current);
+
+    if(!m_is_multi_step){
+        ui->taskProgressBar->setMaximum(total);
+        ui->taskProgressBar->setValue(current);
+    }
+    else{
+        ui->taskProgressBar->setMaximum(task->getStepProgress());
+        ui->taskProgressBar->setValue(task->getStepTotalProgress());
+    }
 }
 
 void ProgressDialog::keyPressEvent(QKeyEvent *e)
diff --git a/launcher/ui/dialogs/ProgressDialog.h b/launcher/ui/dialogs/ProgressDialog.h
index b28ad4fa..0b4b78a4 100644
--- a/launcher/ui/dialogs/ProgressDialog.h
+++ b/launcher/ui/dialogs/ProgressDialog.h
@@ -19,6 +19,7 @@
 #include <memory>
 
 class Task;
+class SequentialTask;
 
 namespace Ui
 {
@@ -35,7 +36,7 @@ public:
 
     void updateSize();
 
-    int execWithTask(Task *task);
+    int execWithTask(Task* task);
     int execWithTask(std::unique_ptr<Task> &&task);
     int execWithTask(std::unique_ptr<Task> &task);
 
@@ -68,4 +69,6 @@ private:
     Ui::ProgressDialog *ui;
 
     Task *task;
+
+    bool m_is_multi_step = false;
 };
diff --git a/launcher/ui/dialogs/ProgressDialog.ui b/launcher/ui/dialogs/ProgressDialog.ui
index 04b8fef3..bf119a78 100644
--- a/launcher/ui/dialogs/ProgressDialog.ui
+++ b/launcher/ui/dialogs/ProgressDialog.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>ProgressDialog</class>
  <widget class="QDialog" name="ProgressDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>100</height>
-   </rect>
-  </property>
   <property name="minimumSize">
    <size>
     <width>400</width>
@@ -26,7 +18,27 @@
    <string>Please wait...</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="4" column="0">
+    <widget class="QPushButton" name="skipButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Skip</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0">
+    <widget class="QLabel" name="globalStatusLabel">
+     <property name="text">
+      <string>Global Task Status...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
     <widget class="QLabel" name="statusLabel">
      <property name="text">
       <string>Task Status...</string>
@@ -36,7 +48,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="3" column="0">
     <widget class="QProgressBar" name="taskProgressBar">
      <property name="value">
       <number>24</number>
@@ -46,16 +58,13 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QPushButton" name="skipButton">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="1" column="0">
+    <widget class="QProgressBar" name="globalProgressBar">
+     <property name="enabled">
+      <bool>true</bool>
      </property>
-     <property name="text">
-      <string>Skip</string>
+     <property name="value">
+      <number>24</number>
      </property>
     </widget>
    </item>
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