From 7000ab04fb577205d1fcd0dd0391117dca11ae6f Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 5 May 2022 10:21:13 +0200 Subject: [PATCH] Utils: add default file path to string aspect Change-Id: Ia3df289b0b2dc59f6e7098332c21a335dce207f1 Reviewed-by: hjk Reviewed-by: --- src/libs/utils/aspects.cpp | 10 +++++++++- src/libs/utils/aspects.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 61215190283..0b45cac672e 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -874,6 +874,11 @@ void StringAspect::setFilePath(const FilePath &value) setValue(value.toUserOutput()); } +void StringAspect::setDefaultFilePath(const FilePath &value) +{ + setDefaultValue(value.toUserOutput()); +} + PathChooser *StringAspect::pathChooser() const { return d->m_pathChooserDisplay.data(); @@ -1085,7 +1090,10 @@ void StringAspect::addToLayout(LayoutBuilder &builder) d->m_pathChooserDisplay->setEnvironmentChange(d->m_environmentChange); d->m_pathChooserDisplay->setBaseDirectory(d->m_baseFileName); d->m_pathChooserDisplay->setOpenTerminalHandler(d->m_openTerminal); - d->m_pathChooserDisplay->setFilePath(FilePath::fromUserInput(displayedString)); + if (defaultValue() == value()) + d->m_pathChooserDisplay->setDefaultValue(defaultValue().toString()); + else + d->m_pathChooserDisplay->setFilePath(FilePath::fromUserInput(displayedString)); d->updateWidgetFromCheckStatus(this, d->m_pathChooserDisplay.data()); addLabeledItem(builder, d->m_pathChooserDisplay); useMacroExpander(d->m_pathChooserDisplay->lineEdit()); diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index 810b8ef5c3e..a57ec94cf52 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -421,6 +421,7 @@ public: Utils::FilePath filePath() const; void setFilePath(const Utils::FilePath &value); + void setDefaultFilePath(const Utils::FilePath &value); PathChooser *pathChooser() const; // Avoid to use.