diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index b20293a0a76..67932827c0d 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -33,6 +33,7 @@ #include "analyzerplugin.h" #include "ianalyzertool.h" #include "analyzersettings.h" +#include "analyzerruncontrol.h" #include #include @@ -730,18 +731,6 @@ void AnalyzerManager::showPermanentStatusMessage(const QString &message) showStatusMessage(message, -1); } -QString AnalyzerManager::msgToolStarted(const QString &name) -{ - return tr("Tool \"%1\" started...").arg(name); -} - -QString AnalyzerManager::msgToolFinished(const QString &name, int issuesFound) -{ - return issuesFound ? - tr("Tool \"%1\" finished, %n issues were found.", 0, issuesFound).arg(name) : - tr("Tool \"%1\" finished, no issues were found.").arg(name); -} - void AnalyzerManager::showMode() { if (m_instance->d->m_mode) @@ -774,9 +763,14 @@ AnalyzerRunControl *AnalyzerManager::createRunControl( ProjectExplorer::RunMode runMode, QString *errorMessage) { - foreach (IAnalyzerTool *tool, m_instance->d->m_tools) - if (tool->runMode() == runMode) - return tool->createRunControl(sp, runConfiguration); + foreach (IAnalyzerTool *tool, m_instance->d->m_tools) { + if (tool->runMode() == runMode) { + AnalyzerRunControl *rc = tool->createRunControl(sp, runConfiguration); + showStatusMessage(tr("Tool \"%1\" started...").arg(rc->displayName())); + return rc; + } + } + if (errorMessage) *errorMessage = tr("No analyzer tool selected."); return 0; diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h index d27cfe659c3..efa59153a27 100644 --- a/src/plugins/analyzerbase/analyzermanager.h +++ b/src/plugins/analyzerbase/analyzermanager.h @@ -85,9 +85,6 @@ public: static void stopTool(); // Convenience functions. - static QString msgToolStarted(const QString &name); - static QString msgToolFinished(const QString &name, int issuesFound); - static void showStatusMessage(const QString &message, int timeoutMS = 10000); static void showPermanentStatusMessage(const QString &message); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index c1611cf63d3..1b2ba3d961e 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -593,8 +593,6 @@ AnalyzerRunControl *CallgrindToolPrivate::createRunControl(const AnalyzerStartPa rc->setToggleCollectFunction(m_toggleCollectFunction); m_toggleCollectFunction.clear(); - AnalyzerManager::showStatusMessage(AnalyzerManager::msgToolStarted(q->displayName())); - QTC_ASSERT(m_visualisation, return rc); // apply project settings diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 273d1ef45f2..323d8eaf4f1 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -460,7 +460,6 @@ AnalyzerRunControl *MemcheckTool::createRunControl(const AnalyzerStartParameters connect(engine, SIGNAL(internalParserError(QString)), this, SLOT(internalParserError(QString))); connect(engine, SIGNAL(finished()), this, SLOT(finished())); - AnalyzerManager::showStatusMessage(AnalyzerManager::msgToolStarted(displayName())); return engine; } @@ -545,11 +544,14 @@ void MemcheckTool::updateErrorFilter() void MemcheckTool::finished() { - const int n = m_errorModel->rowCount(); - m_goBack->setEnabled(n > 1); - m_goNext->setEnabled(n > 1); - const QString msg = AnalyzerManager::msgToolFinished(displayName(), n); - AnalyzerManager::showStatusMessage(msg); + const int issuesFound = m_errorModel->rowCount(); + m_goBack->setEnabled(issuesFound > 1); + m_goNext->setEnabled(issuesFound > 1); + AnalyzerManager::showStatusMessage((issuesFound > 0 + ? AnalyzerManager::tr("Tool \"%1\" finished, %n issues were found.", 0, issuesFound) + : AnalyzerManager::tr("Tool \"%1\" finished, no issues were found.")) + .arg(displayName())); + setBusyCursor(false); }