Qmake: Add history completer to path choosers

Change-Id: I1bcf9cf626d0f42520442ec8e9d7be413e16a102
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-11-25 14:36:18 +01:00
parent c516fcda59
commit c4b2da9a33
6 changed files with 8 additions and 1 deletions

View File

@@ -40,6 +40,7 @@ ClassDefinition::ClassDefinition(QWidget *parent) :
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
m_ui.iconPathChooser->setExpectedKind(Utils::PathChooser::File); m_ui.iconPathChooser->setExpectedKind(Utils::PathChooser::File);
m_ui.iconPathChooser->setHistoryCompleter(QLatin1String("Qmake.Icon.History"));
m_ui.iconPathChooser->setPromptDialogTitle(tr("Select Icon")); m_ui.iconPathChooser->setPromptDialogTitle(tr("Select Icon"));
m_ui.iconPathChooser->setPromptDialogFilter(tr("Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)")); m_ui.iconPathChooser->setPromptDialogFilter(tr("Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)"));
} }

View File

@@ -217,6 +217,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
m_workingDirectoryEdit = new PathChooser(this); m_workingDirectoryEdit = new PathChooser(this);
m_workingDirectoryEdit->setExpectedKind(PathChooser::Directory); m_workingDirectoryEdit->setExpectedKind(PathChooser::Directory);
m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("WorkingDir.History"));
m_workingDirectoryEdit->setPath(m_qmakeRunConfiguration->baseWorkingDirectory()); m_workingDirectoryEdit->setPath(m_qmakeRunConfiguration->baseWorkingDirectory());
m_workingDirectoryEdit->setBaseDirectory(m_qmakeRunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setBaseDirectory(m_qmakeRunConfiguration->target()->project()->projectDirectory());
EnvironmentAspect *aspect = qmakeRunConfiguration->extraAspect<EnvironmentAspect>(); EnvironmentAspect *aspect = qmakeRunConfiguration->extraAspect<EnvironmentAspect>();

View File

@@ -620,6 +620,9 @@ NonInternalLibraryDetailsController::NonInternalLibraryDetailsController(
setLibraryComboBoxVisible(false); setLibraryComboBoxVisible(false);
setLibraryPathChooserVisible(true); setLibraryPathChooserVisible(true);
libraryDetailsWidget()->libraryPathChooser
->setHistoryCompleter(QLatin1String("Qmake.LibDir.History"));
if (creatorPlatform() == CreatorWindows) { if (creatorPlatform() == CreatorWindows) {
libraryDetailsWidget()->libraryPathChooser->setPromptDialogFilter( libraryDetailsWidget()->libraryPathChooser->setPromptDialogFilter(
QLatin1String("Library file (*.lib lib*.a)")); QLatin1String("Library file (*.lib lib*.a)"));

View File

@@ -326,7 +326,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
m_ui->makePathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_ui->makePathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_ui->makePathChooser->setBaseDirectory(Utils::PathChooser::homePath()); m_ui->makePathChooser->setBaseDirectory(Utils::PathChooser::homePath());
m_ui->makePathChooser->setHistoryCompleter(QLatin1String("PE.MakeCommand.History"));
const QString &makeCmd = m_makeStep->makeCommand(); const QString &makeCmd = m_makeStep->makeCommand();
m_ui->makePathChooser->setPath(makeCmd); m_ui->makePathChooser->setPath(makeCmd);

View File

@@ -67,6 +67,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory")); m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory"));
m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_ui->shadowBuildDirEdit->setHistoryCompleter(QLatin1String("BuildDir.History"));
m_ui->shadowBuildDirEdit->setEnvironment(bc->environment()); m_ui->shadowBuildDirEdit->setEnvironment(bc->environment());
m_ui->shadowBuildDirEdit->setBaseDirectory(bc->target()->project()->projectDirectory()); m_ui->shadowBuildDirEdit->setBaseDirectory(bc->target()->project()->projectDirectory());
bool isShadowBuild = bc->isShadowBuild(); bool isShadowBuild = bc->isShadowBuild();

View File

@@ -45,6 +45,7 @@ Html5AppWizardOptionsPage::Html5AppWizardOptionsPage(QWidget *parent)
{ {
d->ui.setupUi(this); d->ui.setupUi(this);
d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File); d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File);
d->ui.importLineEdit->setHistoryCompleter(QLatin1String("Qmake.Html.History"));
d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.html")); d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.html"));
d->ui.importLineEdit->setPromptDialogTitle(tr("Select HTML File")); d->ui.importLineEdit->setPromptDialogTitle(tr("Select HTML File"));
connect(d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged())); connect(d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged()));