feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PluginInstallWizard: Reuse TaskTreeRunner

Browse Source 
Change-Id: I66e7909d1ec0ce04ca250f4bda42bf9b2630966f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-13 16:46:53 +01:00
parent a94c4dc1fd
commit 3a252ef86c
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/coreplugin/plugininstallwizard.cpp
View File

@@ -10,6 +10,8 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h> #include <extensionsystem/pluginspec.h>
#include <solutions/tasking/tasktreerunner.h>
#include <utils/async.h> #include <utils/async.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
@@ -189,7 +191,7 @@ public:
m_label->setWordWrap(true); m_label->setWordWrap(true);
m_cancelButton = new QPushButton(Tr::tr("Cancel")); m_cancelButton = new QPushButton(Tr::tr("Cancel"));
connect(m_cancelButton, &QPushButton::clicked, this, [this] { connect(m_cancelButton, &QPushButton::clicked, this, [this] {
m_taskTree.reset(); m_taskTreeRunner.reset();
m_cancelButton->setVisible(false); m_cancelButton->setVisible(false);
m_label->setType(InfoLabel::Information); m_label->setType(InfoLabel::Information);
m_label->setText(Tr::tr("Canceled.")); m_label->setText(Tr::tr("Canceled."));
@@ -260,28 +262,21 @@ public:
UnarchiverTask(onUnarchiverSetup, onUnarchiverError, CallDoneIf::Error), UnarchiverTask(onUnarchiverSetup, onUnarchiverError, CallDoneIf::Error),
AsyncTask<ArchiveIssue>(onCheckerSetup, onCheckerDone, CallDoneIf::Success) AsyncTask<ArchiveIssue>(onCheckerSetup, onCheckerDone, CallDoneIf::Success)
}; };
m_taskTree.reset(new TaskTree(root));
connect(m_taskTree.get(), &TaskTree::done, this, [this] {
m_cancelButton->setVisible(false);
m_taskTree.release()->deleteLater();
});
m_cancelButton->setVisible(true); m_cancelButton->setVisible(true);
m_taskTree->start(); m_taskTreeRunner.start(root, {}, [this](DoneWith) { m_cancelButton->setVisible(false); });
} }
void cleanupPage() final void cleanupPage() final
{ {
// back button pressed // back button pressed
m_taskTree.reset(); m_taskTreeRunner.reset();
m_tempDir.reset(); m_tempDir.reset();
} }
bool isComplete() const final { return m_isComplete; } bool isComplete() const final { return m_isComplete; }
std::unique_ptr<TemporaryDirectory> m_tempDir; std::unique_ptr<TemporaryDirectory> m_tempDir;
std::unique_ptr<TaskTree> m_taskTree; TaskTreeRunner m_taskTreeRunner;
InfoLabel *m_label = nullptr; InfoLabel *m_label = nullptr;
QPushButton *m_cancelButton = nullptr; QPushButton *m_cancelButton = nullptr;
QTextEdit *m_output = nullptr; QTextEdit *m_output = nullptr;