Merge branch 'dev' into update-scripts

include/ui/aboutporymap.h

@@ -13,6 +13,8 @@ class AboutPorymap : public QDialog
 public:
     explicit AboutPorymap(QWidget *parent = nullptr);
     ~AboutPorymap();
+
+    static QString getVersionString();
 private:
     Ui::AboutPorymap *ui;
 };

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/loadingscreen.h

@@ -0,0 +1,43 @@
+#include "qgifimage.h"
+
+#include <QSplashScreen>
+#include <QTimer>
+#include <QWidget>
+
+
+
+namespace Ui {
+class LoadingScreen;
+}
+
+class PorymapLoadingScreen : public QWidget {
+    
+    Q_OBJECT
+
+public:
+    explicit PorymapLoadingScreen(QWidget *parent = nullptr);
+    ~PorymapLoadingScreen();
+
+    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 ();
+
+private:
+    void setupUi();
+
+public slots:
+    void updateFrame();
+
+private:
+    Ui::LoadingScreen *ui;
+
+    QGifImage splashImage;
+    int frame = 0;
+    QTimer timer;
+};
+
+extern PorymapLoadingScreen *porysplash;

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();

include/ui/message.h

@@ -24,21 +24,21 @@ public:
 class ErrorMessage : public Message {
 public:
     ErrorMessage(const QString &message, QWidget *parent);
-    static int show(const QString &message, QWidget *parent);
+    static void show(const QString &message, QWidget *parent);
 };
 
 // Basic warning message with an 'Ok' button.
 class WarningMessage : public Message {
 public:
     WarningMessage(const QString &message, QWidget *parent);
-    static int show(const QString &message, QWidget *parent);
+    static void show(const QString &message, QWidget *parent);
 };
 
 // Basic informational message with a 'Close' button.
 class InfoMessage : public Message {
 public:
     InfoMessage(const QString &message, QWidget *parent);
-    static int show(const QString &message, QWidget *parent);
+    static void show(const QString &message, QWidget *parent);
 };
 
 // Basic question message with a 'Yes' and 'No' button.
@@ -53,7 +53,7 @@ public:
 class RecentErrorMessage : public ErrorMessage {
 public:
     RecentErrorMessage(const QString &message, QWidget *parent);
-    static int show(const QString &message, QWidget *parent);
+    static void show(const QString &message, QWidget *parent);
 };
 
 

include/ui/movablerect.h

@@ -20,7 +20,7 @@ public:
     }
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override {
-        if (!(*enabled)) return;
+        if (!isVisible()) return;
         painter->setPen(this->color);
         painter->drawRect(this->rect() + QMargins(1,1,1,1)); // Fill
         painter->setPen(Qt::black);
@@ -28,11 +28,17 @@ public:
         painter->drawRect(this->rect()); // Inner border
     }
     void updateLocation(int x, int y);
-    bool *enabled;
+
+    void setActive(bool active);
+    bool getActive() const { return this->active; }
 
 protected:
+    bool *enabled = nullptr;
+    bool active = true;
     QRectF baseRect;
     QRgb color;
+
+    void updateVisibility();
 };
 
 

include/ui/newdefinedialog.h

@@ -0,0 +1,32 @@
+#ifndef NEWDEFINEDIALOG_H
+#define NEWDEFINEDIALOG_H
+
+#include <QDialog>
+#include <QAbstractButton>
+
+namespace Ui {
+class NewDefineDialog;
+}
+
+class NewDefineDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit NewDefineDialog(QWidget *parent = nullptr);
+    ~NewDefineDialog();
+
+    virtual void accept() override;
+
+signals:
+    void createdDefine(const QString &name, const QString &expression);
+
+private:
+    Ui::NewDefineDialog *ui;
+
+    bool validateName(bool allowEmpty = false);
+    void onNameChanged(const QString &name);
+    void dialogButtonClicked(QAbstractButton *button);
+};
+
+#endif // NEWDEFINEDIALOG_H

include/ui/projectsettingseditor.h

@@ -67,6 +67,12 @@ private:
     void setWarpBehaviorsList(QStringList list);
     void openFilesHelp();
     void openIdentifiersHelp();
+    void addNewGlobalConstantsFilepath();
+    void addGlobalConstantsFilepath(const QString &filepath);
+    QStringList getGlobalConstantsFilepaths();
+    void addNewGlobalConstant();
+    void addGlobalConstant(const QString &name, const QString &expression);
+    QMap<QString,QString> getGlobalConstants();
 
 private slots:
     void dialogButtonClicked(QAbstractButton *button);