feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update run configuration after device change

Browse Source 
The run configuration name defaults to "<executable> (on <device>)".
When another device is selected e.g. using the MiniProjectTargetSelector
or Kits->Device option, the <device> part in run configuration name is
not updated and keeps referring to the initially selected device.

Change-Id: Idda828b7f33b754d3b50268d7417c9a2790db30e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Sergey Levin
2020-02-10 13:48:05 +03:00
parent 5c1cbf6b3f
commit 4d1b7d4c3d
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -106,7 +106,7 @@ public:
return p->displayName();
if (const auto t = qobject_cast<Target *>(object()))
return t->displayName();
return static_cast<ProjectConfiguration *>(object())->displayName();
return static_cast<ProjectConfiguration *>(object())->expandedDisplayName();
}
QString displayName() const
@@ -1481,7 +1481,7 @@ void MiniProjectTargetSelector::updateActionAndSummary()
deployConfig = dc->displayName();
if (RunConfiguration *rc = target->activeRunConfiguration())
runConfig = rc->displayName();
runConfig = rc->expandedDisplayName();
targetToolTipText = target->overlayIconToolTip();
targetIcon = createCenteredIcon(target->icon(), target->overlayIcon());
@@ -1530,7 +1530,7 @@ void MiniProjectTargetSelector::updateSummary()
activeTarget->activeDeployConfiguration()->displayName()));
if (!m_listWidgets[RUN]->isVisibleTo(this) && activeTarget->activeRunConfiguration())
summary.append(tr("Run: <b>%1</b><br/>").arg(
activeTarget->activeRunConfiguration()->displayName()));
activeTarget->activeRunConfiguration()->expandedDisplayName()));
} else if (startupProject->needsConfiguration()) {
summary = tr("<style type=text/css>"
"a:link {color: rgb(128, 128, 255, 240);}</style>"

5
src/plugins/projectexplorer/projectconfiguration.cpp
View File

@@ -144,3 +144,8 @@ Utils::Id ProjectExplorer::idFromMap(const QVariantMap &map)
{
return Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
}
QString ProjectConfiguration::expandedDisplayName() const
{
return m_target->macroExpander()->expand(m_displayName.value());
}

1
src/plugins/projectexplorer/projectconfiguration.h
View File

@@ -56,6 +56,7 @@ public:
Utils::Id id() const;
QString displayName() const { return m_displayName.value(); }
QString expandedDisplayName() const;
bool usesDefaultDisplayName() const { return m_displayName.usesDefaultValue(); }
void setDisplayName(const QString &name);
void setDefaultDisplayName(const QString &name);

2
src/plugins/projectexplorer/projectconfigurationmodel.cpp
View File

@@ -116,7 +116,7 @@ QVariant ProjectConfigurationModel::data(const QModelIndex &index, int role) con
if (role == Qt::DisplayRole) {
const int row = index.row();
if (row < m_projectConfigurations.size())
return m_projectConfigurations.at(row)->displayName();
return m_projectConfigurations.at(row)->expandedDisplayName();
}
return QVariant();

4
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -429,10 +429,10 @@ QString RunConfigurationFactory::decoratedTargetName(const QString &targetName,
if (IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit())) {
if (displayName.isEmpty()) {
//: Shown in Run configuration if no executable is given, %1 is device name
displayName = RunConfiguration::tr("Run on %1").arg(dev->displayName());
displayName = RunConfiguration::tr("Run on %{Device:Name}");
} else {
//: Shown in Run configuration, Add menu: "name of runnable (on device name)"
displayName = RunConfiguration::tr("%1 (on %2)").arg(displayName, dev->displayName());
displayName = RunConfiguration::tr("%1 (on %{Device:Name})").arg(displayName);
}
}
}