From eef9f27baefb3315918d7d7a3192ff6cf14190f5 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 22 Jun 2009 16:47:22 +0200
Subject: [PATCH] Remove "Go to Task Window" from the build menu
This looks like a relict from a much earlier version.
---
.../projectexplorer/projectexplorer.cpp | 24 -------------------
src/plugins/projectexplorer/projectexplorer.h | 2 --
.../projectexplorerconstants.h | 2 --
3 files changed, 28 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index bbab5eca3bf..bf81c1fabdf 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -196,8 +196,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
this, SLOT(buildStateChanged(ProjectExplorer::Project *)));
connect(m_buildManager, SIGNAL(buildQueueFinished(bool)),
this, SLOT(buildQueueFinished(bool)));
- connect(m_buildManager, SIGNAL(tasksChanged()),
- this, SLOT(updateTaskActions()));
addAutoReleasedObject(new CoreListenerCheckingForRunningBuild(m_buildManager));
@@ -292,7 +290,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mbuild->appendGroup(Constants::G_BUILD_PROJECT);
mbuild->appendGroup(Constants::G_BUILD_OTHER);
mbuild->appendGroup(Constants::G_BUILD_RUN);
- mbuild->appendGroup(Constants::G_BUILD_TASK);
mbuild->appendGroup(Constants::G_BUILD_CANCEL);
msessionContextMenu->appendGroup(Constants::G_SESSION_BUILD);
@@ -386,11 +383,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mbuild->addAction(cmd, Constants::G_BUILD_RUN);
mproject->addAction(cmd, Constants::G_PROJECT_RUN);
- sep = new QAction(this);
- sep->setSeparator(true);
- cmd = am->registerAction(sep, QLatin1String("ProjectExplorer.Task.Sep"), globalcontext);
- mbuild->addAction(cmd, Constants::G_BUILD_TASK);
-
sep = new QAction(this);
sep->setSeparator(true);
cmd = am->registerAction(sep, QLatin1String("ProjectExplorer.CancelBuild.Sep"), globalcontext);
@@ -576,13 +568,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd = am->registerAction(m_runActionContextMenu, Constants::RUNCONTEXTMENU, globalcontext);
mproject->addAction(cmd, Constants::G_PROJECT_RUN);
- // jump to next task
- m_taskAction = new QAction(tr("Go to Task Window"), this);
- m_taskAction->setIcon(QIcon(Core::Constants::ICON_NEXT));
- cmd = am->registerAction(m_taskAction, Constants::GOTOTASKWINDOW, globalcontext);
- // FIXME: Eike, look here! cmd->setDefaultKeySequence(QKeySequence(tr("F9")));
- mbuild->addAction(cmd, Constants::G_BUILD_TASK);
-
// cancel build action
m_cancelBuildAction = new QAction(tr("Cancel Build"), this);
cmd = am->registerAction(m_cancelBuildAction, Constants::CANCELBUILD, globalcontext);
@@ -691,7 +676,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
connect(m_debugAction, SIGNAL(triggered()), this, SLOT(debugProject()));
connect(m_unloadAction, SIGNAL(triggered()), this, SLOT(unloadProject()));
connect(m_clearSession, SIGNAL(triggered()), this, SLOT(clearSession()));
- connect(m_taskAction, SIGNAL(triggered()), this, SLOT(goToTaskWindow()));
connect(m_addNewFileAction, SIGNAL(triggered()), this, SLOT(addNewFile()));
connect(m_addExistingFilesAction, SIGNAL(triggered()), this, SLOT(addExistingFiles()));
connect(m_openFileAction, SIGNAL(triggered()), this, SLOT(openFile()));
@@ -1214,11 +1198,6 @@ void ProjectExplorerPlugin::buildQueueFinished(bool success)
m_runMode = QString::null;
}
-void ProjectExplorerPlugin::updateTaskActions()
-{
- m_taskAction->setEnabled(m_buildManager->tasksAvailable());
-}
-
void ProjectExplorerPlugin::setCurrent(Project *project, QString filePath, Node *node)
{
if (debug)
@@ -1310,11 +1289,8 @@ void ProjectExplorerPlugin::updateActions()
m_cancelBuildAction->setEnabled(building);
updateRunAction();
-
- updateTaskActions();
}
-
// NBS TODO check projectOrder()
// what we want here is all the projects pro depends on
QStringList ProjectExplorerPlugin::allFilesWithDependencies(Project *pro)
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 3b6cb1ef65e..2b5bf46676f 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -195,7 +195,6 @@ private slots:
void addToApplicationOutputWindow(RunControl *, const QString &line);
void addToApplicationOutputWindowInline(RunControl *, const QString &line);
void addErrorToApplicationOutputWindow(RunControl *, const QString &error);
- void updateTaskActions();
void loadProject(const QString &project) { openProject(project); }
void currentModeChanged(Core::IMode *mode);
@@ -244,7 +243,6 @@ private:
QAction *m_runActionContextMenu;
QAction *m_cancelBuildAction;
QAction *m_debugAction;
- QAction *m_taskAction;
QAction *m_addNewFileAction;
QAction *m_addExistingFilesAction;
QAction *m_openFileAction;
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 899cb3cea34..1e3fea3fa2f 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -62,7 +62,6 @@ const char * const STOP = "ProjectExplorer.Stop";
const char * const DEBUG = "ProjectExplorer.Debug";
const char * const DEPENDENCIES = "ProjectExplorer.Dependencies";
const char * const FINDINALLPROJECTS = "ProjectExplorer.FindInAllProjects";
-const char * const GOTOTASKWINDOW = "ProjectExplorer.GoToTaskWindow";
const char * const SHOWPROPERTIES = "ProjectExplorer.ShowProperties";
const char * const ADDNEWFILE = "ProjectExplorer.AddNewFile";
const char * const ADDEXISTINGFILES = "ProjectExplorer.AddExistingFiles";
@@ -101,7 +100,6 @@ const char * const G_BUILD_SESSION = "ProjectExplorer.Group.BuildSession";
const char * const G_BUILD_PROJECT = "ProjectExplorer.Group.Build";
const char * const G_BUILD_OTHER = "ProjectExplorer.Group.Other";
const char * const G_BUILD_RUN = "ProjectExplorer.Group.Run";
-const char * const G_BUILD_TASK = "ProjectExplorer.Group.BuildTask";
const char * const G_BUILD_CANCEL = "ProjectExplorer.Group.BuildCancel";
// toolbar groups
--
GitLab