Merge branch 'dev' of https://github.com/huderlem/porymap into metatile-layers

include/config.h

@@ -27,6 +27,12 @@ extern const QVersionNumber porymapVersion;
 
 #define CONFIG_BACKWARDS_COMPATABILITY
 
+enum ScriptAutocompleteMode {
+    MapOnly,
+    MapAndCommon,
+    All,
+};
+
 class KeyValueConfigBase
 {
 public:
@@ -119,7 +125,7 @@ public:
     QString textEditorGotoLine;
     int paletteEditorBitDepth;
     int projectSettingsTab;
-    bool loadAllEventScripts;
+    ScriptAutocompleteMode scriptAutocompleteMode;
     bool warpBehaviorWarningDisabled;
     bool eventDeleteWarningDisabled;
     bool eventOverlayEnabled;

include/core/map.h

@@ -148,7 +148,7 @@ signals:
     void modified();
     void scriptsModified();
     void mapDimensionsChanged(const QSize &size);
-    void openScriptRequested(QString label);
+    void openScriptRequested(const QString &label);
     void connectionAdded(MapConnection*);
     void connectionRemoved(MapConnection*);
     void layoutChanged();

include/editor.h

@@ -209,7 +209,8 @@ public:
 
 public slots:
     void openMapScripts() const;
-    void openScript(const QString &scriptLabel) const;
+    bool openScript(const QString &scriptLabel) const;
+    bool openScriptInFile(const QString &scriptLabel, const QString &filepath) const;
     void openProjectInTextEditor() const;
     void maskNonVisibleConnectionTiles();
     void onBorderMetatilesChanged();

include/mainwindow.h

@@ -290,6 +290,7 @@ private slots:
     void on_spinBox_SelectedCollision_valueChanged(int collision);
     void on_actionRegion_Map_Editor_triggered();
     void on_actionPreferences_triggered();
+    void on_actionOpen_Manual_triggered();
     void on_actionCheck_for_Updates_triggered();
     void togglePreferenceSpecificUi();
     void on_actionProject_Settings_triggered();

include/project.h

@@ -215,7 +215,11 @@ public:
 
     static QString getScriptFileExtension(bool usePoryScript);
     QString getScriptDefaultString(bool usePoryScript, QString mapName) const;
-    QStringList getEventScriptsFilepaths() const;
+
+    QStringList getAllEventScriptsFilepaths() const;
+    QStringList getMapScriptsFilepaths() const;
+    QStringList getCommonEventScriptsFilepaths() const;
+    QStringList findScriptsFiles(const QString &searchDir, const QStringList &fileNames = {"*"}) const;
     void insertGlobalScriptLabels(QStringList &scriptLabels) const;
 
     QString getDefaultPrimaryTilesetLabel() const;

include/ui/preferenceeditor.h

@@ -2,6 +2,7 @@
 #define PREFERENCES_H
 
 #include <QMainWindow>
+#include "config.h"
 
 class NoScrollComboBox;
 class QAbstractButton;
@@ -23,7 +24,7 @@ public:
 signals:
     void preferencesSaved();
     void themeChanged(const QString &theme);
-    void scriptSettingsChanged(bool on);
+    void scriptSettingsChanged(ScriptAutocompleteMode mode);
     void reloadProjectRequested();
 
 private: