allow editing color, drawFill, usageFlags, enum values, enum storage …

…type from scripting
mapeditor · Jan 24, 2025 · d293bea · d293bea
1 parent 2a61fa5
commit d293bea
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 14 deletions.
diff --git a/src/tiled/editableproject.cpp b/src/tiled/editableproject.cpp
@@ -102,14 +102,15 @@ ScriptPropertyType *EditableProject::findTypeByName(const QString &name)
     return it == types.end() ? nullptr : toScriptType(*it);
 }
 
-void EditableProject::removeTypeByName(const QString &name)
+bool EditableProject::removeTypeByName(const QString &name)
 {
     int index = project()->propertyTypes()->findIndexByName(name);
     if (index < 0)
-        return;
+        return false;
 
     project()->propertyTypes()->removeAt(index);
     applyPropertyChanges();
+    return true;
 }
 
 void EditableProject::applyPropertyChanges()

diff --git a/src/tiled/editableproject.h b/src/tiled/editableproject.h
@@ -57,7 +57,7 @@ class EditableProject final : public EditableAsset
 
     QSharedPointer<Document> createDocument() override;
 
-    Q_INVOKABLE void removeTypeByName(const QString &name);
+    Q_INVOKABLE bool removeTypeByName(const QString &name);
     Q_INVOKABLE ScriptPropertyType *findTypeByName(const QString &name);
 
 private:

diff --git a/src/tiled/scriptpropertytype.cpp b/src/tiled/scriptpropertytype.cpp
@@ -18,6 +18,9 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "preferences.h"
+#include "project.h"
+#include "projectmanager.h"
 #include "scriptpropertytype.h"
 
 namespace Tiled {
@@ -35,6 +38,19 @@ void registerPropertyTypes(QJSEngine *jsEngine)
                                          jsEngine->newQMetaObject<ScriptClassPropertyType>());
 }
 
+/*
+ * Called when we make a change to a property type -
+ * this will reflect any property changes in the UI.
+ *
+ * TODO: Scheduling project save rather than every time
+ */
+void ScriptPropertyType::applyPropertyChanges()
+{
+    emit Preferences::instance()->propertyTypesChanged();
+
+    Project &project = ProjectManager::instance()->project();
+    project.save();
+}
 } // namespace Tiled
 
 #include "moc_scriptpropertytype.cpp"
diff --git a/src/tiled/scriptpropertytype.h b/src/tiled/scriptpropertytype.h
@@ -33,7 +33,7 @@ namespace Tiled {
 class ScriptPropertyType : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString name READ name)
+    Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(bool isClass READ isClass)
     Q_PROPERTY(bool isEnum READ isEnum)
     Q_PROPERTY(QVariant defaultValue READ defaultValue)
@@ -44,10 +44,17 @@ class ScriptPropertyType : public QObject
     {}
 
     const QString &name() const;
+    void setName(const QString &value)
+    {
+        mType->name =value;
+        applyPropertyChanges();
+    }
     bool isClass() const { return mType->isClass(); }
     bool isEnum() const { return mType->isEnum(); }
     QVariant defaultValue() { return mType->defaultValue(); }
 
+protected:
+    void applyPropertyChanges();
 private:
     SharedPropertyType mType;
 };
@@ -56,8 +63,8 @@ class ScriptEnumPropertyType : public ScriptPropertyType
 {
     Q_OBJECT
 
-    Q_PROPERTY(StorageType storageType READ storageType)
-    Q_PROPERTY(QStringList values READ values)
+    Q_PROPERTY(StorageType storageType READ storageType WRITE setStorageType)
+    Q_PROPERTY(QStringList values READ values WRITE setValues)
 
 public:
     ScriptEnumPropertyType(const QSharedPointer<EnumPropertyType> &propertyType)
@@ -72,19 +79,29 @@ class ScriptEnumPropertyType : public ScriptPropertyType
     Q_ENUM(StorageType);
 
     StorageType storageType() const { return static_cast<StorageType>(mEnumType->storageType); }
+    void setStorageType(StorageType value)
+    {
+        mEnumType->storageType = (EnumPropertyType::StorageType)value;
+        applyPropertyChanges();
+    }
     QStringList values() const { return mEnumType->values; }
-
+    void setValues(const QStringList &values)
+    {
+        mEnumType->values.clear();
+        mEnumType->values.append(values);
+        applyPropertyChanges();
+    }
 private:
     QSharedPointer<EnumPropertyType> mEnumType;
 };
 
 class ScriptClassPropertyType : public ScriptPropertyType
 {
     Q_OBJECT
-    Q_PROPERTY(QColor color READ color)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
     Q_PROPERTY(QVariantMap members READ members)
-    Q_PROPERTY(bool drawFill READ drawFill)
-    Q_PROPERTY(int usageFlags READ usageFlags)
+    Q_PROPERTY(bool drawFill READ drawFill WRITE setDrawFill)
+    Q_PROPERTY(int usageFlags READ usageFlags WRITE setUsageFlags)
 
 public:
     ScriptClassPropertyType(const QSharedPointer<ClassPropertyType> &propertyType)
@@ -111,13 +128,30 @@ class ScriptClassPropertyType : public ScriptPropertyType
     Q_ENUM(ClassUsageFlag)
 
     QColor color() const { return mClassType->color; }
-    // TODO: " No viable overloaded '=' "
-    // void setColor(QColor &value) { mClassType->color = value; }
+
+    void setColor(QColor &value)
+    {
+        mClassType->color = value;
+        applyPropertyChanges();
+    }
     QVariantMap members() const {return mClassType->members; }
+    // todo add members, remove members
+
     bool drawFill() const { return mClassType->drawFill; }
-    // void setDrawFill(bool value) { mClassType->drawFill = value; }
+    void setDrawFill(bool value)
+    {
+        mClassType->drawFill = value;
+        applyPropertyChanges();
+    }
     int usageFlags() const { return mClassType->usageFlags; }
-    //void setUsageFlags(int value) { mClassType->setUsageFlags(value); }
+    void setUsageFlags(int value) {
+        // clear any existing values first so that we set to exactly
+        // the new value rather than just turning all flags in `value`
+        // on.
+        mClassType->setUsageFlags(ClassUsageFlag::AnyUsage, false);
+        mClassType->setUsageFlags(value, true);
+        applyPropertyChanges();
+    }
 
 private:
     QSharedPointer<ClassPropertyType> mClassType;