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

External Tools: Show effective arguments

Browse Source 
Expand variables to demonstrate what the arguments will be like

Change-Id: I32aed8aed38ada32b0ac6590772ed4d054bd463f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-30 22:02:44 +02:00
committed by Orgad Shaneh
parent 339b7ba203
commit 9e1d730f4b
3 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
View File

@@ -32,9 +32,11 @@
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/variablechooser.h>
#include <coreplugin/variablemanager.h>
#include <QTextStream>
#include <QFile>
@@ -417,6 +419,7 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) :
connect(ui->executable, SIGNAL(editingFinished()), this, SLOT(updateCurrentItem()));
connect(ui->executable, SIGNAL(browsingFinished()), this, SLOT(updateCurrentItem()));
connect(ui->arguments, SIGNAL(editingFinished()), this, SLOT(updateCurrentItem()));
connect(ui->arguments, SIGNAL(editingFinished()), this, SLOT(updateEffectiveArguments()));
connect(ui->workingDirectory, SIGNAL(editingFinished()), this, SLOT(updateCurrentItem()));
connect(ui->workingDirectory, SIGNAL(browsingFinished()), this, SLOT(updateCurrentItem()));
connect(ui->outputBehavior, SIGNAL(activated(int)), this, SLOT(updateCurrentItem()));
@@ -556,6 +559,7 @@ void ExternalToolConfig::showInfoForItem(const QModelIndex &index)
ui->description->setCursorPosition(0);
ui->arguments->setCursorPosition(0);
updateEffectiveArguments();
}
QMap<QString, QList<ExternalTool *> > ExternalToolConfig::tools() const
@@ -602,3 +606,9 @@ void ExternalToolConfig::addCategory()
ui->toolTree->selectionModel()->setCurrentIndex(index, QItemSelectionModel::SelectCurrent);
ui->toolTree->edit(index);
}
void ExternalToolConfig::updateEffectiveArguments()
{
ui->effectiveArguments->setText(Utils::QtcProcess::expandMacros(ui->arguments->text(),
Core::VariableManager::instance()->macroExpander()));
}