From c4cc5768255f15c566418a7ffaf924344d0c5f18 Mon Sep 17 00:00:00 2001 From: Amr Essam Date: Tue, 20 Dec 2022 14:49:11 +0200 Subject: [PATCH] QmlDesigner: Create default effects folder in assets library Task-number: QDS-8166 Change-Id: I12bf86ec5983642295a20d254f06d0a4ab6ccdb1 Reviewed-by: Mahmoud Badri --- .../components/componentcore/modelnodeoperations.cpp | 9 +++++++-- .../components/componentcore/modelnodeoperations.h | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 5dd2b1dd5d6..bd9031ddc26 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -1677,7 +1677,7 @@ void openEffectMaker(const QString &filePath) } } -Utils::FilePath getEffectsDirectory() +Utils::FilePath getEffectsImportDirectory() { QString defaultDir = "asset_imports/Effects"; Utils::FilePath projectPath = QmlDesignerPlugin::instance()->documentManager().currentProjectDirPath(); @@ -1691,6 +1691,11 @@ Utils::FilePath getEffectsDirectory() return effectsPath; } +QString getEffectsDefaultDirectory(const QString &defaultDir) +{ + return getAssetDefaultDirectory("effects", defaultDir); +} + QString getEffectIcon(const QString &effectPath) { const ProjectExplorer::Target *target = ProjectExplorer::ProjectTree::currentTarget(); @@ -1718,7 +1723,7 @@ bool useLayerEffect() bool validateEffect(const QString &effectPath) { const QString effectName = QFileInfo(effectPath).baseName(); - Utils::FilePath effectsResDir = ModelNodeOperations::getEffectsDirectory(); + Utils::FilePath effectsResDir = ModelNodeOperations::getEffectsImportDirectory(); Utils::FilePath qmlPath = effectsResDir.resolvePath(effectName + "/" + effectName + ".qml"); if (!qmlPath.exists()) { QMessageBox msgBox; diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h index 2e60b253195..1cee080c561 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h @@ -119,7 +119,8 @@ void addMouseAreaFill(const SelectionContext &selectionContext); void openSignalDialog(const SelectionContext &selectionContext); void updateImported3DAsset(const SelectionContext &selectionContext); -QMLDESIGNERCORE_EXPORT Utils::FilePath getEffectsDirectory(); +QMLDESIGNERCORE_EXPORT Utils::FilePath getEffectsImportDirectory(); +QMLDESIGNERCORE_EXPORT QString getEffectsDefaultDirectory(const QString &defaultDir); void openEffectMaker(const QString &filePath); QString getEffectIcon(const QString &effectPath); bool useLayerEffect();