change Event class design in favor of polymorphism

include/ui/customattributestable.h

@@ -1,7 +1,7 @@
 #ifndef CUSTOMATTRIBUTESTABLE_H
 #define CUSTOMATTRIBUTESTABLE_H
 
-#include "event.h"
+#include "events.h"
 #include <QObject>
 #include <QFrame>
 #include <QTableWidget>

include/ui/draggablepixmapitem.h

@@ -8,7 +8,7 @@
 
 #include <QtWidgets>
 
-#include "event.h"
+#include "events.h"
 
 class Editor;
 
@@ -17,10 +17,10 @@ class DraggablePixmapItem : public QObject, public QGraphicsPixmapItem {
 public:
     DraggablePixmapItem(QPixmap pixmap): QGraphicsPixmapItem(pixmap) {}
     
-    DraggablePixmapItem(Event *event_, Editor *editor_) : QGraphicsPixmapItem(event_->pixmap) {
-        event = event_;
+    DraggablePixmapItem(Event *event, Editor *editor) : QGraphicsPixmapItem(event->getPixmap()) {
+        this->event = event;
         event->setPixmapItem(this);
-        editor = editor_;
+        this->editor = editor;
         updatePosition();
     }
 
@@ -37,8 +37,6 @@ public:
     void moveTo(const QPoint &pos);
     void emitPositionChanged();
     void updatePixmap();
-    void bind(QComboBox *combo, QString key);
-    void bindToUserData(QComboBox *combo, QString key);
 
 signals:
     void positionChanged(Event *event);
@@ -49,25 +47,18 @@ signals:
     void onPropertyChanged(QString key, QString value);
 
 public slots:
-    void set_x(const QString &text) {
-        event->put("x", text);
+    void set_x(int x) {
+        event->setX(x);
         updatePosition();
     }
-    void set_y(const QString &text) {
-        event->put("y", text);
+    void set_y(int y) {
+        event->setY(y);
         updatePosition();
     }
-    void set_elevation(const QString &text) {
-        event->put("elevation", text);
+    void set_elevation(int z) {
+        event->setElevation(z);
         updatePosition();
     }
-    void set_sprite(const QString &text) {
-        event->put("sprite", text);
-        updatePixmap();
-    }
-    void set_script(const QString &text) {
-        event->put("script_label", text);
-    }
 
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent*);

include/ui/eventframes.h

@@ -0,0 +1,272 @@
+#pragma once
+#ifndef EVENTRAMES_H
+#define EVENTRAMES_H
+
+#include <QtWidgets>
+
+#include "noscrollspinbox.h"
+#include "noscrollcombobox.h"
+
+#include "events.h"
+
+
+
+class Project;
+
+class EventFrame : public QFrame {
+    Q_OBJECT
+
+public:
+    EventFrame(Event *event, QWidget *parent = nullptr)
+        : QFrame(parent), event(event) { }
+
+    virtual void setup();
+    void initCustomAttributesTable();
+    virtual void connectSignals();
+    virtual void initialize();
+    virtual void populate(Project *project);
+
+    virtual void setActive(bool active);
+
+public:
+    QLabel *label_id;
+
+    QVBoxLayout *layout_main;
+
+    QSpinBox *spinner_id;
+
+    NoScrollSpinBox *spinner_x;
+    NoScrollSpinBox *spinner_y;
+    NoScrollSpinBox *spinner_z;
+
+    QLabel *label_icon;
+
+    QFrame *frame_contents;
+    QVBoxLayout *layout_contents;
+
+protected:
+    bool populated = false;
+    bool initialized = false;
+
+private:
+    Event *event;
+};
+
+
+
+class ObjectFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    ObjectFrame(ObjectEvent *object, QWidget *parent = nullptr)
+        : EventFrame(object, parent), object(object) {}
+
+    virtual ~ObjectFrame() {
+        delete this->scriptCompleter;
+    }
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_sprite;
+    NoScrollComboBox *combo_movement;
+    NoScrollSpinBox *spinner_radius_x;
+    NoScrollSpinBox *spinner_radius_y;
+    NoScrollComboBox *combo_script;
+    NoScrollComboBox *combo_flag;
+    NoScrollComboBox *combo_trainer_type;
+    NoScrollComboBox *combo_radius_treeid;
+    QCheckBox *check_in_connection;
+
+private:
+    ObjectEvent *object;
+
+    QCompleter *scriptCompleter = nullptr;
+};
+
+
+
+class CloneObjectFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    CloneObjectFrame(CloneObjectEvent *clone, QWidget *parent = nullptr)
+        : EventFrame(clone, parent), clone(clone) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_sprite;
+    NoScrollSpinBox *spinner_target_id;
+    NoScrollComboBox *combo_target_map;
+
+private:
+    CloneObjectEvent *clone;
+};
+
+
+
+class WarpFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    WarpFrame(WarpEvent *warp, QWidget *parent = nullptr)
+        : EventFrame(warp, parent), warp(warp) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_dest_map;
+    NoScrollSpinBox *spinner_dest_warp;
+
+private:
+    WarpEvent *warp;
+};
+
+
+
+class TriggerFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    TriggerFrame(TriggerEvent *trigger, QWidget *parent = nullptr)
+        : EventFrame(trigger, parent), trigger(trigger) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_script;
+    NoScrollComboBox *combo_var;
+    NoScrollComboBox *combo_var_value;
+
+private:
+    TriggerEvent *trigger;
+
+    QCompleter *scriptCompleter = nullptr;
+};
+
+
+
+class WeatherTriggerFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    WeatherTriggerFrame(WeatherTriggerEvent *weatherTrigger, QWidget *parent = nullptr)
+        : EventFrame(weatherTrigger, parent), weatherTrigger(weatherTrigger) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_weather;
+
+private:
+    WeatherTriggerEvent *weatherTrigger;
+};
+
+
+
+class SignFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    SignFrame(SignEvent *sign, QWidget *parent = nullptr)
+        : EventFrame(sign, parent), sign(sign) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_facing_dir;
+    NoScrollComboBox *combo_script;
+
+private:
+    SignEvent *sign;
+
+    QCompleter *scriptCompleter = nullptr;
+};
+
+
+
+class HiddenItemFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    HiddenItemFrame(HiddenItemEvent *hiddenItem, QWidget *parent = nullptr)
+        : EventFrame(hiddenItem, parent), hiddenItem(hiddenItem) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_item;
+    NoScrollComboBox *combo_flag;
+    NoScrollSpinBox *spinner_quantity;
+    QCheckBox *check_itemfinder;
+
+private:
+    HiddenItemEvent *hiddenItem;
+};
+
+
+
+class SecretBaseFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    SecretBaseFrame(SecretBaseEvent *secretBase, QWidget *parent = nullptr)
+        : EventFrame(secretBase, parent), secretBase(secretBase) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_base_id;
+
+private:
+    SecretBaseEvent *secretBase;
+};
+
+
+
+class HealLocationFrame : public EventFrame {
+    Q_OBJECT
+
+public:
+    HealLocationFrame(HealLocationEvent *healLocation, QWidget *parent = nullptr)
+        : EventFrame(healLocation, parent), healLocation(healLocation) {}
+
+    virtual void setup() override;
+    virtual void initialize() override;
+    virtual void connectSignals() override;
+    virtual void populate(Project *project) override;
+
+public:
+    NoScrollComboBox *combo_respawn_map;
+    NoScrollSpinBox *spinner_respawn_npc;
+
+private:
+    HealLocationEvent *healLocation;
+};
+
+#endif // EVENTRAMES_H

include/ui/eventpropertiesframe.h

@@ -1,29 +0,0 @@
-#ifndef EVENTPROPERTIESFRAME_H
-#define EVENTPROPERTIESFRAME_H
-
-#include "event.h"
-
-#include <QFrame>
-
-namespace Ui {
-class EventPropertiesFrame;
-}
-
-class EventPropertiesFrame : public QFrame
-{
-    Q_OBJECT
-
-public:
-    explicit EventPropertiesFrame(Event *event, QWidget *parent = nullptr);
-    ~EventPropertiesFrame();
-    void paintEvent(QPaintEvent*);
-
-public:
-    Ui::EventPropertiesFrame *ui;
-
-private:
-    Event *event;
-    bool firstShow = true;
-};
-
-#endif // EVENTPROPERTIESFRAME_H

include/ui/neweventtoolbutton.h

@@ -1,7 +1,7 @@
 #ifndef NEWEVENTTOOLBUTTON_H
 #define NEWEVENTTOOLBUTTON_H
 
-#include "event.h"
+#include "events.h"
 #include <QToolButton>
 
 class NewEventToolButton : public QToolButton
@@ -9,7 +9,7 @@ class NewEventToolButton : public QToolButton
     Q_OBJECT
 public:
     explicit NewEventToolButton(QWidget *parent = nullptr);
-    QString getSelectedEventType();
+    Event::Type getSelectedEventType();
     QAction *newObjectAction;
     QAction *newCloneObjectAction;
     QAction *newWarpAction;
@@ -30,9 +30,9 @@ public slots:
     void newHiddenItem();
     void newSecretBase();
 signals:
-    void newEventAdded(QString);
+    void newEventAdded(Event::Type);
 private:
-    QString selectedEventType;
+    Event::Type selectedEventType;
     void init();
 };