forked from qt-creator/qt-creator
ProjectExplorer: Make missing command more obvious
In custom process steps, instead of showing ''. Change-Id: I6e3cd1eefa9f41c787e7da4ab917668e23c3d662 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
#include <utils/macroexpander.h>
|
#include <utils/macroexpander.h>
|
||||||
#include <utils/qtcprocess.h>
|
#include <utils/qtcprocess.h>
|
||||||
|
#include <utils/theme/theme.h>
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|
||||||
@@ -169,8 +170,19 @@ QString ProcessParameters::prettyArguments() const
|
|||||||
return args.toString();
|
return args.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static QString invalidCommandMessage(const QString &displayName)
|
||||||
|
{
|
||||||
|
return QString("<b>%1:</b> <font color='%3'>%2</font>")
|
||||||
|
.arg(displayName,
|
||||||
|
QtcProcess::tr("Invalid command"),
|
||||||
|
creatorTheme()->color(Theme::TextColorError).name());
|
||||||
|
}
|
||||||
|
|
||||||
QString ProcessParameters::summary(const QString &displayName) const
|
QString ProcessParameters::summary(const QString &displayName) const
|
||||||
{
|
{
|
||||||
|
if (m_commandMissing)
|
||||||
|
return invalidCommandMessage(displayName);
|
||||||
|
|
||||||
return QString::fromLatin1("<b>%1:</b> %2 %3")
|
return QString::fromLatin1("<b>%1:</b> %2 %3")
|
||||||
.arg(displayName,
|
.arg(displayName,
|
||||||
Utils::QtcProcess::quoteArg(prettyCommand()),
|
Utils::QtcProcess::quoteArg(prettyCommand()),
|
||||||
@@ -179,6 +191,9 @@ QString ProcessParameters::summary(const QString &displayName) const
|
|||||||
|
|
||||||
QString ProcessParameters::summaryInWorkdir(const QString &displayName) const
|
QString ProcessParameters::summaryInWorkdir(const QString &displayName) const
|
||||||
{
|
{
|
||||||
|
if (m_commandMissing)
|
||||||
|
return invalidCommandMessage(displayName);
|
||||||
|
|
||||||
return QString::fromLatin1("<b>%1:</b> %2 %3 in %4")
|
return QString::fromLatin1("<b>%1:</b> %2 %3 in %4")
|
||||||
.arg(displayName,
|
.arg(displayName,
|
||||||
Utils::QtcProcess::quoteArg(prettyCommand()),
|
Utils::QtcProcess::quoteArg(prettyCommand()),
|
||||||
|
|||||||
Reference in New Issue
Block a user