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

VcsCommand: Add method to set the display name of a command

Browse Source 
Change-Id: Ie8b34de88d23a279c17e89497e177bc1b8f31255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-04-27 12:18:27 +02:00
parent b3a8444c30
commit b5090ddde4
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -91,6 +91,7 @@ public:
VcsCommandPrivate(const QString &workingDirectory, const QProcessEnvironment &environment); VcsCommandPrivate(const QString &workingDirectory, const QProcessEnvironment &environment);
~VcsCommandPrivate(); ~VcsCommandPrivate();
QString m_displayName;
const QString m_workingDirectory; const QString m_workingDirectory;
const QProcessEnvironment m_environment; const QProcessEnvironment m_environment;
QVariant m_cookie; QVariant m_cookie;
@@ -161,6 +162,28 @@ VcsCommand::~VcsCommand()
delete d; delete d;
} }
QString VcsCommand::displayName() const
{
if (!d->m_displayName.isEmpty())
return d->m_displayName;
if (!d->m_jobs.isEmpty()) {
const Internal::VcsCommandPrivate::Job &job = d->m_jobs.at(0);
QString result = job.binary.toFileInfo().baseName();
result[0] = result.at(0).toTitleCase();
if (!job.arguments.isEmpty())
result += QLatin1Char(' ') + job.arguments.at(0);
return result;
}
return tr("Unknown");
}
void VcsCommand::setDisplayName(const QString &name)
{
d->m_displayName = name;
}
const QString &VcsCommand::workingDirectory() const const QString &VcsCommand::workingDirectory() const
{ {
return d->m_workingDirectory; return d->m_workingDirectory;
@@ -215,13 +238,9 @@ void VcsCommand::execute()
QFuture<void> task = QtConcurrent::run(&VcsCommand::run, this); QFuture<void> task = QtConcurrent::run(&VcsCommand::run, this);
d->m_watcher.setFuture(task); d->m_watcher.setFuture(task);
connect(&d->m_watcher, &QFutureWatcher<void>::canceled, this, &VcsCommand::cancel); connect(&d->m_watcher, &QFutureWatcher<void>::canceled, this, &VcsCommand::cancel);
QString binary = d->m_jobs.at(0).binary.toFileInfo().baseName();
if (!binary.isEmpty())
binary = binary.replace(0, 1, binary[0].toUpper()); // Upper the first letter
const QString taskName = binary + QLatin1Char(' ') + d->m_jobs.front().arguments.at(0);
Core::ProgressManager::addTask(task, taskName, const QString name = displayName();
Core::Id::fromString(binary + QLatin1String(".action"))); Core::ProgressManager::addTask(task, name, Core::Id::fromString(name + QLatin1String(".action")));
} }
void VcsCommand::abort() void VcsCommand::abort()

3
src/plugins/vcsbase/vcscommand.h
View File

@@ -81,6 +81,9 @@ public:
const QProcessEnvironment &environment); const QProcessEnvironment &environment);
~VcsCommand(); ~VcsCommand();
QString displayName() const;
void setDisplayName(const QString &name);
void addJob(const Utils::FileName &binary, const QStringList &arguments, Utils::ExitCodeInterpreter *interpreter = 0); void addJob(const Utils::FileName &binary, const QStringList &arguments, Utils::ExitCodeInterpreter *interpreter = 0);
void addJob(const Utils::FileName &binary, const QStringList &arguments, int timeoutS, void addJob(const Utils::FileName &binary, const QStringList &arguments, int timeoutS,
Utils::ExitCodeInterpreter *interpreter = 0); Utils::ExitCodeInterpreter *interpreter = 0);