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

QmlDesigner: Load effect maker nodes' icons

Browse Source 
Also remove some unused code.

Fixes: QDS-10426
Change-Id: I71c4fde339261e2856472c15bde56ee8850ed236
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Mahmoud Badri
2023-08-11 17:18:01 +03:00
parent 46800c6f97
commit 56303d62a6
6 changed files with 19 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/plugins/qmldesigner/components/effectmaker/effectmakermodel.cpp
View File

@@ -3,14 +3,6 @@
#include "effectmakermodel.h"
#include <projectexplorer/kit.h>
#include <projectexplorer/projecttree.h>
#include <projectexplorer/target.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/filepath.h>
namespace QmlDesigner {
EffectMakerModel::EffectMakerModel(QObject *parent)
@@ -33,69 +25,16 @@ int EffectMakerModel::rowCount(const QModelIndex &parent) const
return m_categories.count();
}
QVariant EffectMakerModel::data(const QModelIndex &index, int role) const
QVariant EffectMakerModel::data(const QModelIndex &index, int /*role*/) const
{
// TODO: to be updated
if (index.row() < 0 || index.row() >= m_categories.count())
return {};
const EffectNodesCategory *category = m_categories.at(index.row());
if (role == CategoryRole)
return category->name();
if (role == EffectsRole) {
QStringList effectsNames;
const QList<EffectNode *> effects = category->nodes();
for (const EffectNode *effect : effects)
effectsNames << effect->name();
return effectsNames;
}
// TODO
return {};
}
// static
Utils::FilePath EffectMakerModel::getQmlEffectsPath()
{
const ProjectExplorer::Target *target = ProjectExplorer::ProjectTree::currentTarget();
if (!target) {
qWarning() << __FUNCTION__ << "No project open";
return "";
}
const QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
return baseQtVersion->qmlPath().pathAppended("QtQuickEffectMaker/defaultnodes");
}
void EffectMakerModel::loadModel()
{
const Utils::FilePath effectsPath = getQmlEffectsPath();
if (!effectsPath.exists()) {
qWarning() << __FUNCTION__ << "Effects are not found.";
return;
}
QDirIterator itCategories(effectsPath.toString(), QDir::Dirs | QDir::NoDotAndDotDot);
while (itCategories.hasNext()) {
beginInsertRows(QModelIndex(), rowCount(), rowCount());
itCategories.next();
if (itCategories.fileName() == "images")
continue;
QList<EffectNode *> effects = {};
Utils::FilePath categoryPath = effectsPath.resolvePath(itCategories.fileName());
QDirIterator itEffects(categoryPath.toString(), QDir::Files | QDir::NoDotAndDotDot);
while (itEffects.hasNext()) {
itEffects.next();
effects.push_back(new EffectNode(QFileInfo(itEffects.fileName()).baseName()));
}
EffectNodesCategory *category = new EffectNodesCategory(itCategories.fileName(), effects);
m_categories.push_back(category);
endInsertRows();
}
}
void EffectMakerModel::resetModel()
{
beginResetModel();