Merge branch 'rme' of https://github.com/garakmon/porymap into rme

include/core/tileset.h

@@ -35,6 +35,10 @@ public:
     static Metatile* getMetatile(int, Tileset*, Tileset*);
     static QList<QList<QRgb>> getBlockPalettes(Tileset*, Tileset*);
     static QList<QRgb> getPalette(int, Tileset*, Tileset*);
+
+    bool appendToHeaders(QString headerFile, QString friendlyName);
+    bool appendToGraphics(QString graphicsFile, QString friendlyName, bool primary);
+    bool appendToMetatiles(QString metatileFile, QString friendlyName, bool primary);
 };
 
 #endif // TILESET_H

include/mainwindow.h

@@ -18,6 +18,7 @@
 #include "regionmapeditor.h"
 #include "filterchildrenproxymodel.h"
 #include "newmappopup.h"
+#include "newtilesetdialog.h"
 
 namespace Ui {
 class MainWindow;
@@ -53,6 +54,7 @@ private slots:
     void onNewMapCreated();
 
     void on_action_NewMap_triggered();
+    void on_actionNew_Tileset_triggered();
     void on_action_Save_triggered();
     void on_tabWidget_2_currentChanged(int index);
     void on_action_Exit_triggered();
@@ -175,6 +177,7 @@ private:
     Editor *editor = nullptr;
     QIcon* mapIcon;
     QIcon* mapEditedIcon;
+    QIcon* mapOpenedIcon;
 
     QWidget *eventTabObjectWidget;
     QWidget *eventTabWarpWidget;
@@ -204,8 +207,7 @@ private:
     void setRecentMap(QString map_name);
     QStandardItem* createMapItem(QString mapName, int groupNum, int inGroupNum);
 
-    void markAllEdited(QAbstractItemModel *model);
-    void markEdited(QModelIndex index);
+    void drawMapListIcons(QAbstractItemModel *model);
     void updateMapList();
 
     void displayMapProperties();

include/project.h

@@ -92,11 +92,15 @@ public:
     void saveMapConstantsHeader();
     void saveHealLocationStruct(Map*);
     void saveTilesets(Tileset*, Tileset*);
+    void saveTilesetMetatileAttributes(Tileset*);
+    void saveTilesetMetatiles(Tileset*);
+    void saveTilesetTilesImage(Tileset*);
+    void saveTilesetPalettes(Tileset*, bool);
 
     QList<QStringList>* parseAsm(QString text);
     QStringList getSongNames();
     QStringList getVisibilities();
-    QMap<QString, QStringList> getTilesets();
+    QMap<QString, QStringList> getTilesetLabels();
     void readTilesetProperties();
     void readRegionMapSections();
     void readItemNames();
@@ -131,10 +135,6 @@ public:
     static int getNumPalettesPrimary();
     static int getNumPalettesTotal();
 private:
-    void saveTilesetMetatileAttributes(Tileset*);
-    void saveTilesetMetatiles(Tileset*);
-    void saveTilesetTilesImage(Tileset*);
-    void saveTilesetPalettes(Tileset*, bool);
     void updateMapLayout(Map*);
     void readCDefinesSorted(QString, QStringList, QStringList*);
     void readCDefinesSorted(QString, QStringList, QStringList*, QString, int);

include/ui/newtilesetdialog.h

@@ -0,0 +1,32 @@
+#ifndef NEWTILESETDIALOG_H
+#define NEWTILESETDIALOG_H
+
+#include <QDialog>
+#include "project.h"
+
+namespace Ui {
+class NewTilesetDialog;
+}
+
+class NewTilesetDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit NewTilesetDialog(Project *project, QWidget *parent = nullptr);
+    ~NewTilesetDialog();
+    QString path;
+    QString fullSymbolName;
+    QString friendlyName;
+    bool isSecondary;
+
+private slots:
+    void NameOrSecondaryChanged();
+    void SecondaryChanged();
+
+private:
+    Ui::NewTilesetDialog *ui;
+    Project *project = nullptr;
+};
+
+#endif // NEWTILESETDIALOG_H