Focus the change on enums and improved UI

* Removed unused "color" and "valueType" members of PropertyType * Renamed 'Object Types Editor' to 'Enums Editor' * Added a line edit for the enum name (can still be renamed in list as well) * Show text on 'Add Enum' and 'Add Value' buttons * Use QTreeViews instead of QTableViews * Removed unnecessary splitter * Apply a default name to new enums
mapeditor · Jun 29, 2021 · 795461a · 795461a
1 parent a04ad53
commit 795461a
Show file tree

Hide file tree

Showing 12 changed files with 277 additions and 280 deletions.
diff --git a/examples/examples.tiled-project b/examples/examples.tiled-project
@@ -10,7 +10,6 @@
     "objectTypesFile": "objecttypes.xml",
     "propertyTypes": [
         {
-            "color": "#a0a0a4",
             "id": 1,
             "name": "BodyType",
             "values": [
@@ -19,7 +18,6 @@
             ]
         },
         {
-            "color": "#a0a0a4",
             "id": 2,
             "name": "EnemyType",
             "values": [
@@ -29,7 +27,6 @@
             ]
         },
         {
-            "color": "#a0a0a4",
             "id": 3,
             "name": "State",
             "values": [

diff --git a/src/libtiled/containerhelpers.h b/src/libtiled/containerhelpers.h
@@ -51,3 +51,11 @@ inline bool contains(const Container &container, Value value)
                      container.end(),
                      value) != container.end();
 }
+
+template<typename Container, typename Pred>
+inline bool contains_where(const Container &container, Pred pred)
+{
+    return std::find_if(container.begin(),
+                        container.end(),
+                        pred) != container.end();
+}
diff --git a/src/libtiled/propertytype.cpp b/src/libtiled/propertytype.cpp
@@ -68,7 +68,6 @@ QVariantHash PropertyType::toVariant() const
         { QStringLiteral("id"), id },
         { QStringLiteral("name"), name },
         { QStringLiteral("values"), values },
-        { QStringLiteral("color"), color },
     };
 }
 
@@ -80,7 +79,6 @@ PropertyType PropertyType::fromVariant(const QVariant &variant)
     propertyType.id = hash.value(QStringLiteral("id")).toInt();
     propertyType.name = hash.value(QStringLiteral("name")).toString();
     propertyType.values = hash.value(QStringLiteral("values")).toStringList();
-    propertyType.color = hash.value(QStringLiteral("color")).toString();
 
     nextId = std::max(nextId, propertyType.id);
 

diff --git a/src/libtiled/propertytype.h b/src/libtiled/propertytype.h
@@ -39,18 +39,15 @@
 namespace Tiled {
 
 /**
- * Defines a custom property type.
+ * Defines a custom property type. Currently this includes only enums.
  */
 class TILEDSHARED_EXPORT PropertyType
 {
 public:
     int id = 0;
     QString name;
-    QColor color = Qt::gray;
     QStringList values;
 
-    int valueType = QMetaType::Int;
-
     static int nextId;
 
     QVariant wrap(const QVariant &value) const;

diff --git a/src/tiled/mainwindow.cpp b/src/tiled/mainwindow.cpp
@@ -798,7 +798,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags)
     mShowObjectTypesEditor = new QAction(tr("Object Types Editor"), this);
     mShowObjectTypesEditor->setCheckable(true);
 
-    mShowPropertyTypesEditor = new QAction(tr("Property Types Editor"), this);
+    mShowPropertyTypesEditor = new QAction(tr("Enums Editor"), this);
     mShowPropertyTypesEditor->setCheckable(true);
 
     mUi->menuView->insertAction(mUi->actionShowGrid, mViewsAndToolbarsAction);
@@ -2345,7 +2345,7 @@ void MainWindow::retranslateUi()
     mResetToDefaultLayout->setText(tr("Reset to Default Layout"));
     mLockLayout->setText(tr("Lock Layout"));
     mShowObjectTypesEditor->setText(tr("Object Types Editor"));
-    mShowPropertyTypesEditor->setText(tr("Property Types Editor"));
+    mShowPropertyTypesEditor->setText(tr("Enums Editor"));
     mActionHandler->retranslateUi();
     CommandManager::instance()->retranslateUi();
 }

diff --git a/src/tiled/objecttypeseditor.cpp b/src/tiled/objecttypeseditor.cpp
@@ -44,6 +44,19 @@
 
 namespace Tiled {
 
+class ColorDelegate : public QStyledItemDelegate
+{
+public:
+    explicit ColorDelegate(QObject *parent = nullptr)
+        : QStyledItemDelegate(parent)
+    { }
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const override;
+
+    QSize sizeHint(const QStyleOptionViewItem &,
+                   const QModelIndex &) const override;
+};
 
 void ColorDelegate::paint(QPainter *painter,
                           const QStyleOptionViewItem &option,

diff --git a/src/tiled/objecttypeseditor.h b/src/tiled/objecttypeseditor.h
@@ -36,21 +36,6 @@ class QtVariantPropertyManager;
 
 namespace Tiled {
 
-class ColorDelegate : public QStyledItemDelegate
-{
-public:
-    explicit ColorDelegate(QObject *parent = nullptr)
-        : QStyledItemDelegate(parent)
-    { }
-
-    void paint(QPainter *painter, const QStyleOptionViewItem &option,
-               const QModelIndex &index) const override;
-
-    QSize sizeHint(const QStyleOptionViewItem &,
-                   const QModelIndex &) const override;
-};
-
-
 class ObjectTypesModel;
 
 class ObjectTypesEditor : public QDialog