move region map editor to its own window

include/editor.h

@@ -19,10 +19,6 @@
 #include "currentselectedmetatilespixmapitem.h"
 #include "collisionpixmapitem.h"
 #include "mappixmapitem.h"
-#include "regionmappixmapitem.h"
-#include "citymappixmapitem.h"
-#include "regionmaplayoutpixmapitem.h"
-#include "regionmapeditor.h"
 #include "settings.h"
 #include "movablerect.h"
 #include "cursortilerect.h"
@@ -81,49 +77,6 @@ public:
     void updateCustomMapHeaderValues(QTableWidget *);
     Tileset *getCurrentMapPrimaryTileset();
 
-// TODO: move these to appropriate place
-    RegionMap *region_map;
-    void loadRegionMapData();
-
-    QGraphicsScene *scene_region_map_image = nullptr;
-    QGraphicsScene *scene_city_map_image = nullptr;
-    QGraphicsScene *scene_region_map_layout = nullptr;
-    QGraphicsScene *scene_region_map_tiles = nullptr;
-    QGraphicsScene *scene_city_map_tiles = nullptr;
-    TilemapTileSelector *mapsquare_selector_item = nullptr;
-    TilemapTileSelector *city_map_selector_item = nullptr;
-    RegionMapPixmapItem *region_map_item = nullptr;
-    CityMapPixmapItem *city_map_item = nullptr;
-    RegionMapLayoutPixmapItem *region_map_layout_item = nullptr;
-
-    void displayRegionMap();
-    void displayRegionMapImage();
-    void displayRegionMapLayout();
-    void displayRegionMapLayoutOptions();
-    void updateRegionMapLayoutOptions(int);
-    void displayRegionMapTileSelector();
-    void displayCityMapTileSelector();
-    void displayCityMap(QString);
-    void loadCityMaps();
-
-    void onRegionMapTileSelectorSelectedTileChanged();
-    void onRegionMapTileSelectorHoveredTileChanged(unsigned);
-    void onRegionMapTileSelectorHoveredTileCleared();
-
-    void onRegionMapLayoutSelectedTileChanged(int);
-    void onRegionMapLayoutHoveredTileChanged(int);
-    void onRegionMapLayoutHoveredTileCleared();
-
-private slots:
-    void onHoveredRegionMapTileChanged(int, int);
-    void onHoveredRegionMapTileCleared();
-    void mouseEvent_region_map(QGraphicsSceneMouseEvent *, RegionMapPixmapItem *);
-    void mouseEvent_city_map(QGraphicsSceneMouseEvent *, CityMapPixmapItem *);
-
-public:
-    QString rmStatusbarMessage;
-//
-
     DraggablePixmapItem *addMapEvent(Event *event);
     void selectMapEvent(DraggablePixmapItem *object);
     void selectMapEvent(DraggablePixmapItem *object, bool toggle);
@@ -152,7 +105,6 @@ public:
     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;
@@ -164,7 +116,7 @@ public:
 
     QString map_edit_mode;
     QString prev_edit_mode;
-    
+
     int scale_exp = 0;
     double scale_base = sqrt(2); // adjust scale factor with this
     qreal collisionOpacity = 0.5;

include/mainwindow.h

@@ -15,6 +15,7 @@
 #include "map.h"
 #include "editor.h"
 #include "tileseteditor.h"
+#include "regionmapeditor.h"
 #include "filterchildrenproxymodel.h"
 #include "newmappopup.h"
 
@@ -65,10 +66,7 @@ private slots:
     void on_checkBox_AllowBiking_clicked(bool checked);
     void on_checkBox_AllowEscapeRope_clicked(bool checked);
 
-    void on_tabWidget_Region_Map_currentChanged(int);
-
     void on_tabWidget_currentChanged(int index);
-    void on_pushButton_RM_Options_save_clicked();
 
     void on_actionUndo_triggered();
 
@@ -134,9 +132,6 @@ private slots:
 
     void on_pushButton_clicked();
 
-    void on_pushButton_CityMap_save_clicked();
-    void on_comboBox_CityMap_picker_currentTextChanged(const QString &);
-
     void on_checkBox_smartPaths_stateChanged(int selected);
 
     void on_checkBox_Visibility_clicked(bool checked);
@@ -166,9 +161,12 @@ private slots:
     void on_tableWidget_CustomHeaderFields_cellChanged(int row, int column);
     void on_horizontalSlider_MetatileZoom_valueChanged(int value);
 
+    void on_actionRegion_Map_Editor_triggered();
+
 private:
     Ui::MainWindow *ui;
     TilesetEditor *tilesetEditor = nullptr;
+    RegionMapEditor *regionMapEditor = nullptr;
     FilterChildrenProxyModel *mapListProxyModel;
     NewMapPopup *newmapprompt = nullptr;
     QStandardItemModel *mapListModel;

include/ui/regionmapeditor.h

@@ -0,0 +1,76 @@
+#ifndef REGIONMAPEDITOR_H
+#define REGIONMAPEDITOR_H
+
+#include "regionmappixmapitem.h"
+#include "citymappixmapitem.h"
+#include "regionmaplayoutpixmapitem.h"
+#include "regionmap.h"
+
+#include <QMainWindow>
+#include <QGraphicsSceneMouseEvent>
+#include <QCloseEvent>
+
+namespace Ui {
+class RegionMapEditor;
+}
+
+class RegionMapEditor : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit RegionMapEditor(QWidget *parent = 0, Project *pro = nullptr);
+    ~RegionMapEditor();
+
+// TODO: make members that are not called outside of this private
+    RegionMap *region_map;
+
+    QGraphicsScene *scene_region_map_image = nullptr;
+    QGraphicsScene *scene_city_map_image = nullptr;
+    QGraphicsScene *scene_region_map_layout = nullptr;
+    QGraphicsScene *scene_region_map_tiles = nullptr;
+    QGraphicsScene *scene_city_map_tiles = nullptr;
+    TilemapTileSelector *mapsquare_selector_item = nullptr;
+    TilemapTileSelector *city_map_selector_item = nullptr;
+    RegionMapPixmapItem *region_map_item = nullptr;
+    CityMapPixmapItem *city_map_item = nullptr;
+    RegionMapLayoutPixmapItem *region_map_layout_item = nullptr;
+
+    void loadRegionMapData();
+    void displayRegionMap();
+    void displayRegionMapImage();
+    void displayRegionMapLayout();
+    void displayRegionMapLayoutOptions();
+    void updateRegionMapLayoutOptions(int);
+    void displayRegionMapTileSelector();
+    void displayCityMapTileSelector();
+    void displayCityMap(QString);
+    void loadCityMaps();
+
+    void onRegionMapTileSelectorSelectedTileChanged();
+    void onRegionMapTileSelectorHoveredTileChanged(unsigned);
+    void onRegionMapTileSelectorHoveredTileCleared();
+
+    void onRegionMapLayoutSelectedTileChanged(int);
+    void onRegionMapLayoutHoveredTileChanged(int);
+    void onRegionMapLayoutHoveredTileCleared();
+
+private:
+    Ui::RegionMapEditor *ui;
+    Project *project;
+
+    QString rmStatusbarMessage;
+
+private slots:
+    void on_action_RegionMap_Save_triggered();
+    void on_tabWidget_Region_Map_currentChanged(int);
+    void on_pushButton_RM_Options_save_clicked();
+    void on_pushButton_CityMap_save_clicked();
+    void on_comboBox_CityMap_picker_currentTextChanged(const QString &);
+    void onHoveredRegionMapTileChanged(int, int);
+    void onHoveredRegionMapTileCleared();
+    void mouseEvent_region_map(QGraphicsSceneMouseEvent *, RegionMapPixmapItem *);
+    void mouseEvent_city_map(QGraphicsSceneMouseEvent *, CityMapPixmapItem *);
+};
+
+#endif // REGIONMAPEDITOR_H

include/ui/regionmaplayoutpixmapitem.h

@@ -2,8 +2,7 @@
 #define REGIONMAPLAYOUTPIXMAPITEM_H
 
 #include "tilemaptileselector.h"
-//#include "regionmappixmapitem.h"
-#include "regionmapeditor.h"
+#include "regionmap.h"
 
 class RegionMapLayoutPixmapItem : public SelectablePixmapItem {
     Q_OBJECT

include/ui/regionmappixmapitem.h

@@ -1,7 +1,7 @@
 #ifndef REGIONMAPPIXMAPITEM_H
 #define REGIONMAPPIXMAPITEM_H
 
-#include "regionmapeditor.h"
+#include "regionmap.h"
 #include "tilemaptileselector.h"
 #include <QGraphicsPixmapItem>