NOISSUE Various changes from multiauth that are unrelated to it

application/widgets/ProgressWidget.cpp

@@ -0,0 +1,74 @@
+// Licensed under the Apache-2.0 license. See README.md for details.
+
+#include "ProgressWidget.h"
+
+#include <QProgressBar>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QEventLoop>
+
+#include "tasks/Task.h"
+
+ProgressWidget::ProgressWidget(QWidget *parent)
+	: QWidget(parent)
+{
+	m_label = new QLabel(this);
+	m_label->setWordWrap(true);
+	m_bar = new QProgressBar(this);
+	m_bar->setMinimum(0);
+	m_bar->setMaximum(100);
+	QVBoxLayout *layout = new QVBoxLayout(this);
+	layout->addWidget(m_label);
+	layout->addWidget(m_bar);
+	layout->addStretch();
+	setLayout(layout);
+}
+
+void ProgressWidget::start(std::shared_ptr<Task> task)
+{
+	if (m_task)
+	{
+		disconnect(m_task.get(), 0, this, 0);
+	}
+	m_task = task;
+	connect(m_task.get(), &Task::finished, this, &ProgressWidget::handleTaskFinish);
+	connect(m_task.get(), &Task::status, this, &ProgressWidget::handleTaskStatus);
+	connect(m_task.get(), &Task::progress, this, &ProgressWidget::handleTaskProgress);
+	connect(m_task.get(), &Task::destroyed, this, &ProgressWidget::taskDestroyed);
+	if (!m_task->isRunning())
+	{
+		QMetaObject::invokeMethod(m_task.get(), "start", Qt::QueuedConnection);
+	}
+}
+bool ProgressWidget::exec(std::shared_ptr<Task> task)
+{
+	QEventLoop loop;
+	connect(task.get(), &Task::finished, &loop, &QEventLoop::quit);
+	start(task);
+	if (task->isRunning())
+	{
+		loop.exec();
+	}
+	return task->successful();
+}
+
+void ProgressWidget::handleTaskFinish()
+{
+	if (!m_task->successful())
+	{
+		m_label->setText(m_task->failReason());
+	}
+}
+void ProgressWidget::handleTaskStatus(const QString &status)
+{
+	m_label->setText(status);
+}
+void ProgressWidget::handleTaskProgress(qint64 current, qint64 total)
+{
+	m_bar->setMaximum(total);
+	m_bar->setValue(current);
+}
+void ProgressWidget::taskDestroyed()
+{
+	m_task = nullptr;
+}

application/widgets/ProgressWidget.h

@@ -0,0 +1,32 @@
+// Licensed under the Apache-2.0 license. See README.md for details.
+
+#pragma once
+
+#include <QWidget>
+#include <memory>
+
+class Task;
+class QProgressBar;
+class QLabel;
+
+class ProgressWidget : public QWidget
+{
+	Q_OBJECT
+public:
+	explicit ProgressWidget(QWidget *parent = nullptr);
+
+public slots:
+	void start(std::shared_ptr<Task> task);
+	bool exec(std::shared_ptr<Task> task);
+
+private slots:
+	void handleTaskFinish();
+	void handleTaskStatus(const QString &status);
+	void handleTaskProgress(qint64 current, qint64 total);
+	void taskDestroyed();
+
+private:
+	QLabel *m_label;
+	QProgressBar *m_bar;
+	std::shared_ptr<Task> m_task;
+};