Move files into src/

src/editor.h

@@ -1,259 +1,259 @@
-#ifndef EDITOR_H
-#define EDITOR_H
-
-#include <QGraphicsScene>
-#include <QGraphicsItemGroup>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsItemAnimation>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QCursor>
-
-#include "mapconnection.h"
-#include "metatileselector.h"
-#include "movementpermissionsselector.h"
-#include "project.h"
-#include "ui_mainwindow.h"
-#include "bordermetatilespixmapitem.h"
-#include "connectionpixmapitem.h"
-#include "currentselectedmetatilespixmapitem.h"
-#include "collisionpixmapitem.h"
-#include "mappixmapitem.h"
-#include "settings.h"
-
-class DraggablePixmapItem;
-class MetatilesPixmapItem;
-
-class Editor : public QObject
-{
-    Q_OBJECT
-public:
-    Editor(Ui::MainWindow* ui);
-public:
-    Ui::MainWindow* ui;
-    QObject *parent = nullptr;
-    Project *project = nullptr;
-    Map *map = nullptr;
-    Settings *settings;
-    void saveProject();
-    void save();
-    void undo();
-    void redo();
-    void setMap(QString map_name);
-    void displayMap();
-    void displayMetatileSelector();
-    void displayMapMetatiles();
-    void displayMapMovementPermissions();
-    void displayBorderMetatiles();
-    void displayCurrentMetatilesSelection();
-    void redrawCurrentMetatilesSelection();
-    void displayMovementPermissionSelector();
-    void displayElevationMetatiles();
-    void displayMapEvents();
-    void displayMapConnections();
-    void displayMapBorder();
-    void displayMapGrid();
-
-    void setEditingMap();
-    void setEditingCollision();
-    void setEditingObjects();
-    void setEditingConnections();
-    void setCurrentConnectionDirection(QString curDirection);
-    void updateCurrentConnectionDirection(QString curDirection);
-    void setConnectionsVisibility(bool visible);
-    void updateConnectionOffset(int offset);
-    void setConnectionMap(QString mapName);
-    void addNewConnection();
-    void removeCurrentConnection();
-    void updateDiveMap(QString mapName);
-    void updateEmergeMap(QString mapName);
-    void setSelectedConnectionFromMap(QString mapName);
-    void updatePrimaryTileset(QString tilesetLabel);
-    void updateSecondaryTileset(QString tilesetLabel);
-    void toggleBorderVisibility(bool visible);
-
-    DraggablePixmapItem *addMapEvent(Event *event);
-    void selectMapEvent(DraggablePixmapItem *object);
-    void selectMapEvent(DraggablePixmapItem *object, bool toggle);
-    DraggablePixmapItem *addNewEvent(QString event_type);
-    Event* createNewEvent(QString event_type);
-    void deleteEvent(Event *);
-    void updateSelectedEvents();
-    void redrawObject(DraggablePixmapItem *item);
-    QList<DraggablePixmapItem *> *getObjects();
-
-    QGraphicsScene *scene = nullptr;
-    QGraphicsPixmapItem *current_view = nullptr;
-    MapPixmapItem *map_item = nullptr;
-    ConnectionPixmapItem* selected_connection_item = nullptr;
-    QList<QGraphicsPixmapItem*> connection_items;
-    QList<ConnectionPixmapItem*> connection_edit_items;
-    CollisionPixmapItem *collision_item = nullptr;
-    QGraphicsItemGroup *events_group = nullptr;
-    QList<QGraphicsPixmapItem*> borderItems;
-    QList<QGraphicsLineItem*> gridLines;
-
-    QGraphicsScene *scene_metatiles = nullptr;
-    QGraphicsScene *scene_current_metatile_selection = nullptr;
-    QGraphicsScene *scene_selected_border_metatiles = nullptr;
-    QGraphicsScene *scene_collision_metatiles = nullptr;
-    QGraphicsScene *scene_elevation_metatiles = nullptr;
-    MetatileSelector *metatile_selector_item = nullptr;
-
-    BorderMetatilesPixmapItem *selected_border_metatiles_item = nullptr;
-    CurrentSelectedMetatilesPixmapItem *scene_current_metatile_selection_item = nullptr;
-    MovementPermissionsSelector *movement_permissions_selector_item = nullptr;
-
-    QList<DraggablePixmapItem*> *events = nullptr;
-    QList<DraggablePixmapItem*> *selected_events = nullptr;
-
-    QString map_edit_mode;
-    QString prev_edit_mode;
-
-    void objectsView_onMousePress(QMouseEvent *event);
-    void objectsView_onMouseMove(QMouseEvent *event);
-    void objectsView_onMouseRelease(QMouseEvent *event);
-
-private:
-    void setConnectionItemsVisible(bool);
-    void setBorderItemsVisible(bool, qreal = 1);
-    void setConnectionEditControlValues(MapConnection*);
-    void setConnectionEditControlsEnabled(bool);
-    void createConnectionItem(MapConnection* connection, bool hide);
-    void populateConnectionMapPickers();
-    void setDiveEmergeControls();
-    void updateDiveEmergeMap(QString mapName, QString direction);
-    void onConnectionOffsetChanged(int newOffset);
-    void removeMirroredConnection(MapConnection*);
-    void updateMirroredConnectionOffset(MapConnection*);
-    void updateMirroredConnectionDirection(MapConnection*, QString);
-    void updateMirroredConnectionMap(MapConnection*, QString);
-    void updateMirroredConnection(MapConnection*, QString, QString, bool isDelete = false);
-    Event* createNewObjectEvent();
-    Event* createNewWarpEvent();
-    Event* createNewHealLocationEvent();
-    Event* createNewCoordScriptEvent();
-    Event* createNewCoordWeatherEvent();
-    Event* createNewSignEvent();
-    Event* createNewHiddenItemEvent();
-    Event* createNewSecretBaseEvent();
-    QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
-
-private slots:
-    void mouseEvent_map(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);
-    void mouseEvent_collision(QGraphicsSceneMouseEvent *event, CollisionPixmapItem *item);
-    void onConnectionMoved(MapConnection*);
-    void onConnectionItemSelected(ConnectionPixmapItem* connectionItem);
-    void onConnectionItemDoubleClicked(ConnectionPixmapItem* connectionItem);
-    void onConnectionDirectionChanged(QString newDirection);
-    void onBorderMetatilesChanged();
-    void onHoveredMovementPermissionChanged(uint16_t, uint16_t);
-    void onHoveredMovementPermissionCleared();
-    void onHoveredMetatileSelectionChanged(uint16_t);
-    void onHoveredMetatileSelectionCleared();
-    void onHoveredMapMetatileChanged(int, int);
-    void onHoveredMapMetatileCleared();
-    void onHoveredMapMovementPermissionChanged(int, int);
-    void onHoveredMapMovementPermissionCleared();
-    void onSelectedMetatilesChanged();
-
-signals:
-    void objectsChanged();
-    void selectedObjectsChanged();
-    void loadMapRequested(QString, QString);
-    void tilesetChanged(QString);
-    void warpEventDoubleClicked(QString mapName, QString warpNum);
-    void currentMetatilesSelectionChanged();
-};
-
-
-
-class DraggablePixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    DraggablePixmapItem(QPixmap pixmap): QGraphicsPixmapItem(pixmap) {
-    }
-    Editor *editor = nullptr;
-    Event *event = nullptr;
-    QGraphicsItemAnimation *pos_anim = nullptr;
-    DraggablePixmapItem(Event *event_, Editor *editor_) : QGraphicsPixmapItem(event_->pixmap) {
-        event = event_;
-        editor = editor_;
-        updatePosition();
-    }
-    bool active;
-    int last_x;
-    int last_y;
-    void updatePosition() {
-        int x = event->getPixelX();
-        int y = event->getPixelY();
-        setX(x);
-        setY(y);
-        setZValue(event->y());
-    }
-    void move(int x, int y);
-    void emitPositionChanged() {
-        emit xChanged(event->x());
-        emit yChanged(event->y());
-        emit elevationChanged(event->elevation());
-    }
-    void updatePixmap() {
-        QList<Event*> objects;
-        objects.append(event);
-        event->pixmap = QPixmap();
-        editor->project->loadEventPixmaps(objects);
-        this->updatePosition();
-        editor->redrawObject(this);
-        emit spriteChanged(event->pixmap);
-    }
-    void bind(QComboBox *combo, QString key) {
-        connect(combo, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentTextChanged),
-                this, [this, key](QString value){
-            this->event->put(key, value);
-        });
-        connect(this, &DraggablePixmapItem::onPropertyChanged,
-                this, [combo, key](QString key2, QString value){
-            if (key2 == key) {
-                combo->addItem(value);
-                combo->setCurrentText(value);
-            }
-        });
-    }
-
-signals:
-    void positionChanged(Event *event);
-    void xChanged(int);
-    void yChanged(int);
-    void elevationChanged(int);
-    void spriteChanged(QPixmap pixmap);
-    void onPropertyChanged(QString key, QString value);
-
-public slots:
-    void set_x(const QString &text) {
-        event->put("x", text);
-        updatePosition();
-    }
-    void set_y(const QString &text) {
-        event->put("y", text);
-        updatePosition();
-    }
-    void set_elevation(const QString &text) {
-        event->put("elevation", text);
-        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*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*);
-};
-
-#endif // EDITOR_H
+#ifndef EDITOR_H
+#define EDITOR_H
+
+#include <QGraphicsScene>
+#include <QGraphicsItemGroup>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsItemAnimation>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QCursor>
+
+#include "mapconnection.h"
+#include "metatileselector.h"
+#include "movementpermissionsselector.h"
+#include "project.h"
+#include "ui_mainwindow.h"
+#include "bordermetatilespixmapitem.h"
+#include "connectionpixmapitem.h"
+#include "currentselectedmetatilespixmapitem.h"
+#include "collisionpixmapitem.h"
+#include "mappixmapitem.h"
+#include "settings.h"
+
+class DraggablePixmapItem;
+class MetatilesPixmapItem;
+
+class Editor : public QObject
+{
+    Q_OBJECT
+public:
+    Editor(Ui::MainWindow* ui);
+public:
+    Ui::MainWindow* ui;
+    QObject *parent = nullptr;
+    Project *project = nullptr;
+    Map *map = nullptr;
+    Settings *settings;
+    void saveProject();
+    void save();
+    void undo();
+    void redo();
+    void setMap(QString map_name);
+    void displayMap();
+    void displayMetatileSelector();
+    void displayMapMetatiles();
+    void displayMapMovementPermissions();
+    void displayBorderMetatiles();
+    void displayCurrentMetatilesSelection();
+    void redrawCurrentMetatilesSelection();
+    void displayMovementPermissionSelector();
+    void displayElevationMetatiles();
+    void displayMapEvents();
+    void displayMapConnections();
+    void displayMapBorder();
+    void displayMapGrid();
+
+    void setEditingMap();
+    void setEditingCollision();
+    void setEditingObjects();
+    void setEditingConnections();
+    void setCurrentConnectionDirection(QString curDirection);
+    void updateCurrentConnectionDirection(QString curDirection);
+    void setConnectionsVisibility(bool visible);
+    void updateConnectionOffset(int offset);
+    void setConnectionMap(QString mapName);
+    void addNewConnection();
+    void removeCurrentConnection();
+    void updateDiveMap(QString mapName);
+    void updateEmergeMap(QString mapName);
+    void setSelectedConnectionFromMap(QString mapName);
+    void updatePrimaryTileset(QString tilesetLabel);
+    void updateSecondaryTileset(QString tilesetLabel);
+    void toggleBorderVisibility(bool visible);
+
+    DraggablePixmapItem *addMapEvent(Event *event);
+    void selectMapEvent(DraggablePixmapItem *object);
+    void selectMapEvent(DraggablePixmapItem *object, bool toggle);
+    DraggablePixmapItem *addNewEvent(QString event_type);
+    Event* createNewEvent(QString event_type);
+    void deleteEvent(Event *);
+    void updateSelectedEvents();
+    void redrawObject(DraggablePixmapItem *item);
+    QList<DraggablePixmapItem *> *getObjects();
+
+    QGraphicsScene *scene = nullptr;
+    QGraphicsPixmapItem *current_view = nullptr;
+    MapPixmapItem *map_item = nullptr;
+    ConnectionPixmapItem* selected_connection_item = nullptr;
+    QList<QGraphicsPixmapItem*> connection_items;
+    QList<ConnectionPixmapItem*> connection_edit_items;
+    CollisionPixmapItem *collision_item = nullptr;
+    QGraphicsItemGroup *events_group = nullptr;
+    QList<QGraphicsPixmapItem*> borderItems;
+    QList<QGraphicsLineItem*> gridLines;
+
+    QGraphicsScene *scene_metatiles = nullptr;
+    QGraphicsScene *scene_current_metatile_selection = nullptr;
+    QGraphicsScene *scene_selected_border_metatiles = nullptr;
+    QGraphicsScene *scene_collision_metatiles = nullptr;
+    QGraphicsScene *scene_elevation_metatiles = nullptr;
+    MetatileSelector *metatile_selector_item = nullptr;
+
+    BorderMetatilesPixmapItem *selected_border_metatiles_item = nullptr;
+    CurrentSelectedMetatilesPixmapItem *scene_current_metatile_selection_item = nullptr;
+    MovementPermissionsSelector *movement_permissions_selector_item = nullptr;
+
+    QList<DraggablePixmapItem*> *events = nullptr;
+    QList<DraggablePixmapItem*> *selected_events = nullptr;
+
+    QString map_edit_mode;
+    QString prev_edit_mode;
+
+    void objectsView_onMousePress(QMouseEvent *event);
+    void objectsView_onMouseMove(QMouseEvent *event);
+    void objectsView_onMouseRelease(QMouseEvent *event);
+
+private:
+    void setConnectionItemsVisible(bool);
+    void setBorderItemsVisible(bool, qreal = 1);
+    void setConnectionEditControlValues(MapConnection*);
+    void setConnectionEditControlsEnabled(bool);
+    void createConnectionItem(MapConnection* connection, bool hide);
+    void populateConnectionMapPickers();
+    void setDiveEmergeControls();
+    void updateDiveEmergeMap(QString mapName, QString direction);
+    void onConnectionOffsetChanged(int newOffset);
+    void removeMirroredConnection(MapConnection*);
+    void updateMirroredConnectionOffset(MapConnection*);
+    void updateMirroredConnectionDirection(MapConnection*, QString);
+    void updateMirroredConnectionMap(MapConnection*, QString);
+    void updateMirroredConnection(MapConnection*, QString, QString, bool isDelete = false);
+    Event* createNewObjectEvent();
+    Event* createNewWarpEvent();
+    Event* createNewHealLocationEvent();
+    Event* createNewCoordScriptEvent();
+    Event* createNewCoordWeatherEvent();
+    Event* createNewSignEvent();
+    Event* createNewHiddenItemEvent();
+    Event* createNewSecretBaseEvent();
+    QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
+
+private slots:
+    void mouseEvent_map(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);
+    void mouseEvent_collision(QGraphicsSceneMouseEvent *event, CollisionPixmapItem *item);
+    void onConnectionMoved(MapConnection*);
+    void onConnectionItemSelected(ConnectionPixmapItem* connectionItem);
+    void onConnectionItemDoubleClicked(ConnectionPixmapItem* connectionItem);
+    void onConnectionDirectionChanged(QString newDirection);
+    void onBorderMetatilesChanged();
+    void onHoveredMovementPermissionChanged(uint16_t, uint16_t);
+    void onHoveredMovementPermissionCleared();
+    void onHoveredMetatileSelectionChanged(uint16_t);
+    void onHoveredMetatileSelectionCleared();
+    void onHoveredMapMetatileChanged(int, int);
+    void onHoveredMapMetatileCleared();
+    void onHoveredMapMovementPermissionChanged(int, int);
+    void onHoveredMapMovementPermissionCleared();
+    void onSelectedMetatilesChanged();
+
+signals:
+    void objectsChanged();
+    void selectedObjectsChanged();
+    void loadMapRequested(QString, QString);
+    void tilesetChanged(QString);
+    void warpEventDoubleClicked(QString mapName, QString warpNum);
+    void currentMetatilesSelectionChanged();
+};
+
+
+
+class DraggablePixmapItem : public QObject, public QGraphicsPixmapItem {
+    Q_OBJECT
+public:
+    DraggablePixmapItem(QPixmap pixmap): QGraphicsPixmapItem(pixmap) {
+    }
+    Editor *editor = nullptr;
+    Event *event = nullptr;
+    QGraphicsItemAnimation *pos_anim = nullptr;
+    DraggablePixmapItem(Event *event_, Editor *editor_) : QGraphicsPixmapItem(event_->pixmap) {
+        event = event_;
+        editor = editor_;
+        updatePosition();
+    }
+    bool active;
+    int last_x;
+    int last_y;
+    void updatePosition() {
+        int x = event->getPixelX();
+        int y = event->getPixelY();
+        setX(x);
+        setY(y);
+        setZValue(event->y());
+    }
+    void move(int x, int y);
+    void emitPositionChanged() {
+        emit xChanged(event->x());
+        emit yChanged(event->y());
+        emit elevationChanged(event->elevation());
+    }
+    void updatePixmap() {
+        QList<Event*> objects;
+        objects.append(event);
+        event->pixmap = QPixmap();
+        editor->project->loadEventPixmaps(objects);
+        this->updatePosition();
+        editor->redrawObject(this);
+        emit spriteChanged(event->pixmap);
+    }
+    void bind(QComboBox *combo, QString key) {
+        connect(combo, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentTextChanged),
+                this, [this, key](QString value){
+            this->event->put(key, value);
+        });
+        connect(this, &DraggablePixmapItem::onPropertyChanged,
+                this, [combo, key](QString key2, QString value){
+            if (key2 == key) {
+                combo->addItem(value);
+                combo->setCurrentText(value);
+            }
+        });
+    }
+
+signals:
+    void positionChanged(Event *event);
+    void xChanged(int);
+    void yChanged(int);
+    void elevationChanged(int);
+    void spriteChanged(QPixmap pixmap);
+    void onPropertyChanged(QString key, QString value);
+
+public slots:
+    void set_x(const QString &text) {
+        event->put("x", text);
+        updatePosition();
+    }
+    void set_y(const QString &text) {
+        event->put("y", text);
+        updatePosition();
+    }
+    void set_elevation(const QString &text) {
+        event->put("elevation", text);
+        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*);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*);
+};
+
+#endif // EDITOR_H

src/eventpropertiesframe.ui

@@ -1,286 +1,286 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ObjectPropertiesFrame</class>
- <widget class="QFrame" name="ObjectPropertiesFrame">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>284</width>
-    <height>146</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>284</width>
-    <height>90</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Frame</string>
-  </property>
-  <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
-  </property>
-  <property name="frameShape">
-   <enum>QFrame::Box</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
-  <property name="lineWidth">
-   <number>1</number>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QLabel" name="label_spritePixmap">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>64</width>
-          <height>64</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="scaledContents">
-         <bool>false</bool>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-        <property name="indent">
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="label_name">
-          <property name="text">
-           <string>Object 1</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <layout class="QHBoxLayout" name="x">
-            <item>
-             <widget class="QLabel" name="label_x">
-              <property name="text">
-               <string>X</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="NoScrollSpinBox" name="spinBox_x">
-              <property name="focusPolicy">
-               <enum>Qt::StrongFocus</enum>
-              </property>
-              <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The X coordinate of this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-              <property name="minimum">
-               <number>-32768</number>
-              </property>
-              <property name="maximum">
-               <number>32767</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="y">
-            <item>
-             <widget class="QLabel" name="label_y">
-              <property name="text">
-               <string>Y</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="NoScrollSpinBox" name="spinBox_y">
-              <property name="focusPolicy">
-               <enum>Qt::StrongFocus</enum>
-              </property>
-              <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Y coordinate of this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-              <property name="minimum">
-               <number>-32768</number>
-              </property>
-              <property name="maximum">
-               <number>32767</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="z">
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Z</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="NoScrollSpinBox" name="spinBox_z">
-              <property name="focusPolicy">
-               <enum>Qt::StrongFocus</enum>
-              </property>
-              <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The elevation of this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-              <property name="maximum">
-               <number>15</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="sprite" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QFormLayout" name="formLayout_sprite">
-      <property name="leftMargin">
-       <number>9</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_sprite">
-        <property name="text">
-         <string>Sprite</string>
-        </property>
-        <property name="buddy">
-         <cstring>comboBox_sprite</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="NoScrollComboBox" name="comboBox_sprite">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::StrongFocus</enum>
-        </property>
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The sprite graphics to use for this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="editable">
-         <bool>true</bool>
-        </property>
-        <property name="currentText">
-         <string/>
-        </property>
-        <property name="maxVisibleItems">
-         <number>25</number>
-        </property>
-        <property name="sizeAdjustPolicy">
-         <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>NoScrollComboBox</class>
-   <extends>QComboBox</extends>
-   <header>noscrollcombobox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>NoScrollSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>noscrollspinbox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>spinBox_x</tabstop>
-  <tabstop>spinBox_y</tabstop>
-  <tabstop>spinBox_z</tabstop>
-  <tabstop>comboBox_sprite</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ObjectPropertiesFrame</class>
+ <widget class="QFrame" name="ObjectPropertiesFrame">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>284</width>
+    <height>146</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>284</width>
+    <height>90</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Frame</string>
+  </property>
+  <property name="layoutDirection">
+   <enum>Qt::LeftToRight</enum>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::Box</enum>
+  </property>
+  <property name="frameShadow">
+   <enum>QFrame::Raised</enum>
+  </property>
+  <property name="lineWidth">
+   <number>1</number>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="label_spritePixmap">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>64</width>
+          <height>64</height>
+         </size>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="scaledContents">
+         <bool>false</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="indent">
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="label_name">
+          <property name="text">
+           <string>Object 1</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="x">
+            <item>
+             <widget class="QLabel" name="label_x">
+              <property name="text">
+               <string>X</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="NoScrollSpinBox" name="spinBox_x">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The X coordinate of this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="minimum">
+               <number>-32768</number>
+              </property>
+              <property name="maximum">
+               <number>32767</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="y">
+            <item>
+             <widget class="QLabel" name="label_y">
+              <property name="text">
+               <string>Y</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="NoScrollSpinBox" name="spinBox_y">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Y coordinate of this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="minimum">
+               <number>-32768</number>
+              </property>
+              <property name="maximum">
+               <number>32767</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="z">
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Z</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="NoScrollSpinBox" name="spinBox_z">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The elevation of this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="maximum">
+               <number>15</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="sprite" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QFormLayout" name="formLayout_sprite">
+      <property name="leftMargin">
+       <number>9</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_sprite">
+        <property name="text">
+         <string>Sprite</string>
+        </property>
+        <property name="buddy">
+         <cstring>comboBox_sprite</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="NoScrollComboBox" name="comboBox_sprite">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::StrongFocus</enum>
+        </property>
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The sprite graphics to use for this object.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="editable">
+         <bool>true</bool>
+        </property>
+        <property name="currentText">
+         <string/>
+        </property>
+        <property name="maxVisibleItems">
+         <number>25</number>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>NoScrollComboBox</class>
+   <extends>QComboBox</extends>
+   <header>noscrollcombobox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>NoScrollSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>noscrollspinbox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>spinBox_x</tabstop>
+  <tabstop>spinBox_y</tabstop>
+  <tabstop>spinBox_z</tabstop>
+  <tabstop>comboBox_sprite</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

src/main.cpp

@@ -1,12 +1,12 @@
-#include "mainwindow.h"
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    a.setStyle("fusion");
-    MainWindow w;
-    w.show();
-
-    return a.exec();
-}
+#include "mainwindow.h"
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    a.setStyle("fusion");
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}

src/mainwindow.h

@@ -1,157 +1,157 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QString>
-#include <QModelIndex>
-#include <QMainWindow>
-#include <QStandardItemModel>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsItemGroup>
-#include <QGraphicsSceneMouseEvent>
-#include <QAbstractItemModel>
-#include "project.h"
-#include "map.h"
-#include "editor.h"
-
-namespace Ui {
-class MainWindow;
-}
-
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    explicit MainWindow(QWidget *parent = nullptr);
-    ~MainWindow();
-
-private slots:
-    void on_action_Open_Project_triggered();
-    void on_mapList_activated(const QModelIndex &index);
-    void on_action_Save_Project_triggered();
-    void openWarpMap(QString map_name, QString warp_num);
-
-    void undo();
-    void redo();
-
-    void openInTextEditor();
-
-    void onLoadMapRequested(QString, QString);
-    void onMapChanged(Map *map);
-    void onMapNeedsRedrawing();
-
-    void on_action_Save_triggered();
-    void on_tabWidget_2_currentChanged(int index);
-    void on_action_Exit_triggered();
-    void on_comboBox_Song_activated(const QString &arg1);
-    void on_comboBox_Location_activated(const QString &arg1);
-    void on_comboBox_Visibility_activated(const QString &arg1);
-    void on_comboBox_Weather_activated(const QString &arg1);
-    void on_comboBox_Type_activated(const QString &arg1);
-    void on_comboBox_BattleScene_activated(const QString &arg1);
-    void on_checkBox_ShowLocation_clicked(bool checked);
-
-    void on_tabWidget_currentChanged(int index);
-
-    void on_actionUndo_triggered();
-
-    void on_actionRedo_triggered();
-
-    void on_actionZoom_In_triggered();
-    void on_actionZoom_Out_triggered();
-    void on_actionBetter_Cursors_triggered();
-    void on_actionPencil_triggered();
-    void on_actionPointer_triggered();
-    void on_actionFlood_Fill_triggered();
-    void on_actionEyedropper_triggered();
-    void on_actionMove_triggered();
-    void on_actionMap_Shift_triggered();
-
-    void on_toolButton_deleteObject_clicked();
-    void on_toolButton_Open_Scripts_clicked();
-
-    void addNewEvent(QString);
-    void updateSelectedObjects();
-
-    void on_toolButton_Paint_clicked();
-
-    void on_toolButton_Select_clicked();
-
-    void on_toolButton_Fill_clicked();
-
-    void on_toolButton_Dropper_clicked();
-
-    void on_toolButton_Move_clicked();
-
-    void on_toolButton_Shift_clicked();
-
-    void onOpenMapListContextMenu(const QPoint &point);
-    void onAddNewMapToGroupClick(QAction* triggeredAction);
-    void onTilesetChanged(QString);
-    void currentMetatilesSelectionChanged();
-
-    void on_action_Export_Map_Image_triggered();
-
-    void on_comboBox_ConnectionDirection_currentIndexChanged(const QString &arg1);
-
-    void on_spinBox_ConnectionOffset_valueChanged(int offset);
-
-    void on_comboBox_ConnectedMap_currentTextChanged(const QString &mapName);
-
-    void on_pushButton_AddConnection_clicked();
-
-    void on_pushButton_RemoveConnection_clicked();
-
-    void on_comboBox_DiveMap_currentTextChanged(const QString &mapName);
-
-    void on_comboBox_EmergeMap_currentTextChanged(const QString &mapName);
-
-    void on_comboBox_PrimaryTileset_activated(const QString &arg1);
-
-    void on_comboBox_SecondaryTileset_activated(const QString &arg1);
-
-    void on_pushButton_clicked();
-
-    void on_checkBox_smartPaths_stateChanged(int selected);
-
-    void on_checkBox_Visibility_clicked(bool checked);
-
-    void on_checkBox_ToggleBorder_stateChanged(int arg1);
-
-private:
-    Ui::MainWindow *ui;
-    QStandardItemModel *mapListModel;
-    QList<QStandardItem*> *mapGroupsModel;
-    Editor *editor = nullptr;
-    QIcon* mapIcon;
-    void setMap(QString);
-    void redrawMapScene();
-    void loadDataStructures();
-    void populateMapList();
-    QString getExistingDirectory(QString);
-    void openProject(QString dir);
-    QString getDefaultMap();
-    void setRecentMap(QString map_name);
-    QStandardItem* createMapItem(QString mapName, int groupNum, int inGroupNum);
-
-    void markAllEdited(QAbstractItemModel *model);
-    void markEdited(QModelIndex index);
-    void updateMapList();
-
-    void displayMapProperties();
-    void checkToolButtons();
-
-    void scaleMapView(int);
-    void initExtraShortcuts();
-    void initExtraSignals();
-    void initEditor();
-    void loadUserSettings();
-    void openRecentProject();
-};
-
-enum MapListUserRoles {
-    GroupRole = Qt::UserRole + 1, // Used to hold the map group number.
-    TypeRole = Qt::UserRole + 2,  // Used to differentiate between the different layers of the map list tree view.
-};
-
-#endif // MAINWINDOW_H
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QString>
+#include <QModelIndex>
+#include <QMainWindow>
+#include <QStandardItemModel>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsItemGroup>
+#include <QGraphicsSceneMouseEvent>
+#include <QAbstractItemModel>
+#include "project.h"
+#include "map.h"
+#include "editor.h"
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = nullptr);
+    ~MainWindow();
+
+private slots:
+    void on_action_Open_Project_triggered();
+    void on_mapList_activated(const QModelIndex &index);
+    void on_action_Save_Project_triggered();
+    void openWarpMap(QString map_name, QString warp_num);
+
+    void undo();
+    void redo();
+
+    void openInTextEditor();
+
+    void onLoadMapRequested(QString, QString);
+    void onMapChanged(Map *map);
+    void onMapNeedsRedrawing();
+
+    void on_action_Save_triggered();
+    void on_tabWidget_2_currentChanged(int index);
+    void on_action_Exit_triggered();
+    void on_comboBox_Song_activated(const QString &arg1);
+    void on_comboBox_Location_activated(const QString &arg1);
+    void on_comboBox_Visibility_activated(const QString &arg1);
+    void on_comboBox_Weather_activated(const QString &arg1);
+    void on_comboBox_Type_activated(const QString &arg1);
+    void on_comboBox_BattleScene_activated(const QString &arg1);
+    void on_checkBox_ShowLocation_clicked(bool checked);
+
+    void on_tabWidget_currentChanged(int index);
+
+    void on_actionUndo_triggered();
+
+    void on_actionRedo_triggered();
+
+    void on_actionZoom_In_triggered();
+    void on_actionZoom_Out_triggered();
+    void on_actionBetter_Cursors_triggered();
+    void on_actionPencil_triggered();
+    void on_actionPointer_triggered();
+    void on_actionFlood_Fill_triggered();
+    void on_actionEyedropper_triggered();
+    void on_actionMove_triggered();
+    void on_actionMap_Shift_triggered();
+
+    void on_toolButton_deleteObject_clicked();
+    void on_toolButton_Open_Scripts_clicked();
+
+    void addNewEvent(QString);
+    void updateSelectedObjects();
+
+    void on_toolButton_Paint_clicked();
+
+    void on_toolButton_Select_clicked();
+
+    void on_toolButton_Fill_clicked();
+
+    void on_toolButton_Dropper_clicked();
+
+    void on_toolButton_Move_clicked();
+
+    void on_toolButton_Shift_clicked();
+
+    void onOpenMapListContextMenu(const QPoint &point);
+    void onAddNewMapToGroupClick(QAction* triggeredAction);
+    void onTilesetChanged(QString);
+    void currentMetatilesSelectionChanged();
+
+    void on_action_Export_Map_Image_triggered();
+
+    void on_comboBox_ConnectionDirection_currentIndexChanged(const QString &arg1);
+
+    void on_spinBox_ConnectionOffset_valueChanged(int offset);
+
+    void on_comboBox_ConnectedMap_currentTextChanged(const QString &mapName);
+
+    void on_pushButton_AddConnection_clicked();
+
+    void on_pushButton_RemoveConnection_clicked();
+
+    void on_comboBox_DiveMap_currentTextChanged(const QString &mapName);
+
+    void on_comboBox_EmergeMap_currentTextChanged(const QString &mapName);
+
+    void on_comboBox_PrimaryTileset_activated(const QString &arg1);
+
+    void on_comboBox_SecondaryTileset_activated(const QString &arg1);
+
+    void on_pushButton_clicked();
+
+    void on_checkBox_smartPaths_stateChanged(int selected);
+
+    void on_checkBox_Visibility_clicked(bool checked);
+
+    void on_checkBox_ToggleBorder_stateChanged(int arg1);
+
+private:
+    Ui::MainWindow *ui;
+    QStandardItemModel *mapListModel;
+    QList<QStandardItem*> *mapGroupsModel;
+    Editor *editor = nullptr;
+    QIcon* mapIcon;
+    void setMap(QString);
+    void redrawMapScene();
+    void loadDataStructures();
+    void populateMapList();
+    QString getExistingDirectory(QString);
+    void openProject(QString dir);
+    QString getDefaultMap();
+    void setRecentMap(QString map_name);
+    QStandardItem* createMapItem(QString mapName, int groupNum, int inGroupNum);
+
+    void markAllEdited(QAbstractItemModel *model);
+    void markEdited(QModelIndex index);
+    void updateMapList();
+
+    void displayMapProperties();
+    void checkToolButtons();
+
+    void scaleMapView(int);
+    void initExtraShortcuts();
+    void initExtraSignals();
+    void initEditor();
+    void loadUserSettings();
+    void openRecentProject();
+};
+
+enum MapListUserRoles {
+    GroupRole = Qt::UserRole + 1, // Used to hold the map group number.
+    TypeRole = Qt::UserRole + 2,  // Used to differentiate between the different layers of the map list tree view.
+};
+
+#endif // MAINWINDOW_H

src/project.h

@@ -1,152 +1,152 @@
-#ifndef PROJECT_H
-#define PROJECT_H
-
-#include "map.h"
-#include "blockdata.h"
-#include "heallocation.h"
-
-#include <QStringList>
-#include <QList>
-#include <QStandardItem>
-
-static QString NONE_MAP_CONSTANT = "MAP_NONE";
-static QString NONE_MAP_NAME = "None";
-
-class Project
-{
-public:
-    Project();
-    QString root;
-    QStringList *groupNames = nullptr;
-    QMap<QString, int> *map_groups;
-    QList<QStringList> groupedMapNames;
-    QStringList *mapNames = nullptr;
-    QList<HealLocation> flyableMaps;
-    QMap<QString, QString>* mapConstantsToMapNames;
-    QMap<QString, QString>* mapNamesToMapConstants;
-    QList<QString> mapLayoutsTable;
-    QList<QString> mapLayoutsTableMaster;
-    QMap<QString, MapLayout*> mapLayouts;
-    QMap<QString, MapLayout*> mapLayoutsMaster;
-    QStringList *regionMapSections = nullptr;
-    QStringList *itemNames = nullptr;
-    QStringList *flagNames = nullptr;
-    QStringList *varNames = nullptr;
-    QStringList *movementTypes = nullptr;
-    QStringList *mapTypes = nullptr;
-    QStringList *mapBattleScenes = nullptr;
-    QStringList *weatherNames = nullptr;
-    QStringList *coordEventWeatherNames = nullptr;
-    QStringList *secretBaseIds = nullptr;
-    QStringList *bgEventFacingDirections = nullptr;
-    QStringList mapsWithConnections;
-
-    QMap<QString, Map*> *map_cache;
-    Map* loadMap(QString);
-    Map* getMap(QString);
-
-    QMap<QString, Tileset*> *tileset_cache = nullptr;
-    Tileset* loadTileset(QString);
-    Tileset* getTileset(QString);
-
-    Blockdata* readBlockdata(QString);
-    void loadBlockdata(Map*);
-
-    QString readTextFile(QString path);
-    void saveTextFile(QString path, QString text);
-    void appendTextFile(QString path, QString text);
-    void deleteFile(QString path);
-
-    void readMapGroups();
-    Map* addNewMapToGroup(QString mapName, int groupNum);
-    QString getNewMapName();
-    QString getProjectTitle();
-
-    QList<QStringList>* getLabelMacros(QList<QStringList>*, QString);
-    QStringList* getLabelValues(QList<QStringList>*, QString);
-    void readMapHeader(Map*);
-    void readMapLayoutsTable();
-    void readAllMapLayouts();
-    QStringList* readLayoutValues(QString layoutName);
-    void readMapLayout(Map*);
-    void readMapsWithConnections();
-    void loadMapTilesets(Map*);
-    void loadTilesetAssets(Tileset*);
-
-    void saveBlockdata(Map*);
-    void saveMapBorder(Map*);
-    void writeBlockdata(QString, Blockdata*);
-    void saveAllMaps();
-    void saveMap(Map*);
-    void saveAllDataStructures();
-    void saveAllMapLayouts();
-    void saveMapGroupsTable();
-    void saveMapConstantsHeader();
-    void saveHealLocationStruct(Map*);
-
-    QList<QStringList>* parseAsm(QString text);
-    QStringList getSongNames();
-    QStringList getVisibilities();
-    QMap<QString, QStringList> getTilesets();
-    void readTilesetProperties();
-    void readRegionMapSections();
-    void readItemNames();
-    void readFlagNames();
-    void readVarNames();
-    void readMovementTypes();
-    void readMapTypes();
-    void readMapBattleScenes();
-    void readWeatherNames();
-    void readCoordEventWeatherNames();
-    void readSecretBaseIds();
-    void readBgEventFacingDirections();
-
-    void loadEventPixmaps(QList<Event*> objects);
-    QMap<QString, int> getEventObjGfxConstants();
-    QString fixGraphicPath(QString path);
-
-    void readMapEvents(Map *map);
-    void loadMapConnections(Map *map);
-
-    void loadMapBorder(Map *map);
-
-    void saveMapEvents(Map *map);
-
-    QStringList readCArray(QString text, QString label);
-    QString readCIncbin(QString text, QString label);
-    QMap<QString, int> readCDefines(QString text, QStringList prefixes);
-
-    static int getNumTilesPrimary();
-    static int getNumTilesTotal();
-    static int getNumMetatilesPrimary();
-    static int getNumMetatilesTotal();
-    static int getNumPalettesPrimary();
-    static int getNumPalettesTotal();
-private:
-    QString getMapLayoutsTableFilepath();
-    QString getMapLayoutFilepath(QString);
-    void saveMapHeader(Map*);
-    void saveMapConnections(Map*);
-    void updateMapsWithConnections(Map*);
-    void saveMapsWithConnections();
-    void saveMapLayoutsTable();
-    void updateMapLayout(Map*);
-    void readCDefinesSorted(QString, QStringList, QStringList*);
-    void readCDefinesSorted(QString, QStringList, QStringList*, QString, int);
-
-    void setNewMapHeader(Map* map, int mapIndex);
-    void setNewMapLayout(Map* map);
-    void setNewMapBlockdata(Map* map);
-    void setNewMapBorder(Map *map);
-    void setNewMapEvents(Map *map);
-    void setNewMapConnections(Map *map);
-
-    static int num_tiles_primary;
-    static int num_tiles_total;
-    static int num_metatiles_primary;
-    static int num_metatiles_total;
-    static int num_pals_primary;
-    static int num_pals_total;
-};
-
-#endif // PROJECT_H
+#ifndef PROJECT_H
+#define PROJECT_H
+
+#include "map.h"
+#include "blockdata.h"
+#include "heallocation.h"
+
+#include <QStringList>
+#include <QList>
+#include <QStandardItem>
+
+static QString NONE_MAP_CONSTANT = "MAP_NONE";
+static QString NONE_MAP_NAME = "None";
+
+class Project
+{
+public:
+    Project();
+    QString root;
+    QStringList *groupNames = nullptr;
+    QMap<QString, int> *map_groups;
+    QList<QStringList> groupedMapNames;
+    QStringList *mapNames = nullptr;
+    QList<HealLocation> flyableMaps;
+    QMap<QString, QString>* mapConstantsToMapNames;
+    QMap<QString, QString>* mapNamesToMapConstants;
+    QList<QString> mapLayoutsTable;
+    QList<QString> mapLayoutsTableMaster;
+    QMap<QString, MapLayout*> mapLayouts;
+    QMap<QString, MapLayout*> mapLayoutsMaster;
+    QStringList *regionMapSections = nullptr;
+    QStringList *itemNames = nullptr;
+    QStringList *flagNames = nullptr;
+    QStringList *varNames = nullptr;
+    QStringList *movementTypes = nullptr;
+    QStringList *mapTypes = nullptr;
+    QStringList *mapBattleScenes = nullptr;
+    QStringList *weatherNames = nullptr;
+    QStringList *coordEventWeatherNames = nullptr;
+    QStringList *secretBaseIds = nullptr;
+    QStringList *bgEventFacingDirections = nullptr;
+    QStringList mapsWithConnections;
+
+    QMap<QString, Map*> *map_cache;
+    Map* loadMap(QString);
+    Map* getMap(QString);
+
+    QMap<QString, Tileset*> *tileset_cache = nullptr;
+    Tileset* loadTileset(QString);
+    Tileset* getTileset(QString);
+
+    Blockdata* readBlockdata(QString);
+    void loadBlockdata(Map*);
+
+    QString readTextFile(QString path);
+    void saveTextFile(QString path, QString text);
+    void appendTextFile(QString path, QString text);
+    void deleteFile(QString path);
+
+    void readMapGroups();
+    Map* addNewMapToGroup(QString mapName, int groupNum);
+    QString getNewMapName();
+    QString getProjectTitle();
+
+    QList<QStringList>* getLabelMacros(QList<QStringList>*, QString);
+    QStringList* getLabelValues(QList<QStringList>*, QString);
+    void readMapHeader(Map*);
+    void readMapLayoutsTable();
+    void readAllMapLayouts();
+    QStringList* readLayoutValues(QString layoutName);
+    void readMapLayout(Map*);
+    void readMapsWithConnections();
+    void loadMapTilesets(Map*);
+    void loadTilesetAssets(Tileset*);
+
+    void saveBlockdata(Map*);
+    void saveMapBorder(Map*);
+    void writeBlockdata(QString, Blockdata*);
+    void saveAllMaps();
+    void saveMap(Map*);
+    void saveAllDataStructures();
+    void saveAllMapLayouts();
+    void saveMapGroupsTable();
+    void saveMapConstantsHeader();
+    void saveHealLocationStruct(Map*);
+
+    QList<QStringList>* parseAsm(QString text);
+    QStringList getSongNames();
+    QStringList getVisibilities();
+    QMap<QString, QStringList> getTilesets();
+    void readTilesetProperties();
+    void readRegionMapSections();
+    void readItemNames();
+    void readFlagNames();
+    void readVarNames();
+    void readMovementTypes();
+    void readMapTypes();
+    void readMapBattleScenes();
+    void readWeatherNames();
+    void readCoordEventWeatherNames();
+    void readSecretBaseIds();
+    void readBgEventFacingDirections();
+
+    void loadEventPixmaps(QList<Event*> objects);
+    QMap<QString, int> getEventObjGfxConstants();
+    QString fixGraphicPath(QString path);
+
+    void readMapEvents(Map *map);
+    void loadMapConnections(Map *map);
+
+    void loadMapBorder(Map *map);
+
+    void saveMapEvents(Map *map);
+
+    QStringList readCArray(QString text, QString label);
+    QString readCIncbin(QString text, QString label);
+    QMap<QString, int> readCDefines(QString text, QStringList prefixes);
+
+    static int getNumTilesPrimary();
+    static int getNumTilesTotal();
+    static int getNumMetatilesPrimary();
+    static int getNumMetatilesTotal();
+    static int getNumPalettesPrimary();
+    static int getNumPalettesTotal();
+private:
+    QString getMapLayoutsTableFilepath();
+    QString getMapLayoutFilepath(QString);
+    void saveMapHeader(Map*);
+    void saveMapConnections(Map*);
+    void updateMapsWithConnections(Map*);
+    void saveMapsWithConnections();
+    void saveMapLayoutsTable();
+    void updateMapLayout(Map*);
+    void readCDefinesSorted(QString, QStringList, QStringList*);
+    void readCDefinesSorted(QString, QStringList, QStringList*, QString, int);
+
+    void setNewMapHeader(Map* map, int mapIndex);
+    void setNewMapLayout(Map* map);
+    void setNewMapBlockdata(Map* map);
+    void setNewMapBorder(Map *map);
+    void setNewMapEvents(Map *map);
+    void setNewMapConnections(Map *map);
+
+    static int num_tiles_primary;
+    static int num_tiles_total;
+    static int num_metatiles_primary;
+    static int num_metatiles_total;
+    static int num_pals_primary;
+    static int num_pals_total;
+};
+
+#endif // PROJECT_H

src/resources/images.qrc

@@ -1,27 +1,27 @@
-<RCC>
-    <qresource prefix="/">
-        <file>icons/folder.ico</file>
-        <file>icons/folder_closed.ico</file>
-        <file>icons/folder_closed_map.ico</file>
-        <file>icons/folder_image.ico</file>
-        <file>icons/folder_map.ico</file>
-        <file>icons/image.ico</file>
-        <file>icons/map.ico</file>
-        <file>icons/cursor.ico</file>
-        <file>icons/fill_color.ico</file>
-        <file>icons/move.ico</file>
-        <file>icons/pencil.ico</file>
-        <file>icons/pipette.ico</file>
-        <file>images/Entities_16x16.png</file>
-        <file>icons/add.ico</file>
-        <file>icons/delete.ico</file>
-        <file>icons/viewsprites.ico</file>
-        <file>images/collisions.png</file>
-        <file>icons/fill_color_cursor.ico</file>
-        <file>icons/pencil_cursor.ico</file>
-        <file>icons/pipette_cursor.ico</file>
-        <file>icons/shift.ico</file>
-        <file>icons/shift_cursor.ico</file>
-        <file>icons/porymap-icon-1.ico</file>
-    </qresource>
-</RCC>
+<RCC>
+    <qresource prefix="/">
+        <file>icons/folder.ico</file>
+        <file>icons/folder_closed.ico</file>
+        <file>icons/folder_closed_map.ico</file>
+        <file>icons/folder_image.ico</file>
+        <file>icons/folder_map.ico</file>
+        <file>icons/image.ico</file>
+        <file>icons/map.ico</file>
+        <file>icons/cursor.ico</file>
+        <file>icons/fill_color.ico</file>
+        <file>icons/move.ico</file>
+        <file>icons/pencil.ico</file>
+        <file>icons/pipette.ico</file>
+        <file>images/Entities_16x16.png</file>
+        <file>icons/add.ico</file>
+        <file>icons/delete.ico</file>
+        <file>icons/viewsprites.ico</file>
+        <file>images/collisions.png</file>
+        <file>icons/fill_color_cursor.ico</file>
+        <file>icons/pencil_cursor.ico</file>
+        <file>icons/pipette_cursor.ico</file>
+        <file>icons/shift.ico</file>
+        <file>icons/shift_cursor.ico</file>
+        <file>icons/porymap-icon-1.ico</file>
+    </qresource>
+</RCC>