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

ProcessProgress: Add setKeepOnFinish()

Browse Source 
Change-Id: I327cf309081d432b11a85bd98bc9f42de65313da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-04 16:12:55 +01:00
parent fdb9cb905b
commit 45c98836a9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/progressmanager/processprogress.cpp
View File

@@ -28,7 +28,9 @@ public:
ProgressParser m_parser = {}; ProgressParser m_parser = {};
QFutureWatcher<void> m_watcher; QFutureWatcher<void> m_watcher;
QFutureInterface<void> m_futureInterface; QFutureInterface<void> m_futureInterface;
QPointer<FutureProgress> m_futureProgress;
QString m_displayName; QString m_displayName;
FutureProgress::KeepOnFinishType m_keep = FutureProgress::HideOnFinish;
}; };
ProcessProgressPrivate::ProcessProgressPrivate(ProcessProgress *progress, QtcProcess *process) ProcessProgressPrivate::ProcessProgressPrivate(ProcessProgress *progress, QtcProcess *process)
@@ -91,11 +93,12 @@ ProcessProgress::ProcessProgress(QtcProcess *process)
const QString name = d->displayName(); const QString name = d->displayName();
const auto id = Id::fromString(name + ".action"); const auto id = Id::fromString(name + ".action");
if (d->m_parser) { if (d->m_parser) {
ProgressManager::addTask(d->m_futureInterface.future(), name, id); d->m_futureProgress = ProgressManager::addTask(d->m_futureInterface.future(), name, id);
} else { } else {
ProgressManager::addTimedTask(d->m_futureInterface, name, id, d->m_futureProgress = ProgressManager::addTimedTask(d->m_futureInterface, name, id,
qMax(2, d->m_process->timeoutS() / 5)); qMax(2, d->m_process->timeoutS() / 5));
} }
d->m_futureProgress->setKeepOnFinish(d->m_keep);
}); });
connect(d->m_process, &QtcProcess::done, this, [this] { connect(d->m_process, &QtcProcess::done, this, [this] {
if (d->m_process->result() != ProcessResult::FinishedWithSuccess) if (d->m_process->result() != ProcessResult::FinishedWithSuccess)
@@ -109,6 +112,13 @@ void ProcessProgress::setDisplayName(const QString &name)
d->m_displayName = name; d->m_displayName = name;
} }
void ProcessProgress::setKeepOnFinish(FutureProgress::KeepOnFinishType keepType)
{
d->m_keep = keepType;
if (d->m_futureProgress)
d->m_futureProgress->setKeepOnFinish(d->m_keep);
}
void ProcessProgress::setProgressParser(const ProgressParser &parser) void ProcessProgress::setProgressParser(const ProgressParser &parser)
{ {
if (d->m_parser) { if (d->m_parser) {

1
src/plugins/coreplugin/progressmanager/processprogress.h
View File

@@ -26,6 +26,7 @@ public:
ProcessProgress(Utils::QtcProcess *process); // Makes ProcessProgress a child of process ProcessProgress(Utils::QtcProcess *process); // Makes ProcessProgress a child of process
void setDisplayName(const QString &name); void setDisplayName(const QString &name);
void setKeepOnFinish(FutureProgress::KeepOnFinishType keepType);
void setProgressParser(const ProgressParser &parser); void setProgressParser(const ProgressParser &parser);
private: private: