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

EffectMaker: Load effect nodes from share folder

Browse Source 
Change-Id: Ie7b1c95d6eb277c01310d9badc1b755e0517385c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2023-11-17 18:24:35 +02:00
parent a3283587dd
commit e740bc076c
2 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/effectmakernew/effectmakernodesmodel.cpp
View File

@@ -3,6 +3,9 @@
#include "effectmakernodesmodel.h" #include "effectmakernodesmodel.h"
#include <coreplugin/icore.h>
#include <utils/filepath.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <QCoreApplication> #include <QCoreApplication>
@@ -38,44 +41,27 @@ QVariant EffectMakerNodesModel::data(const QModelIndex &index, int role) const
return m_categories.at(index.row())->property(roleNames().value(role)); return m_categories.at(index.row())->property(roleNames().value(role));
} }
void EffectMakerNodesModel::findNodesPath() QString EffectMakerNodesModel::nodesSourcesPath() const
{ {
if (m_nodesPath.exists() || m_probeNodesDir) #ifdef SHARE_QML_PATH
return; if (Utils::qtcEnvironmentVariableIsSet("LOAD_QML_FROM_SOURCE"))
return QLatin1String(SHARE_QML_PATH) + "/effectMakerNodes";
QDir nodesDir; #endif
return Core::ICore::resourcePath("qmldesigner/effectMakerNodes").toString();
if (!qEnvironmentVariable("EFFECT_MAKER_NODES_PATH").isEmpty())
nodesDir.setPath(qEnvironmentVariable("EFFECT_MAKER_NODES_PATH"));
else if (Utils::HostOsInfo::isMacHost())
nodesDir.setPath(QCoreApplication::applicationDirPath() + "/../Resources/effect_maker_nodes");
// search for nodesDir from exec dir and up
if (nodesDir.dirName() == ".") {
m_probeNodesDir = true; // probe only once
nodesDir.setPath(QCoreApplication::applicationDirPath());
while (!nodesDir.cd("effect_maker_nodes") && nodesDir.cdUp())
; // do nothing
if (nodesDir.dirName() != "effect_maker_nodes") // bundlePathDir not found
return;
}
m_nodesPath = Utils::FilePath::fromString(nodesDir.path());
} }
void EffectMakerNodesModel::loadModel() void EffectMakerNodesModel::loadModel()
{ {
findNodesPath(); auto nodesPath = Utils::FilePath::fromString(nodesSourcesPath());
if (!m_nodesPath.exists()) { if (!nodesPath.exists()) {
qWarning() << __FUNCTION__ << "Effects not found."; qWarning() << __FUNCTION__ << "Effects not found.";
return; return;
} }
m_categories = {}; m_categories = {};
QDirIterator itCategories(m_nodesPath.toString(), QDir::Dirs | QDir::NoDotAndDotDot); QDirIterator itCategories(nodesPath.toString(), QDir::Dirs | QDir::NoDotAndDotDot);
while (itCategories.hasNext()) { while (itCategories.hasNext()) {
itCategories.next(); itCategories.next();
@@ -85,7 +71,7 @@ void EffectMakerNodesModel::loadModel()
QString catName = itCategories.fileName(); QString catName = itCategories.fileName();
QList<EffectNode *> effects = {}; QList<EffectNode *> effects = {};
Utils::FilePath categoryPath = m_nodesPath.resolvePath(itCategories.fileName()); Utils::FilePath categoryPath = nodesPath.resolvePath(itCategories.fileName());
QDirIterator itEffects(categoryPath.toString(), {"*.qen"}, QDir::Files); QDirIterator itEffects(categoryPath.toString(), {"*.qen"}, QDir::Files);
while (itEffects.hasNext()) { while (itEffects.hasNext()) {
itEffects.next(); itEffects.next();
@@ -112,4 +98,3 @@ void EffectMakerNodesModel::resetModel()
} }
} // namespace EffectMaker } // namespace EffectMaker

5
src/plugins/effectmakernew/effectmakernodesmodel.h
View File

@@ -5,8 +5,6 @@
#include "effectnodescategory.h" #include "effectnodescategory.h"
#include <utils/filepath.h>
#include <QStandardItemModel> #include <QStandardItemModel>
namespace EffectMaker { namespace EffectMaker {
@@ -33,10 +31,9 @@ public:
QList<EffectNodesCategory *> categories() const { return m_categories; } QList<EffectNodesCategory *> categories() const { return m_categories; }
private: private:
void findNodesPath(); QString nodesSourcesPath() const;
QList<EffectNodesCategory *> m_categories; QList<EffectNodesCategory *> m_categories;
Utils::FilePath m_nodesPath;
bool m_probeNodesDir = false; bool m_probeNodesDir = false;
}; };