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

QmlDesigner: Use font folder for fonts

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2020-05-27 17:31:13 +02:00
parent dd9656cf84
commit 6112b39dcc
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -65,6 +65,7 @@
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
#include <projectexplorer/projecttree.h> #include <projectexplorer/projecttree.h>
#include "projectexplorer/session.h"
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.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) 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()) if (directory.isEmpty())
return true; return true;