Merge branch 'dev' into version-check

include/core/events.h

@@ -34,15 +34,6 @@ class HiddenItemEvent;
 class SecretBaseEvent;
 class HealLocationEvent;
 
-class EventVisitor {
-public:
-    virtual void nothing() { }
-    virtual void visitObject(ObjectEvent *) = 0;
-    virtual void visitTrigger(TriggerEvent *) = 0;
-    virtual void visitSign(SignEvent *) = 0;
-};
-
-
 ///
 /// Event base class -- purely virtual
 ///
@@ -121,8 +112,6 @@ public:
 
     void modify();
 
-    virtual void accept(EventVisitor *) { }
-
     void setX(int newX) { this->x = newX; }
     void setY(int newY) { this->y = newY; }
     void setZ(int newZ) { this->elevation = newZ; }
@@ -150,6 +139,8 @@ public:
 
     virtual QSet<QString> getExpectedFields() = 0;
 
+    virtual QStringList getScripts() const { return QStringList(); }
+
     QJsonObject getCustomAttributes() const { return this->customAttributes; }
     void setCustomAttributes(const QJsonObject &newCustomAttributes) { this->customAttributes = newCustomAttributes; }
 
@@ -222,8 +213,6 @@ public:
 
     virtual Event *duplicate() const override;
 
-    virtual void accept(EventVisitor *visitor) override { visitor->visitObject(this); }
-
     virtual EventFrame *createEventFrame() override;
 
     virtual OrderedJson::object buildEventJson(Project *project) override;
@@ -233,6 +222,8 @@ public:
 
     virtual QSet<QString> getExpectedFields() override;
 
+    virtual QStringList getScripts() const override { return {getScript()}; }
+
     virtual QPixmap loadPixmap(Project *project) override;
 
     void setGfx(QString newGfx) { this->gfx = newGfx; }
@@ -392,8 +383,6 @@ public:
 
     virtual Event *duplicate() const override;
 
-    virtual void accept(EventVisitor *visitor) override { visitor->visitTrigger(this); }
-
     virtual EventFrame *createEventFrame() override;
 
     virtual OrderedJson::object buildEventJson(Project *project) override;
@@ -403,6 +392,8 @@ public:
 
     virtual QSet<QString> getExpectedFields() override;
 
+    virtual QStringList getScripts() const override { return {getScriptLabel()}; }
+
     void setScriptVar(QString newScriptVar) { this->scriptVar = newScriptVar; }
     QString getScriptVar() const { return this->scriptVar; }
 
@@ -490,8 +481,6 @@ public:
 
     virtual Event *duplicate() const override;
 
-    virtual void accept(EventVisitor *visitor) override { visitor->visitSign(this); }
-
     virtual EventFrame *createEventFrame() override;
 
     virtual OrderedJson::object buildEventJson(Project *project) override;
@@ -501,6 +490,8 @@ public:
 
     virtual QSet<QString> getExpectedFields() override;
 
+    virtual QStringList getScripts() const override { return {getScriptLabel()}; }
+
     void setFacingDirection(QString newFacingDirection) { this->facingDirection = newFacingDirection; }
     QString getFacingDirection() const { return this->facingDirection; }
 
@@ -633,21 +624,4 @@ inline uint qHash(const Event::Group &key, uint seed = 0) {
     return qHash(static_cast<int>(key), seed);
 }
 
-
-///
-/// Keeps track of scripts
-///
-class ScriptTracker : public EventVisitor {
-public:
-    virtual void visitObject(ObjectEvent *object) override { this->scripts << object->getScript(); };
-    virtual void visitTrigger(TriggerEvent *trigger) override { this->scripts << trigger->getScriptLabel(); };
-    virtual void visitSign(SignEvent *sign) override { this->scripts << sign->getScriptLabel(); };
-
-    QStringList getScripts() const { return this->scripts; }
-
-private:
-    QStringList scripts;
-};
-
-
 #endif // EVENTS_H

include/core/map.h

@@ -13,6 +13,7 @@
 #include <QPixmap>
 #include <QObject>
 #include <QGraphicsPixmapItem>
+#include <QFileSystemWatcher>
 #include <math.h>
 
 #define DEFAULT_BORDER_WIDTH 2
@@ -56,7 +57,7 @@ public:
     MapHeader* header() const { return m_header; }
 
     void setSharedEventsMap(const QString &sharedEventsMap) { m_sharedEventsMap = sharedEventsMap; }
-    void setSharedScriptsMap(const QString &sharedScriptsMap) { m_sharedScriptsMap = sharedScriptsMap; }
+    void setSharedScriptsMap(const QString &sharedScriptsMap);
 
     QString sharedEventsMap() const { return m_sharedEventsMap; }
     QString sharedScriptsMap() const { return m_sharedScriptsMap; }
@@ -75,14 +76,15 @@ public:
     Event* getEvent(Event::Group group, const QString &idName) const;
     QStringList getEventIdNames(Event::Group group) const;
     int getNumEvents(Event::Group group = Event::Group::None) const;
-    QStringList getScriptLabels(Event::Group group = Event::Group::None);
-    QString getScriptsFilePath() const;
-    void openScript(QString label);
     void removeEvent(Event *);
     void addEvent(Event *);
     int getIndexOfEvent(Event *) const;
     bool hasEvent(Event *) const;
 
+    QStringList getScriptLabels(Event::Group group = Event::Group::None);
+    QString getScriptsFilePath() const;
+    void openScript(const QString &label);
+
     void deleteConnections();
     QList<MapConnection*> getConnections() const { return m_connections; }
     MapConnection* getConnection(const QString &direction) const;
@@ -108,7 +110,7 @@ private:
     QString m_sharedEventsMap = "";
     QString m_sharedScriptsMap = "";
 
-    QStringList m_scriptsFileLabels;
+    QStringList m_scriptLabels;
     QJsonObject m_customAttributes;
 
     MapHeader *m_header = nullptr;
@@ -131,10 +133,14 @@ private:
     QList<MapConnection*> m_connections;
     QSet<MapConnection*> m_ownedConnections;
 
-    QUndoStack *m_editHistory = nullptr;
+    QPointer<QUndoStack> m_editHistory;
+    QPointer<QFileSystemWatcher> m_scriptFileWatcher;
+
+    void invalidateScripts();
 
 signals:
     void modified();
+    void scriptsModified();
     void mapDimensionsChanged(const QSize &size);
     void openScriptRequested(QString label);
     void connectionAdded(MapConnection*);

include/core/parseutil.h

@@ -43,8 +43,13 @@ class ParseUtil
 {
 public:
     ParseUtil();
+
     void setRoot(const QString &dir) { this->root = dir; }
+    void setUpdatesSplashScreen(bool updates) { this->updatesSplashScreen = updates; }
+
     static QString readTextFile(const QString &path, QString *error = nullptr);
+    QString loadTextFile(const QString &path, QString *error = nullptr);
+
     bool cacheFile(const QString &path, QString *error = nullptr);
     void clearFileCache() { this->fileCache.clear(); }
     static int textFileLineCount(const QString &path);
@@ -105,6 +110,8 @@ private:
     QHash<QString, int> globalDefineValues;
     QHash<QString, QString> globalDefineExpressions;
 
+    bool updatesSplashScreen = false;
+
     int evaluateDefine(const QString &identifier, bool *ok = nullptr);
     int evaluateExpression(const QString &expression);
     QList<Token> tokenizeExpression(QString expression);
@@ -114,6 +121,7 @@ private:
     void recordErrors(const QStringList &errors);
     void logRecordedErrors();
     QString createErrorMessage(const QString &message, const QString &expression);
+    void updateSplashScreen(QString path);
 
     struct ParsedDefines {
         QHash<QString,QString> expressions; // Map of all define names encountered to their expressions
@@ -123,7 +131,6 @@ private:
     QHash<QString, int> evaluateCDefines(const QString &filename, const QSet<QString> &filterList, bool useRegex, QString *error);
     bool defineNameMatchesFilter(const QString &name, const QSet<QString> &filterList) const;
     bool defineNameMatchesFilter(const QString &name, const QSet<QRegularExpression> &filterList) const;
-    QString loadTextFile(const QString &path, QString *error = nullptr);
     QString pathWithRoot(const QString &path);
 
     static const QRegularExpression re_incScriptLabel;

include/core/tileset.h

@@ -67,9 +67,9 @@ public:
     bool saveTilesImage();
     bool savePalettes();
 
-    bool appendToHeaders(QString root, QString friendlyName, bool usingAsm);
-    bool appendToGraphics(QString root, QString friendlyName, bool usingAsm);
-    bool appendToMetatiles(QString root, QString friendlyName, bool usingAsm);
+    bool appendToHeaders(const QString &filepath, const QString &friendlyName, bool usingAsm);
+    bool appendToGraphics(const QString &filepath, const QString &friendlyName, bool usingAsm);
+    bool appendToMetatiles(const QString &filepath, const QString &friendlyName, bool usingAsm);
 
     void setTilesImage(const QImage &image);
 

include/project.h

@@ -309,7 +309,10 @@ private:
     void setNewLayoutBlockdata(Layout *layout);
     void setNewLayoutBorder(Layout *layout);
 
-    void ignoreWatchedFileTemporarily(QString filepath);
+    void watchFile(const QString &filename);
+    void watchFiles(const QStringList &filenames);
+    void ignoreWatchedFileTemporarily(const QString &filepath);
+    void ignoreWatchedFilesTemporarily(const QStringList &filepaths);
     void recordFileChange(const QString &filepath);
     void resetFileCache();
 

include/ui/divingmappixmapitem.h

@@ -2,6 +2,7 @@
 #define DIVINGMAPPIXMAPITEM_H
 
 #include "mapconnection.h"
+#include "noscrollcombobox.h"
 
 #include <QGraphicsPixmapItem>
 #include <QPointer>
@@ -10,7 +11,7 @@
 class DivingMapPixmapItem : public QObject, public QGraphicsPixmapItem {
     Q_OBJECT
 public:
-    DivingMapPixmapItem(MapConnection *connection, QComboBox *combo);
+    DivingMapPixmapItem(MapConnection *connection, NoScrollComboBox *combo);
     ~DivingMapPixmapItem();
 
     MapConnection* connection() const { return m_connection; }
@@ -18,7 +19,7 @@ public:
 
 private:
     QPointer<MapConnection> m_connection;
-    QPointer<QComboBox> m_combo;
+    QPointer<NoScrollComboBox> m_combo;
 
     void setComboText(const QString &text);
     static QPixmap getBasePixmap(MapConnection* connection);

include/ui/eventframes.h

@@ -56,9 +56,11 @@ protected:
     bool populated = false;
     bool initialized = false;
     bool connected = false;
+    QPointer<Project> project;
 
     void populateDropdown(NoScrollComboBox * combo, const QStringList &items);
     void populateScriptDropdown(NoScrollComboBox * combo, Project * project);
+    void populateMapNameDropdown(NoScrollComboBox * combo, Project * project);
     void populateIdNameDropdown(NoScrollComboBox * combo, Project * project, const QString &mapName, Event::Group group);
 
 private:

include/ui/loadingscreen.h

@@ -18,8 +18,10 @@ public:
     explicit PorymapLoadingScreen(QWidget *parent = nullptr);
     ~PorymapLoadingScreen();
 
-    void setPixmap(QPixmap pixmap);
-    void showMessage(QString text);
+    void setPixmap(const QPixmap &pixmap);
+    void showMessage(const QString &text);
+    void showMessage(const QString &prefix, const QString &text);
+    void showLoadingMessage(const QString &text);
 
     void start();
     void stop ();

include/ui/mapheaderform.h

@@ -12,6 +12,7 @@
 
 #include "mapheader.h"
 #include "project.h"
+#include "noscrollcombobox.h"
 
 namespace Ui {
 class MapHeaderForm;
@@ -64,7 +65,7 @@ private:
     QPointer<Project> m_project = nullptr;
     bool m_allowProjectChanges = true;
 
-    void setText(QComboBox *combo, const QString &text) const;
+    void setText(NoScrollComboBox *combo, const QString &text) const;
     void setText(QLineEdit *lineEdit, const QString &text) const;
     void setLocations(const QStringList &locations);
     void updateLocationName();