From 7bee4a65b98482201b78269472c7b432e2e3314c Mon Sep 17 00:00:00 2001 From: Pawel Polanski Date: Wed, 2 Feb 2011 13:33:06 +0100 Subject: [PATCH] Appending the text tooltip of the progress bar has been enabled --- src/plugins/projectexplorer/buildmanager.cpp | 13 ++++++++++++- src/plugins/projectexplorer/buildmanager.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index ba0fb7f287..e737957ac6 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -120,6 +120,8 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent) connect(&d->m_watcher, SIGNAL(progressValueChanged(int)), this, SLOT(progressChanged())); + connect(&d->m_watcher, SIGNAL(progressTextChanged(QString)), + this, SLOT(progressTextChanged())); connect(&d->m_watcher, SIGNAL(progressRangeChanged(int, int)), this, SLOT(progressChanged())); @@ -370,10 +372,19 @@ void BuildManager::progressChanged() int range = d->m_watcher.progressMaximum() - d->m_watcher.progressMinimum(); if (range != 0) { int percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range; - d->m_progressFutureInterface->setProgressValue(d->m_progress * 100 + percent); + d->m_progressFutureInterface->setProgressValueAndText(d->m_progress * 100 + percent, msgProgress(d->m_progress, d->m_maxProgress) + "\n" + d->m_watcher.progressText()); } } +void BuildManager::progressTextChanged() +{ + int range = d->m_watcher.progressMaximum() - d->m_watcher.progressMinimum(); + int percent = 0; + if (range != 0) + percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range; + d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100 + percent, msgProgress(d->m_progress, d->m_maxProgress) + "\n" + d->m_watcher.progressText()); +} + void BuildManager::nextStep() { if (!d->m_buildQueue.empty()) { diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index 93c9ae21e7..fe1862d6a0 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -89,6 +89,7 @@ private slots: void nextBuildQueue(); void progressChanged(); + void progressTextChanged(); void emitCancelMessage(); void showBuildResults(); void updateTaskCount(); -- 2.11.0