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

RemoteLinux: Also decorate empty/invalid targets with device name

Browse Source 
Change-Id: Iff9f80490ba3a59e0c17b28acd2376cfc0bf9d87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-02-15 16:52:50 +01:00
parent a3154bf299
commit 231a9d2c58
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,12 +450,20 @@ const QList<IRunConfigurationFactory *> IRunConfigurationFactory::allRunConfigur
QString IRunConfigurationFactory::decoratedTargetName(const QString targetName, Target *target) QString IRunConfigurationFactory::decoratedTargetName(const QString targetName, Target *target)
{ {
QString displayName = QFileInfo(targetName).completeBaseName(); QString displayName;
if (!targetName.isEmpty())
displayName = QFileInfo(targetName).completeBaseName();
Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target->kit()); Core::Id devType = DeviceTypeKitInformation::deviceTypeId(target->kit());
if (devType != Constants::DESKTOP_DEVICE_TYPE) { if (devType != Constants::DESKTOP_DEVICE_TYPE) {
if (IDevice::ConstPtr dev = DeviceKitInformation::device(target->kit())) if (IDevice::ConstPtr dev = DeviceKitInformation::device(target->kit())) {
//: Shown in Run configuration, Add menu: "name of runnable (on device name)" if (displayName.isEmpty()) {
displayName = tr("%1 (on %2)").arg(displayName, dev->displayName()); //: Shown in Run configuration if no executable is given, %1 is device name
displayName = tr("Run on %1").arg(dev->displayName());
} else {
//: Shown in Run configuration, Add menu: "name of runnable (on device name)"
displayName = tr("%1 (on %2)").arg(displayName, dev->displayName());
}
}
} }
return displayName; return displayName;
} }

7
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
View File

@@ -155,12 +155,9 @@ bool RemoteLinuxRunConfiguration::fromMap(const QVariantMap &map)
return true; return true;
} }
QString RemoteLinuxRunConfiguration::defaultDisplayName() QString RemoteLinuxRunConfiguration::defaultDisplayName() const
{ {
if (!d->targetName.isEmpty()) return IRunConfigurationFactory::decoratedTargetName(d->targetName, target());
return IRunConfigurationFactory::decoratedTargetName(d->targetName, target());
//: Remote Linux run configuration default display name
return tr("Run on Remote Device");
} }
QString RemoteLinuxRunConfiguration::arguments() const QString RemoteLinuxRunConfiguration::arguments() const

2
src/plugins/remotelinux/remotelinuxrunconfiguration.h
View File

@@ -80,7 +80,7 @@ protected:
QString extraId() const override; QString extraId() const override;
private: private:
QString defaultDisplayName(); QString defaultDisplayName() const;
void handleBuildSystemDataUpdated(); void handleBuildSystemDataUpdated();
Internal::RemoteLinuxRunConfigurationPrivate * const d; Internal::RemoteLinuxRunConfigurationPrivate * const d;