Simplify new map popup internal

include/mainwindow.h

@@ -176,7 +176,7 @@ private slots:
     void onMapNeedsRedrawing();
     void onTilesetsSaved(QString, QString);
     void onWildMonDataChanged();
-    void openNewMapPopupWindow(int, QVariant);
+    void openNewMapPopupWindow(MapSortOrder, QVariant);
     void openNewMapPopupWindowImportMap(MapLayout *);
     void onNewMapCreated();
     void onMapCacheCleared();
@@ -330,6 +330,7 @@ private:
     bool isProgrammaticEventTabChange;
     bool projectHasUnsavedChanges;
     bool projectOpenFailure = false;
+    bool openedNewMapDialog = false;
 
     MapSortOrder mapSortOrder;
 

include/ui/newmappopup.h

@@ -22,10 +22,10 @@ public:
     bool existingLayout;
     bool importedMap;
     QString layoutId;
-    void init(int, int, QString, QString);
+    void init(MapSortOrder type, QVariant data);
     void initImportMap(MapLayout *);
-    void useLayout(QString);
     void connectSignals();
+    static void initSettings(Project *project);
 
 signals:
     void applied();
@@ -35,9 +35,30 @@ private:
     Project *project;
     void setDefaultValues(int, QString);
     void setDefaultValuesImportMap(MapLayout *);
-    void setDefaultValuesProjectConfig(bool, MapLayout*);
+    void setDefaultValuesProjectConfig();
     bool checkNewMapDimensions();
     bool checkNewMapGroup();
+    void populateComboBoxes();
+
+    struct Settings {
+        QString group;
+        int width;
+        int height;
+        int borderWidth;
+        int borderHeight;
+        QString primaryTileset;
+        QString secondaryTileset;
+        QString type;
+        QString location;
+        QString song;
+        bool canFlyTo;
+        bool showLocationName;
+        bool allowRunning;
+        bool allowBiking;
+        bool allowEscaping;
+        int floorNumber;
+    };
+    static struct Settings settings;
 
 private slots:
     void on_pushButton_NewMap_Accept_clicked();