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

TaskProgress: Make is possible to set id for associated future progress

Browse Source 
Change-Id: I9e3e2038289a3e2f38030deb3e63dd69babb69ce
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-27 02:04:20 +01:00
parent ef065b8807
commit 565c56cd4a
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/progressmanager/taskprogress.cpp
View File

@@ -39,6 +39,7 @@ public:
QFutureWatcher<void> m_watcher; QFutureWatcher<void> m_watcher;
QFutureInterface<void> m_futureInterface; QFutureInterface<void> m_futureInterface;
QPointer<FutureProgress> m_futureProgress; QPointer<FutureProgress> m_futureProgress;
Id m_id;
bool m_isAutoStopOnCancel = true; bool m_isAutoStopOnCancel = true;
int m_halfLifeTimePerTask = 1000; // 1000 ms int m_halfLifeTimePerTask = 1000; // 1000 ms
QString m_displayName; QString m_displayName;
@@ -112,7 +113,7 @@ TaskProgress::TaskProgress(TaskTree *taskTree)
d->m_futureInterface.reportStarted(); d->m_futureInterface.reportStarted();
d->advanceProgress(0); d->advanceProgress(0);
const auto id = Id::fromString(d->m_displayName + ".action"); const Id id = d->m_id.isValid() ? d->m_id : Id::fromString(d->m_displayName + ".action");
d->m_futureProgress = ProgressManager::addTask(d->m_futureInterface.future(), d->m_futureProgress = ProgressManager::addTask(d->m_futureInterface.future(),
d->m_displayName, id); d->m_displayName, id);
d->m_futureProgress->setKeepOnFinish(d->m_keep); d->m_futureProgress->setKeepOnFinish(d->m_keep);
@@ -136,6 +137,11 @@ TaskProgress::TaskProgress(TaskTree *taskTree)
TaskProgress::~TaskProgress() = default; TaskProgress::~TaskProgress() = default;
void TaskProgress::setId(Utils::Id id)
{
d->m_id = id;
}
void TaskProgress::setAutoStopOnCancel(bool enable) void TaskProgress::setAutoStopOnCancel(bool enable)
{ {
d->m_isAutoStopOnCancel = enable; d->m_isAutoStopOnCancel = enable;

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

@@ -23,6 +23,7 @@ public:
TaskProgress(Utils::TaskTree *taskTree); // Makes TaskProgress a child of task tree TaskProgress(Utils::TaskTree *taskTree); // Makes TaskProgress a child of task tree
~TaskProgress() override; ~TaskProgress() override;
void setId(Utils::Id id);
void setAutoStopOnCancel(bool enable); // Default is true void setAutoStopOnCancel(bool enable); // Default is true
void setHalfLifeTimePerTask(int msecs); // Default is 1000 ms void setHalfLifeTimePerTask(int msecs); // Default is 1000 ms
void setDisplayName(const QString &name); void setDisplayName(const QString &name);