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

ProgressManager: Unify style of progress manager task descriptions

Browse Source 
Change-Id: I6826e66f00f47997c644c24d1b20f4a1ea53a8a2
(cherry picked from commit 36d8ec4f47)
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-06-24 12:16:16 +02:00
parent 63d2e0e4b5
commit 8da0742ae2
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/pchmanager.cpp
View File

@@ -184,7 +184,7 @@ void PchManager::updatePchInfo(ClangProjectSettings *cps,
QFuture<void> future = QtConcurrent::run(updateFunction, QFuture<void> future = QtConcurrent::run(updateFunction,
UpdateParams(customPchFile, projectParts)); UpdateParams(customPchFile, projectParts));
m_pchGenerationWatcher.setFuture(future); m_pchGenerationWatcher.setFuture(future);
Core::ProgressManager::addTask(future, tr("Precompiling..."), "Key.Tmp.Precompiling"); Core::ProgressManager::addTask(future, tr("Precompiling"), "Key.Tmp.Precompiling");
} }
namespace { namespace {

2
src/plugins/help/searchwidget.cpp
View File

@@ -198,7 +198,7 @@ void SearchWidget::indexingStarted()
m_progress = new QFutureInterface<void>(); m_progress = new QFutureInterface<void>();
Core::ProgressManager::addTask(m_progress->future(), tr("Indexing Documentation"), "Help.Indexer"); Core::ProgressManager::addTask(m_progress->future(), tr("Indexing Documentation"), "Help.Indexer");
m_progress->setProgressRange(0, 2); m_progress->setProgressRange(0, 2);
m_progress->setProgressValueAndText(1, tr("Indexing Documentation...")); m_progress->setProgressValueAndText(1, tr("Indexing Documentation"));
m_progress->reportStarted(); m_progress->reportStarted();
m_watcher.setFuture(m_progress->future()); m_watcher.setFuture(m_progress->future());

5
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -207,8 +207,9 @@ void UpdateInfoPlugin::parseUpdates()
return; return;
// add the finished task to the progress manager // add the finished task to the progress manager
d->updateInfoProgress = ProgressManager::addTask(d->lastCheckUpdateInfoTask, tr("Updates " d->updateInfoProgress
"available"), "Update.GetInfo", ProgressManager::KeepOnFinish); = ProgressManager::addTask(d->lastCheckUpdateInfoTask, tr("Updates Available"),
"Update.GetInfo", ProgressManager::KeepOnFinish);
d->updateInfoProgress->setKeepOnFinish(FutureProgress::KeepOnFinish); d->updateInfoProgress->setKeepOnFinish(FutureProgress::KeepOnFinish);
d->progressUpdateInfoButton = new UpdateInfoButton(); d->progressUpdateInfoButton = new UpdateInfoButton();