Skip to content
Snippets Groups Projects
Commit 21b26a79 authored by Lasse Holmstedt's avatar Lasse Holmstedt
Browse files

Show different tooltips for run/debug actions when no project selected

Task-number: QTCREATOR-191
Reviewed-by: dt
parent 0e163256
No related branches found
No related tags found
No related merge requests found
...@@ -630,6 +630,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ...@@ -630,6 +630,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
runIcon.addFile(Constants::ICON_RUN_SMALL); runIcon.addFile(Constants::ICON_RUN_SMALL);
d->m_runAction = new QAction(runIcon, tr("Run"), this); d->m_runAction = new QAction(runIcon, tr("Run"), this);
cmd = am->registerAction(d->m_runAction, Constants::RUN, globalcontext); cmd = am->registerAction(d->m_runAction, Constants::RUN, globalcontext);
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+R"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+R")));
mbuild->addAction(cmd, Constants::G_BUILD_RUN); mbuild->addAction(cmd, Constants::G_BUILD_RUN);
...@@ -1727,22 +1729,31 @@ void ProjectExplorerPlugin::updateRunActions() ...@@ -1727,22 +1729,31 @@ void ProjectExplorerPlugin::updateRunActions()
if (!project || if (!project ||
!project->activeTarget() || !project->activeTarget() ||
!project->activeTarget()->activeRunConfiguration()) { !project->activeTarget()->activeRunConfiguration()) {
d->m_runAction->setToolTip(tr("Cannot run without a project."));
d->m_debugAction->setToolTip(tr("Cannot debug without a project."));
d->m_runAction->setEnabled(false); d->m_runAction->setEnabled(false);
d->m_debugAction->setEnabled(false); d->m_debugAction->setEnabled(false);
return; return;
} }
d->m_runAction->setToolTip(QString());
d->m_debugAction->setToolTip(QString());
bool canRun = findRunControlFactory(project->activeTarget()->activeRunConfiguration(), ProjectExplorer::Constants::RUNMODE) bool canRun = findRunControlFactory(project->activeTarget()->activeRunConfiguration(), ProjectExplorer::Constants::RUNMODE)
&& project->activeTarget()->activeRunConfiguration()->isEnabled(); && project->activeTarget()->activeRunConfiguration()->isEnabled();
const bool canDebug = !d->m_debuggingRunControl && findRunControlFactory(project->activeTarget()->activeRunConfiguration(), ProjectExplorer::Constants::DEBUGMODE) const bool canDebug = !d->m_debuggingRunControl && findRunControlFactory(project->activeTarget()->activeRunConfiguration(), ProjectExplorer::Constants::DEBUGMODE)
&& project->activeTarget()->activeRunConfiguration()->isEnabled(); && project->activeTarget()->activeRunConfiguration()->isEnabled();
const bool building = d->m_buildManager->isBuilding(); const bool building = d->m_buildManager->isBuilding();
d->m_runAction->setEnabled(canRun && !building); d->m_runAction->setEnabled(canRun && !building);
canRun = d->m_currentProject && findRunControlFactory(d->m_currentProject->activeTarget()->activeRunConfiguration(), ProjectExplorer::Constants::RUNMODE); canRun = d->m_currentProject && findRunControlFactory(d->m_currentProject->activeTarget()->activeRunConfiguration(), ProjectExplorer::Constants::RUNMODE);
d->m_runActionContextMenu->setEnabled(canRun && !building); d->m_runActionContextMenu->setEnabled(canRun && !building);
d->m_debugAction->setEnabled(canDebug && !building); d->m_debugAction->setEnabled(canDebug && !building);
} }
void ProjectExplorerPlugin::cancelBuild() void ProjectExplorerPlugin::cancelBuild()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment