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

Effect Maker: Store property display names when saving effect

Browse Source 
Fixes: QDS-11345
Change-Id: Id948bf6474fcc6bfff0d6e2f14241c4e4e916f6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-12-19 13:09:14 +02:00
parent 4eb1511977
commit 24c2cd857d
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/effectmakernew/effectmakermodel.cpp
View File

@@ -494,6 +494,9 @@ QJsonObject nodeToJson(const CompositionNode &node)
QString type = Uniform::stringFromType(uniform->type()); QString type = Uniform::stringFromType(uniform->type());
uniformObject.insert("type", type); uniformObject.insert("type", type);
if (!uniform->displayName().isEmpty())
uniformObject.insert("displayName", QString(uniform->displayName()));
QString value = variantAsDataString(uniform->type(), uniform->value()); QString value = variantAsDataString(uniform->type(), uniform->value());
if (uniform->type() == Uniform::Type::Sampler) if (uniform->type() == Uniform::Type::Sampler)
value = QFileInfo(value).fileName(); value = QFileInfo(value).fileName();

5
src/plugins/effectmakernew/uniform.cpp
View File

@@ -114,6 +114,11 @@ QString Uniform::description() const
return m_description; return m_description;
} }
QString Uniform::displayName() const
{
return m_displayName;
}
QString Uniform::customValue() const QString Uniform::customValue() const
{ {
return m_customValue; return m_customValue;

1
src/plugins/effectmakernew/uniform.h
View File

@@ -59,6 +59,7 @@ public:
QString name() const; QString name() const;
QString description() const; QString description() const;
QString displayName() const;
QString customValue() const; QString customValue() const;
void setCustomValue(const QString &newCustomValue); void setCustomValue(const QString &newCustomValue);