From 8e04e42320a7a1bd2df837fdba52da55dfd5b320 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 10 Feb 2010 17:10:43 +0100
Subject: [PATCH] Split updateToolBarActions again.
And rename it to updateRunActions() again, since that function is
only called if the run actions actually change.
---
.../projectexplorer/projectexplorer.cpp | 21 +++++++++----------
src/plugins/projectexplorer/projectexplorer.h | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 07d7cc18de2..030280e75f2 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1285,7 +1285,7 @@ void ProjectExplorerPlugin::startRunControl(RunControl *runControl, const QStrin
d->m_debuggingRunControl = runControl;
runControl->start();
- updateToolBarActions();
+ updateRunActions();
}
void ProjectExplorerPlugin::buildQueueFinished(bool success)
@@ -1390,7 +1390,9 @@ void ProjectExplorerPlugin::updateActions()
d->m_cleanSessionAction->setEnabled(hasProjects && !building);
d->m_cancelBuildAction->setEnabled(building);
- updateToolBarActions();
+ d->m_projectSelectorAction->setEnabled(!session()->projects().isEmpty());
+
+ updateRunActions();
}
// NBS TODO check projectOrder()
@@ -1585,7 +1587,7 @@ void ProjectExplorerPlugin::runProjectImpl(Project *pro, QString mode)
configurations << pro->activeTarget()->activeBuildConfiguration();
d->m_buildManager->buildProjects(configurations);
- updateToolBarActions();
+ updateRunActions();
}
} else {
// TODO this ignores RunConfiguration::isEnabled()
@@ -1648,7 +1650,7 @@ void ProjectExplorerPlugin::runControlFinished()
if (sender() == d->m_debuggingRunControl)
d->m_debuggingRunControl = 0;
- updateToolBarActions();
+ updateRunActions();
}
void ProjectExplorerPlugin::startupProjectChanged()
@@ -1660,7 +1662,7 @@ void ProjectExplorerPlugin::startupProjectChanged()
if (previousStartupProject) {
disconnect(previousStartupProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
- this, SLOT(updateToolBarActions()));
+ this, SLOT(updateRunActions()));
foreach (Target *t, previousStartupProject->targets())
disconnect(t, SIGNAL(activeRunConfigurationChanged(ProjectExplorer::RunConfiguration*)),
this, SLOT(updateActions()));
@@ -1670,13 +1672,13 @@ void ProjectExplorerPlugin::startupProjectChanged()
if (project) {
connect(project, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
- this, SLOT(updateToolBarActions()));
+ this, SLOT(updateRunActions()));
foreach (Target *t, project->targets())
connect(t, SIGNAL(activeRunConfigurationChanged(ProjectExplorer::RunConfiguration*)),
this, SLOT(updateActions()));
}
- updateToolBarActions();
+ updateRunActions();
}
// NBS TODO implement more than one runner
@@ -1690,7 +1692,7 @@ IRunControlFactory *ProjectExplorerPlugin::findRunControlFactory(RunConfiguratio
return 0;
}
-void ProjectExplorerPlugin::updateToolBarActions()
+void ProjectExplorerPlugin::updateRunActions()
{
const Project *project = startupProject();
@@ -1711,9 +1713,6 @@ void ProjectExplorerPlugin::updateToolBarActions()
d->m_runActionContextMenu->setEnabled(canRun && !building);
d->m_debugAction->setEnabled(canDebug && !building);
-
- d->m_projectSelectorAction->setEnabled(!session()->projects().isEmpty());
-
}
void ProjectExplorerPlugin::cancelBuild()
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 5858c5d6523..c3a0a38e74e 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -210,7 +210,7 @@ private slots:
void runControlFinished();
void startupProjectChanged(); // Calls updateRunAction
- void updateToolBarActions();
+ void updateRunActions();
void addToApplicationOutputWindow(RunControl *, const QString &line);
void addToApplicationOutputWindowInline(RunControl *, const QString &line);
--
GitLab