Task hub

1 files changed, 14 insertions, 13 deletions

diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index a912b9c07e..dc58861cab 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -38,6 +38,7 @@
 #include "projectexplorersettings.h"
 #include "target.h"
 #include "taskwindow.h"
+#include "taskhub.h"
 #include "buildconfiguration.h"
 
 #include <coreplugin/icore.h>
@@ -91,12 +92,10 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent)
     m_outputWindow = new CompileOutputWindow(this);
     pm->addObject(m_outputWindow);
 
-    m_taskWindow = new TaskWindow;
+    m_taskHub = pm->getObject<TaskHub>();
+    m_taskWindow = new TaskWindow(m_taskHub);
     pm->addObject(m_taskWindow);
 
-    m_taskWindow->addCategory(Constants::TASK_CATEGORY_COMPILE, tr("Compile", "Category for compiler isses listened under 'Build Issues'"));
-    m_taskWindow->addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM, tr("Build System", "Category for build system isses listened under 'Build Issues'"));
-
     connect(m_taskWindow, SIGNAL(tasksChanged()),
             this, SLOT(updateTaskCount()));
 
@@ -106,6 +105,12 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent)
             this, SLOT(finish()));
 }
 
+void BuildManager::extensionsInitialized()
+{
+    m_taskHub->addCategory(Constants::TASK_CATEGORY_COMPILE, tr("Compile", "Category for compiler isses listened under 'Build Issues'"));
+    m_taskHub->addCategory(Constants::TASK_CATEGORY_BUILDSYSTEM, tr("Build System", "Category for build system isses listened under 'Build Issues'"));
+}
+
 BuildManager::~BuildManager()
 {
     cancel();
@@ -155,7 +160,7 @@ void BuildManager::cancel()
                    this, SLOT(addToOutputWindow(QString, QTextCharFormat)));
         decrementActiveBuildSteps(m_currentBuildStep->buildConfiguration()->target()->project());
 
-        m_progressFutureInterface->setProgressValueAndText(m_progress*100, "Build canceled"); //TODO NBS fix in qtconcurrent
+        m_progressFutureInterface->setProgressValueAndText(m_progress*100, tr("Build canceled")); //TODO NBS fix in qtconcurrent
         clearBuildQueue();
     }
     return;
@@ -231,11 +236,6 @@ bool BuildManager::tasksAvailable() const
     return m_taskWindow->taskCount() > 0;
 }
 
-void BuildManager::gotoTaskWindow()
-{
-    m_taskWindow->popup(true);
-}
-
 void BuildManager::startBuildQueue()
 {
     if (m_buildQueue.isEmpty()) {
@@ -248,8 +248,8 @@ void BuildManager::startBuildQueue()
         m_progressFutureInterface = new QFutureInterface<void>;
         m_progressWatcher.setFuture(m_progressFutureInterface->future());
         m_outputWindow->clearContents();
-        m_taskWindow->clearTasks(Constants::TASK_CATEGORY_COMPILE);
-        m_taskWindow->clearTasks(Constants::TASK_CATEGORY_BUILDSYSTEM);
+        m_taskHub->clearTasks(Constants::TASK_CATEGORY_COMPILE);
+        m_taskHub->clearTasks(Constants::TASK_CATEGORY_BUILDSYSTEM);
         progressManager->setApplicationLabel("");
         Core::FutureProgress *progress = progressManager->addTask(m_progressFutureInterface->future(),
               tr("Build"),
@@ -283,7 +283,8 @@ void BuildManager::showBuildResults()
 void BuildManager::addToTaskWindow(const ProjectExplorer::Task &task)
 {
     m_outputWindow->registerPositionOf(task);
-    m_taskWindow->addTask(task);
+    // Distribute to all others
+    m_taskHub->addTask(task);
 }
 
 void BuildManager::addToOutputWindow(const QString &string, const QTextCharFormat &format)