diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-05-27 17:31:13 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-06-22 10:32:41 +0000 |
commit | 6112b39dccf1b3ee5773e0a86b2f382127d45a81 (patch) | |
tree | 547e1b42244557e87437a66814c56c90eaabfda8 /src/plugins/qmldesigner/components/componentcore | |
parent | dd9656cf84081925147b6c07030da354545ba982 (diff) |
QmlDesigner: Use font folder for fonts
We should use the fonts folder as default if it exists.
Change-Id: If18714ffa195856f14d7960b46b20992b48faa6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/componentcore')
-rw-r--r-- | src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 26cb96422e..98148b7bd3 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -65,6 +65,7 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projecttree.h> +#include "projectexplorer/session.h" #include <utils/algorithm.h> #include <utils/fileutils.h> @@ -949,9 +950,25 @@ void addTabBarToStackedContainer(const SelectionContext &selectionContext) } +Utils::FilePath projectFilePath() +{ + if (auto *doc = QmlDesignerPlugin::instance()->documentManager().currentDesignDocument()) { + if (auto *proj = ProjectExplorer::SessionManager::projectForFile(doc->fileName())) + return proj->projectDirectory(); + } + return Utils::FilePath(); +} + bool addFontToProject(const QStringList &fileNames, const QString &defaultDirectory) { - QString directory = AddImagesDialog::getDirectory(fileNames, defaultDirectory); + + QString adjustedDefaultDirectory = defaultDirectory; + Utils::FilePath fonts = projectFilePath().pathAppended("fonts"); + + if (fonts.exists()) + adjustedDefaultDirectory = fonts.toString(); + + QString directory = AddImagesDialog::getDirectory(fileNames, adjustedDefaultDirectory); if (directory.isEmpty()) return true; |