move map pixmap item and metatile rendering from Map to Layout

include/ui/bordermetatilespixmapitem.h

@@ -1,21 +1,21 @@
 #ifndef BORDERMETATILESPIXMAPITEM_H
 #define BORDERMETATILESPIXMAPITEM_H
 
-#include "map.h"
+#include "maplayout.h"
 #include "metatileselector.h"
 #include <QGraphicsPixmapItem>
 
 class BorderMetatilesPixmapItem : public QObject, public QGraphicsPixmapItem {
     Q_OBJECT
 public:
-    BorderMetatilesPixmapItem(Map *map_, MetatileSelector *metatileSelector) {
-        this->map = map_;
-        this->map->setBorderItem(this);
+    BorderMetatilesPixmapItem(Layout *layout, MetatileSelector *metatileSelector) {
+        this->layout = layout;
+        this->layout->setBorderItem(this);
         this->metatileSelector = metatileSelector;
         setAcceptHoverEvents(true);
     }
     MetatileSelector *metatileSelector;
-    Map *map;
+    Layout *layout;
     void draw();
 signals:
     void hoveredBorderMetatileSelectionChanged(uint16_t);

include/ui/collisionpixmapitem.h

@@ -3,18 +3,18 @@
 
 #include "metatileselector.h"
 #include "movementpermissionsselector.h"
-#include "mappixmapitem.h"
+#include "layoutpixmapitem.h"
 #include "map.h"
 #include "settings.h"
 
-class CollisionPixmapItem : public MapPixmapItem {
+class CollisionPixmapItem : public LayoutPixmapItem {
     Q_OBJECT
 public:
-    CollisionPixmapItem(Map *map, MovementPermissionsSelector *movementPermissionsSelector, MetatileSelector *metatileSelector, Settings *settings, qreal *opacity)
-        : MapPixmapItem(map, metatileSelector, settings){
+    CollisionPixmapItem(Layout *layout, MovementPermissionsSelector *movementPermissionsSelector, MetatileSelector *metatileSelector, Settings *settings, qreal *opacity)
+        : LayoutPixmapItem(layout, metatileSelector, settings){
         this->movementPermissionsSelector = movementPermissionsSelector;
         this->opacity = opacity;
-        map->setCollisionItem(this);
+        layout->setCollisionItem(this);
     }
     MovementPermissionsSelector *movementPermissionsSelector;
     qreal *opacity;

include/ui/layoutpixmapitem.h

@@ -1,12 +1,13 @@
 #ifndef MAPPIXMAPITEM_H
 #define MAPPIXMAPITEM_H
 
-#include "map.h"
 #include "settings.h"
 #include "metatileselector.h"
 #include <QGraphicsPixmapItem>
 
-class MapPixmapItem : public QObject, public QGraphicsPixmapItem {
+class Layout;
+
+class LayoutPixmapItem : public QObject, public QGraphicsPixmapItem {
     Q_OBJECT
 
 private:
@@ -18,37 +19,49 @@ public:
         Metatiles,
         EventObjects
     };
-    MapPixmapItem(Map *map_, MetatileSelector *metatileSelector, Settings *settings) {
-        this->map = map_;
-        this->map->setMapItem(this);
+
+    LayoutPixmapItem(Layout *layout, MetatileSelector *metatileSelector, Settings *settings) {
+        this->layout = layout;
+        // this->map->setMapItem(this);
         this->metatileSelector = metatileSelector;
         this->settings = settings;
         this->paintingMode = PaintMode::Metatiles;
-        this->lockedAxis = MapPixmapItem::Axis::None;
+        this->lockedAxis = LayoutPixmapItem::Axis::None;
         this->prevStraightPathState = false;
         setAcceptHoverEvents(true);
     }
-    MapPixmapItem::PaintMode paintingMode;
-    Map *map;
+
+    LayoutPixmapItem::PaintMode paintingMode;
+
+    Layout *layout;
+
     MetatileSelector *metatileSelector;
+
     Settings *settings;
+
     bool active;
     bool has_mouse = false;
     bool right_click;
+
     int paint_tile_initial_x;
     int paint_tile_initial_y;
     bool prevStraightPathState;
     int straight_path_initial_x;
     int straight_path_initial_y;
+
     QPoint metatilePos;
+
     enum Axis {
         None = 0,
         X,
         Y
     };
-    MapPixmapItem::Axis lockedAxis;
+
+    LayoutPixmapItem::Axis lockedAxis;
+
     QPoint selection_origin;
     QList<QPoint> selection;
+
     virtual void paint(QGraphicsSceneMouseEvent*);
     virtual void floodFill(QGraphicsSceneMouseEvent*);
     virtual void magicFill(QGraphicsSceneMouseEvent*);
@@ -70,11 +83,13 @@ public:
                    QList<CollisionSelectionItem> selectedCollisions,
                    bool fromScriptCall = false);
     void floodFillSmartPath(int initialX, int initialY, bool fromScriptCall = false);
+
     virtual void pick(QGraphicsSceneMouseEvent*);
     virtual void select(QGraphicsSceneMouseEvent*);
     virtual void shift(QGraphicsSceneMouseEvent*);
     void shift(int xDelta, int yDelta, bool fromScriptCall = false);
     virtual void draw(bool ignoreCache = false);
+
     void updateMetatileSelection(QGraphicsSceneMouseEvent *event);
     void paintNormal(int x, int y, bool fromScriptCall = false);
     void lockNondominantAxis(QGraphicsSceneMouseEvent *event);
@@ -87,9 +102,9 @@ private:
     unsigned actionId_ = 0;
 
 signals:
-    void startPaint(QGraphicsSceneMouseEvent *, MapPixmapItem *);
-    void endPaint(QGraphicsSceneMouseEvent *, MapPixmapItem *);
-    void mouseEvent(QGraphicsSceneMouseEvent *, MapPixmapItem *);
+    void startPaint(QGraphicsSceneMouseEvent *, LayoutPixmapItem *);
+    void endPaint(QGraphicsSceneMouseEvent *, LayoutPixmapItem *);
+    void mouseEvent(QGraphicsSceneMouseEvent *, LayoutPixmapItem *);
     void hoveredMapMetatileChanged(const QPoint &pos);
     void hoveredMapMetatileCleared();
 

include/ui/maplistmodels.h

@@ -46,10 +46,40 @@ private:
 
     QString openMap;
 
-    // QIcon *mapIcon = nullptr;
-    // QIcon *mapEditedIcon = nullptr;
-    // QIcon *mapOpenedIcon = nullptr;
-    // QIcon *mapFolderIcon = nullptr;
+signals:
+    void edited();
+};
+
+
+
+class LayoutTreeModel : public QStandardItemModel {
+    Q_OBJECT
+
+public:
+    LayoutTreeModel(Project *project, QObject *parent = nullptr);
+    ~LayoutTreeModel() {}
+
+    QVariant data(const QModelIndex &index, int role) const override;
+
+public:
+    void setLayout(QString layoutName) { this->openLayout = layoutName; }
+
+    QStandardItem *createLayoutItem(QString layoutName);
+    QStandardItem *createMapItem(QString mapName);
+
+    QStandardItem *getItem(const QModelIndex &index) const;
+    QModelIndex indexOfLayout(QString layoutName);
+
+    void initialize();
+
+private:
+    Project *project;
+    QStandardItem *root = nullptr;
+
+    QMap<QString, QStandardItem *> layoutItems;
+    QMap<QString, QStandardItem *> mapItems;
+
+    QString openLayout;
 
 signals:
     void edited();

include/ui/newmappopup.h

@@ -24,7 +24,7 @@ public:
     QString layoutId;
     void init();
     void init(MapSortOrder type, QVariant data);
-    void init(MapLayout *);
+    void init(Layout *);
     static void setDefaultSettings(Project *project);
 
 signals:
@@ -37,7 +37,7 @@ private:
     bool checkNewMapGroup();
     void saveSettings();
     void useLayout(QString layoutId);
-    void useLayoutSettings(MapLayout *mapLayout);
+    void useLayoutSettings(Layout *mapLayout);
 
     struct Settings {
         QString group;