forked from qt-creator/qt-creator
Use ExistingCommand in PathChooser where it makes sense
This commit is contained in:
@@ -300,7 +300,7 @@ void CMakeRunPage::initWidgets()
|
|||||||
fl->addRow(new QLabel(text, this));
|
fl->addRow(new QLabel(text, this));
|
||||||
// Show a field for the user to enter
|
// Show a field for the user to enter
|
||||||
m_cmakeExecutable = new Utils::PathChooser(this);
|
m_cmakeExecutable = new Utils::PathChooser(this);
|
||||||
m_cmakeExecutable->setExpectedKind(Utils::PathChooser::Command);
|
m_cmakeExecutable->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
fl->addRow("CMake Executable", m_cmakeExecutable);
|
fl->addRow("CMake Executable", m_cmakeExecutable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -280,7 +280,7 @@ QWidget *CMakeSettingsPage::createPage(QWidget *parent)
|
|||||||
QWidget *outerWidget = new QWidget(parent);
|
QWidget *outerWidget = new QWidget(parent);
|
||||||
QFormLayout *formLayout = new QFormLayout(outerWidget);
|
QFormLayout *formLayout = new QFormLayout(outerWidget);
|
||||||
m_pathchooser = new Utils::PathChooser;
|
m_pathchooser = new Utils::PathChooser;
|
||||||
m_pathchooser->setExpectedKind(Utils::PathChooser::Command);
|
m_pathchooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
formLayout->addRow(tr("Executable:"), m_pathchooser);
|
formLayout->addRow(tr("Executable:"), m_pathchooser);
|
||||||
formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
|
formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
|
||||||
m_pathchooser->setPath(cmakeExecutable());
|
m_pathchooser->setPath(cmakeExecutable());
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
|
|||||||
QWidget(parent)
|
QWidget(parent)
|
||||||
{
|
{
|
||||||
m_ui.setupUi(this);
|
m_ui.setupUi(this);
|
||||||
m_ui.commandPathChooser->setExpectedKind(PathChooser::Command);
|
m_ui.commandPathChooser->setExpectedKind(PathChooser::ExistingCommand);
|
||||||
m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
|
m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -521,7 +521,7 @@ BinaryToolChainDialog::BinaryToolChainDialog(QWidget *parent) :
|
|||||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
setWindowTitle(tr("Select binary and toolchains"));
|
setWindowTitle(tr("Select binary and toolchains"));
|
||||||
|
|
||||||
m_pathChooser->setExpectedKind(Utils::PathChooser::Command);
|
m_pathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
m_pathChooser->setPromptDialogTitle(tr("Gdb binary"));
|
m_pathChooser->setPromptDialogTitle(tr("Gdb binary"));
|
||||||
connect(m_pathChooser, SIGNAL(validChanged()), this, SLOT(slotValidChanged()));
|
connect(m_pathChooser, SIGNAL(validChanged()), this, SLOT(slotValidChanged()));
|
||||||
m_mainLayout->addRow(tr("Path:"), m_pathChooser);
|
m_mainLayout->addRow(tr("Path:"), m_pathChooser);
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
|
|||||||
QWidget(parent)
|
QWidget(parent)
|
||||||
{
|
{
|
||||||
m_ui.setupUi(this);
|
m_ui.setupUi(this);
|
||||||
m_ui.commandChooser->setExpectedKind(Utils::PathChooser::Command);
|
m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
m_ui.commandChooser->setPromptDialogTitle(tr("Mercurial Command"));
|
m_ui.commandChooser->setPromptDialogTitle(tr("Mercurial Command"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
|
|||||||
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(updateFileComboBox()));
|
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(updateFileComboBox()));
|
||||||
|
|
||||||
Utils::PathChooser *qmlViewer = new Utils::PathChooser;
|
Utils::PathChooser *qmlViewer = new Utils::PathChooser;
|
||||||
qmlViewer->setExpectedKind(Utils::PathChooser::Command);
|
qmlViewer->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
qmlViewer->setPath(m_qmlViewerCustomPath);
|
qmlViewer->setPath(m_qmlViewerCustomPath);
|
||||||
|
|
||||||
connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onViewerChanged()));
|
connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onViewerChanged()));
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
|
|||||||
QWidget(parent)
|
QWidget(parent)
|
||||||
{
|
{
|
||||||
m_ui.setupUi(this);
|
m_ui.setupUi(this);
|
||||||
m_ui.pathChooser->setExpectedKind(PathChooser::Command);
|
m_ui.pathChooser->setExpectedKind(PathChooser::ExistingCommand);
|
||||||
m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command"));
|
m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -50,10 +50,10 @@ CommonSettingsWidget::CommonSettingsWidget(QWidget *parent) :
|
|||||||
m_ui(new Ui::CommonSettingsPage)
|
m_ui(new Ui::CommonSettingsPage)
|
||||||
{
|
{
|
||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
m_ui->submitMessageCheckScriptChooser->setExpectedKind(Utils::PathChooser::Command);
|
m_ui->submitMessageCheckScriptChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
m_ui->nickNameFieldsFileChooser->setExpectedKind(Utils::PathChooser::File);
|
m_ui->nickNameFieldsFileChooser->setExpectedKind(Utils::PathChooser::File);
|
||||||
m_ui->nickNameMailMapChooser->setExpectedKind(Utils::PathChooser::File);
|
m_ui->nickNameMailMapChooser->setExpectedKind(Utils::PathChooser::File);
|
||||||
m_ui->sshPromptChooser->setExpectedKind(Utils::PathChooser::Command);
|
m_ui->sshPromptChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
CommonSettingsWidget::~CommonSettingsWidget()
|
CommonSettingsWidget::~CommonSettingsWidget()
|
||||||
|
|||||||
Reference in New Issue
Block a user