diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-03-31 19:25:01 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-01 10:47:50 -0700 |
| commit | b6452215c16f6b1ee45fea746f9498767e48d049 (patch) | |
| tree | f5744431139e973844cb8ca1c6915412772ee6ec /launcher/ui | |
| parent | f1028fa66d556b024765ba4e21ac76d4510a3e3e (diff) | |
| download | PrismLauncher-b6452215c16f6b1ee45fea746f9498767e48d049.tar.gz PrismLauncher-b6452215c16f6b1ee45fea746f9498767e48d049.tar.bz2 PrismLauncher-b6452215c16f6b1ee45fea746f9498767e48d049.zip | |
feat: add `details` signal to `Task`
feat: add details to mod pack downloading
feat: add logging rule sloading form `ligging.ini at data path root
feat: add `launcher.task` `launcher.task.net` and `launcher.task.net.[down|up]load` logging categories
fix: add new subtask progress to the end of the lay out not the beginning (cuts down on flickering)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/ui')
| -rw-r--r-- | launcher/ui/dialogs/ProgressDialog.cpp | 2 | ||||
| -rw-r--r-- | launcher/ui/widgets/ProgressWidget.cpp | 1 | ||||
| -rw-r--r-- | launcher/ui/widgets/SubTaskProgressBar.ui | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp index 7ab766e4..1937c553 100644 --- a/launcher/ui/dialogs/ProgressDialog.cpp +++ b/launcher/ui/dialogs/ProgressDialog.cpp @@ -133,9 +133,9 @@ int ProgressDialog::execWithTask(Task* task) connect(task, &Task::failed, this, &ProgressDialog::onTaskFailed); connect(task, &Task::succeeded, this, &ProgressDialog::onTaskSucceeded); connect(task, &Task::status, this, &ProgressDialog::changeStatus); + connect(task, &Task::details, this, &ProgressDialog::changeStatus); connect(task, &Task::stepProgress, this, &ProgressDialog::changeStepProgress); connect(task, &Task::progress, this, &ProgressDialog::changeProgress); - connect(task, &Task::aborted, this, &ProgressDialog::hide); connect(task, &Task::abortStatusChanged, ui->skipButton, &QPushButton::setEnabled); diff --git a/launcher/ui/widgets/ProgressWidget.cpp b/launcher/ui/widgets/ProgressWidget.cpp index f736af08..9181de7f 100644 --- a/launcher/ui/widgets/ProgressWidget.cpp +++ b/launcher/ui/widgets/ProgressWidget.cpp @@ -51,6 +51,7 @@ void ProgressWidget::watch(const Task* task) connect(m_task, &Task::finished, this, &ProgressWidget::handleTaskFinish); connect(m_task, &Task::status, this, &ProgressWidget::handleTaskStatus); + // TODO: should we connect &Task::details connect(m_task, &Task::progress, this, &ProgressWidget::handleTaskProgress); connect(m_task, &Task::destroyed, this, &ProgressWidget::taskDestroyed); diff --git a/launcher/ui/widgets/SubTaskProgressBar.ui b/launcher/ui/widgets/SubTaskProgressBar.ui index ceae5e26..5431eab6 100644 --- a/launcher/ui/widgets/SubTaskProgressBar.ui +++ b/launcher/ui/widgets/SubTaskProgressBar.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>597</width> - <height>61</height> + <width>312</width> + <height>86</height> </rect> </property> <property name="sizePolicy"> @@ -25,6 +25,9 @@ </property> <item> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0"> + <property name="spacing"> + <number>8</number> + </property> <item> <widget class="QLabel" name="statusLabel"> <property name="sizePolicy"> |