Merge pull request #717 from GriffinRichards/write-errors

Better error handling if saving fails

include/config.h

@@ -26,7 +26,7 @@ static const QVersionNumber porymapVersion = QVersionNumber::fromString(PORYMAP_
 class KeyValueConfigBase
 {
 public:
-    void save();
+    bool save();
     void load();
     virtual ~KeyValueConfigBase();
     virtual void reset() = 0;

include/core/maplayout.h

@@ -116,9 +116,12 @@ public:
     void clearBorderCache();
     void cacheBorder();
 
-    void setClean();
     bool hasUnsavedChanges() const;
 
+    bool save(const QString &root);
+    bool saveBorder(const QString &root);
+    bool saveBlockdata(const QString &root);
+
     bool layoutBlockChanged(int i, const Blockdata &cache);
 
     uint16_t getBorderMetatileId(int x, int y);
@@ -143,6 +146,7 @@ public:
 private:
     void setNewDimensionsBlockdata(int newWidth, int newHeight);
     void setNewBorderDimensionsBlockdata(int newWidth, int newHeight);
+    bool writeBlockdata(const QString &path, const Blockdata &blockdata) const;
 
     static int getBorderDrawDistance(int dimension, qreal minimum);
 

include/core/paletteutil.h

@@ -7,7 +7,7 @@
 
 namespace PaletteUtil {
     QList<QRgb> parse(QString filepath, bool *error);
-    void writeJASC(QString filepath, QVector<QRgb> colors, int offset, int nColors);
+    bool writeJASC(const QString &filepath, const QVector<QRgb> &colors, int offset, int nColors);
 }
 
 #endif // PALETTEUTIL_H

include/core/tileset.h

@@ -55,17 +55,17 @@ public:
     static QString getExpectedDir(QString tilesetName, bool isSecondary);
     QString getExpectedDir();
 
-    void load();
-    void loadMetatiles();
-    void loadMetatileAttributes();
-    void loadTilesImage(QImage *importedImage = nullptr);
-    void loadPalettes();
+    bool load();
+    bool loadMetatiles();
+    bool loadMetatileAttributes();
+    bool loadTilesImage(QImage *importedImage = nullptr);
+    bool loadPalettes();
 
-    void save();
-    void saveMetatileAttributes();
-    void saveMetatiles();
-    void saveTilesImage();
-    void savePalettes();
+    bool save();
+    bool saveMetatileAttributes();
+    bool saveMetatiles();
+    bool saveTilesImage();
+    bool savePalettes();
 
     bool appendToHeaders(QString root, QString friendlyName, bool usingAsm);
     bool appendToGraphics(QString root, QString friendlyName, bool usingAsm);

include/editor.h

@@ -57,8 +57,8 @@ public:
     GridSettings gridSettings;
 
     void setProject(Project * project);
-    void saveAll();
-    void saveCurrent();
+    bool saveAll();
+    bool saveCurrent();
     void saveEncounterTabData();
 
     void closeProject();
@@ -199,7 +199,7 @@ private:
 
     EditMode editMode = EditMode::None;
 
-    void save(bool currentOnly);
+    bool save(bool currentOnly);
     void clearMap();
     void clearMetatileSelector();
     void clearMovementPermissionSelector();

include/mainwindow.h

@@ -175,7 +175,7 @@ private slots:
     void on_action_Reload_Project_triggered();
     void on_action_Close_Project_triggered();
     void on_action_Save_Project_triggered();
-    void save(bool currentOnly = false);
+    bool save(bool currentOnly = false);
 
     void openWarpMap(QString map_name, int event_id, Event::Group event_group);
 

include/project.h

@@ -108,10 +108,6 @@ public:
     bool loadBlockdata(Layout *);
     bool loadLayoutBorder(Layout *);
 
-    void saveTextFile(QString path, QString text);
-    void appendTextFile(QString path, QString text);
-    void deleteFile(QString path);
-
     bool readMapGroups();
     void addNewMapGroup(const QString &groupName);
     QString mapNameToMapGroup(const QString &mapName) const;
@@ -168,25 +164,20 @@ public:
     bool loadLayout(Layout *);
     bool loadMapLayout(Map*);
     bool loadLayoutTilesets(Layout *);
-    void loadTilesetAssets(Tileset*);
+    bool loadTilesetAssets(Tileset*);
     void loadTilesetMetatileLabels(Tileset*);
     void readTilesetPaths(Tileset* tileset);
 
-    void saveAll();
-    void saveGlobalData();
-    void saveLayout(Layout *);
-    void saveLayoutBlockdata(Layout *);
-    void saveLayoutBorder(Layout *);
-    void writeBlockdata(QString, const Blockdata &);
-    void saveMap(Map *map, bool skipLayout = false);
-    void saveConfig();
-    void saveMapLayouts();
-    void saveMapGroups();
-    void saveRegionMapSections();
-    void saveWildMonData();
-    void saveHealLocations();
-    void saveTilesets(Tileset*, Tileset*);
-    void saveTilesetMetatileLabels(Tileset*, Tileset*);
+    bool saveAll();
+    bool saveGlobalData();
+    bool saveConfig();
+    bool saveLayout(Layout *layout);
+    bool saveMap(Map *map, bool skipLayout = false);
+    bool saveTextFile(const QString &path, const QString &text);
+    bool saveRegionMapSections();
+    bool saveTilesets(Tileset*, Tileset*);
+    bool saveTilesetMetatileLabels(Tileset*, Tileset*);
+
     void appendTilesetLabel(const QString &label, const QString &isSecondaryStr);
     bool readTilesetLabels();
     bool readTilesetMetatileLabels();
@@ -309,8 +300,6 @@ private:
     };
     QHash<QString, LocationData> locationData;
 
-    void updateLayout(Layout *);
-
     void setNewLayoutBlockdata(Layout *layout);
     void setNewLayoutBorder(Layout *layout);
 
@@ -318,6 +307,12 @@ private:
     void recordFileChange(const QString &filepath);
     void resetFileCache();
 
+    bool saveMapLayouts();
+    bool saveMapGroups();
+    bool saveWildMonData();
+    bool saveHealLocations();
+    bool appendTextFile(const QString &path, const QString &text);
+
     QString findSpeciesIconPath(const QStringList &names) const;
 
     int maxEventsPerGroup;

include/ui/tileseteditor.h

@@ -71,8 +71,6 @@ private slots:
 
     void on_spinBox_paletteSelector_valueChanged(int arg1);
 
-    void on_actionSave_Tileset_triggered();
-
     void on_actionImport_Primary_Tiles_triggered();
 
     void on_actionImport_Secondary_Tiles_triggered();
@@ -173,6 +171,8 @@ private:
     bool lockSelection = false;
     QSet<uint16_t> metatileReloadQueue;
 
+    bool save();
+
 signals:
     void tilesetsSaved(QString, QString);
 };