From 0a15dfbf4c964d073ada2f9e1524d465a0b54b1d Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Mon, 16 Nov 2020 06:46:21 -0500
Subject: [PATCH 01/16] Add preferred text editor to PorymapConfig

---
 include/config.h |  3 +++
 src/config.cpp   | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/include/config.h b/include/config.h
index 008eeeb7..a680c55d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -61,6 +61,7 @@ public:
     void setMonitorFiles(bool monitor);
     void setRegionMapDimensions(int width, int height);
     void setTheme(QString theme);
+    void setTextEditorCommand(const QString &command);
     QString getRecentProject();
     QString getRecentMap();
     MapSortOrder getMapSortOrder();
@@ -76,6 +77,7 @@ public:
     bool getMonitorFiles();
     QSize getRegionMapDimensions();
     QString getTheme();
+    QString getTextEditorCommand();
 protected:
     virtual QString getConfigFilepath() override;
     virtual void parseConfigKeyValue(QString key, QString value) override;
@@ -107,6 +109,7 @@ private:
     bool monitorFiles;
     QSize regionMapDimensions;
     QString theme;
+    QString textEditorCommand;
 };
 
 extern PorymapConfig porymapConfig;
diff --git a/src/config.cpp b/src/config.cpp
index 3c9fe33d..2a1b16c7 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -187,6 +187,8 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) {
         }
     } else if (key == "theme") {
         this->theme = value;
+    } else if (key == "text_editor") {
+        this->textEditorCommand = value;
     } else {
         logWarn(QString("Invalid config key found in config file %1: '%2'").arg(this->getConfigFilepath()).arg(key));
     }
@@ -216,6 +218,7 @@ QMap<QString, QString> PorymapConfig::getKeyValueMap() {
     map.insert("region_map_dimensions", QString("%1x%2").arg(this->regionMapDimensions.width())
                                                         .arg(this->regionMapDimensions.height()));
     map.insert("theme", this->theme);
+    map.insert("text_editor", this->textEditorCommand);
     return map;
 }
 
@@ -316,6 +319,11 @@ void PorymapConfig::setTheme(QString theme) {
     this->theme = theme;
 }
 
+void PorymapConfig::setTextEditorCommand(const QString &command) {
+    this->textEditorCommand = command;
+    this->save();
+}
+
 QString PorymapConfig::getRecentProject() {
     return this->recentProject;
 }
@@ -398,6 +406,10 @@ QString PorymapConfig::getTheme() {
     return this->theme;
 }
 
+QString PorymapConfig::getTextEditorCommand() {
+    return this->textEditorCommand;
+}
+
 const QMap<BaseGameVersion, QString> baseGameVersionMap = {
     {BaseGameVersion::pokeruby, "pokeruby"},
     {BaseGameVersion::pokefirered, "pokefirered"},

From ea9cfa47e55d9c432898a6895b7ddae9341c918f Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Mon, 16 Nov 2020 07:39:42 -0500
Subject: [PATCH 02/16] Add basic prefences window with text editor command
 field

---
 forms/mainwindow.ui           |  7 ++++
 forms/preferenceeditor.ui     | 75 +++++++++++++++++++++++++++++++++++
 include/mainwindow.h          |  3 ++
 include/ui/preferenceeditor.h | 31 +++++++++++++++
 porymap.pro                   |  5 ++-
 src/mainwindow.cpp            | 15 +++++++
 src/ui/preferenceeditor.cpp   | 42 ++++++++++++++++++++
 7 files changed, 177 insertions(+), 1 deletion(-)
 create mode 100644 forms/preferenceeditor.ui
 create mode 100644 include/ui/preferenceeditor.h
 create mode 100644 src/ui/preferenceeditor.cpp

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index f1061bdb..fd97121e 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -2639,6 +2639,8 @@
     <addaction name="actionUse_Encounter_Json"/>
     <addaction name="actionMonitor_Project_Files"/>
     <addaction name="actionUse_Poryscript"/>
+    <addaction name="separator"/>
+    <addaction name="actionEdit_Preferences"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
@@ -2905,6 +2907,11 @@
     <string>Export Map Stitch Image...</string>
    </property>
   </action>
+  <action name="actionEdit_Preferences">
+   <property name="text">
+    <string>Edit Preferences...</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/forms/preferenceeditor.ui b/forms/preferenceeditor.ui
new file mode 100644
index 00000000..78b6da04
--- /dev/null
+++ b/forms/preferenceeditor.ui
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferenceEditor</class>
+ <widget class="QMainWindow" name="PreferenceEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>480</width>
+    <height>320</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Preferences</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QGroupBox" name="groupBox">
+      <property name="title">
+       <string>Preferred Text Editor</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_TextEditor">
+         <property name="text">
+          <string>Command</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="lineEdit_TextEditor">
+         <property name="toolTip">
+          <string>The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, $D, %N) are used, the action will be applicable even if more than one item is selected. Esle the action will only be applicable f exactly one item is selected.</string>
+         </property>
+         <property name="placeholderText">
+          <string>e.g. code --goto %F:%L</string>
+         </property>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2">
+        <widget class="QLabel" name="label_TextEditorHelp">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The command that will be executed when clicking the &amp;quot;Open Map Scripts&amp;quot; button. You may optionally include '%F' and '%L' in the command. '%F' will be substituted with the scripts file path and '%L' will be substituted with a line number. If '%L' is specified then the scripts file will be opened to map script cooresponding to the currently selected event (If the script can be found). If '%F' is &lt;span style=&quot; font-weight:600;&quot;&gt;not&lt;/span&gt; specified then the map scripts file path will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="scaledContents">
+          <bool>false</bool>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="QDialogButtonBox" name="buttonBox">
+      <property name="standardButtons">
+       <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/include/mainwindow.h b/include/mainwindow.h
index a9180402..7cc74e6a 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -21,6 +21,7 @@
 #include "filterchildrenproxymodel.h"
 #include "newmappopup.h"
 #include "newtilesetdialog.h"
+#include "preferenceeditor.h"
 
 namespace Ui {
 class MainWindow;
@@ -226,6 +227,7 @@ private slots:
     void on_pushButton_ConfigureEncountersJSON_clicked();
 
     void on_actionRegion_Map_Editor_triggered();
+    void on_actionEdit_Preferences_triggered();
 
 private:
     Ui::MainWindow *ui;
@@ -234,6 +236,7 @@ private:
     MapImageExporter *mapImageExporter = nullptr;
     FilterChildrenProxyModel *mapListProxyModel;
     NewMapPopup *newmapprompt = nullptr;
+    PreferenceEditor *preferenceEditor = nullptr;
     QStandardItemModel *mapListModel;
     QList<QStandardItem*> *mapGroupItemsList;
     QMap<QString, QModelIndex> mapListIndexes;
diff --git a/include/ui/preferenceeditor.h b/include/ui/preferenceeditor.h
new file mode 100644
index 00000000..74085b6a
--- /dev/null
+++ b/include/ui/preferenceeditor.h
@@ -0,0 +1,31 @@
+#ifndef PREFERENCES_H
+#define PREFERENCES_H
+
+#include <QMainWindow>
+
+class QAbstractButton;
+
+
+namespace Ui {
+class PreferenceEditor;
+}
+
+class PreferenceEditor : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit PreferenceEditor(QWidget *parent = nullptr);
+    ~PreferenceEditor();
+
+private:
+    Ui::PreferenceEditor *ui;
+
+    void populateFields();
+    void saveFields();
+
+private slots:
+    void dialogButtonClicked(QAbstractButton *button);
+};
+
+#endif // PREFERENCES_H
diff --git a/porymap.pro b/porymap.pro
index 0da4a14b..806f3b5b 100644
--- a/porymap.pro
+++ b/porymap.pro
@@ -71,6 +71,7 @@ SOURCES += src/core/block.cpp \
     src/ui/newtilesetdialog.cpp \
     src/ui/flowlayout.cpp \
     src/ui/mapruler.cpp \
+    src/ui/preferenceeditor.cpp \
     src/config.cpp \
     src/editor.cpp \
     src/main.cpp \
@@ -140,6 +141,7 @@ HEADERS  += include/core/block.h \
     include/ui/overlay.h \
     include/ui/flowlayout.h \
     include/ui/mapruler.h \
+    include/ui/preferenceeditor.h \
     include/config.h \
     include/editor.h \
     include/mainwindow.h \
@@ -156,7 +158,8 @@ FORMS    += forms/mainwindow.ui \
     forms/newmappopup.ui \
     forms/aboutporymap.ui \
     forms/newtilesetdialog.ui \
-    forms/mapimageexporter.ui
+    forms/mapimageexporter.ui \
+    forms/preferenceeditor.ui
 
 RESOURCES += \
     resources/images.qrc \
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f239d4d6..31ad9da1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2560,6 +2560,21 @@ void MainWindow::on_actionThemes_triggered()
     themeSelectorWindow.exec();
 }
 
+void MainWindow::on_actionEdit_Preferences_triggered() {
+    if (!preferenceEditor) {
+        preferenceEditor = new PreferenceEditor(this);
+        connect(preferenceEditor, &QObject::destroyed, [=](QObject *) { preferenceEditor = nullptr; });
+    }
+
+    if (!preferenceEditor->isVisible()) {
+        preferenceEditor->show();
+    } else if (preferenceEditor->isMinimized()) {
+        preferenceEditor->showNormal();
+    } else {
+        preferenceEditor->activateWindow();
+    }
+}
+
 void MainWindow::on_pushButton_AddCustomHeaderField_clicked()
 {
     int rowIndex = this->ui->tableWidget_CustomHeaderFields->rowCount();
diff --git a/src/ui/preferenceeditor.cpp b/src/ui/preferenceeditor.cpp
new file mode 100644
index 00000000..25476dfe
--- /dev/null
+++ b/src/ui/preferenceeditor.cpp
@@ -0,0 +1,42 @@
+#include "preferenceeditor.h"
+#include "ui_preferenceeditor.h"
+#include "config.h"
+
+#include <QAbstractButton>
+
+
+PreferenceEditor::PreferenceEditor(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::PreferenceEditor)
+{
+    ui->setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    connect(ui->buttonBox, &QDialogButtonBox::clicked,
+            this, &PreferenceEditor::dialogButtonClicked);
+    populateFields();
+}
+
+PreferenceEditor::~PreferenceEditor()
+{
+    delete ui;
+}
+
+void PreferenceEditor::populateFields() {
+    ui->lineEdit_TextEditor->setText(porymapConfig.getTextEditorCommand());
+}
+
+void PreferenceEditor::saveFields() {
+    porymapConfig.setTextEditorCommand(ui->lineEdit_TextEditor->text());
+}
+
+void PreferenceEditor::dialogButtonClicked(QAbstractButton *button) {
+    auto buttonRole = ui->buttonBox->buttonRole(button);
+    if (buttonRole == QDialogButtonBox::AcceptRole) {
+        saveFields();
+        close();
+    } else if (buttonRole == QDialogButtonBox::ApplyRole) {
+        saveFields();
+    } else if (buttonRole == QDialogButtonBox::RejectRole) {
+        close();
+    }
+}

From 662fb2a367333c8a54c61a80088d4665b3bb39bd Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Mon, 16 Nov 2020 09:35:55 -0500
Subject: [PATCH 03/16] Move themes to PreferenceEditor

---
 forms/mainwindow.ui           |  7 -------
 forms/preferenceeditor.ui     | 15 +++++++++++++-
 include/editor.h              |  4 +++-
 include/mainwindow.h          |  1 -
 include/ui/preferenceeditor.h |  6 ++++++
 src/mainwindow.cpp            | 38 ++++-------------------------------
 src/ui/preferenceeditor.cpp   | 28 +++++++++++++++++++++++++-
 7 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index fd97121e..b3179047 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -2607,8 +2607,6 @@
     <addaction name="actionCursor_Tile_Outline"/>
     <addaction name="actionPlayer_View_Rectangle"/>
     <addaction name="actionBetter_Cursors"/>
-    <addaction name="separator"/>
-    <addaction name="actionThemes"/>
    </widget>
    <widget class="QMenu" name="menuTools">
     <property name="title">
@@ -2897,11 +2895,6 @@
     <string>Ctrl+Shift+N</string>
    </property>
   </action>
-  <action name="actionThemes">
-   <property name="text">
-    <string>Themes...</string>
-   </property>
-  </action>
   <action name="actionExport_Stitched_Map_Image">
    <property name="text">
     <string>Export Map Stitch Image...</string>
diff --git a/forms/preferenceeditor.ui b/forms/preferenceeditor.ui
index 78b6da04..d9e7fa72 100644
--- a/forms/preferenceeditor.ui
+++ b/forms/preferenceeditor.ui
@@ -16,7 +16,7 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="QGroupBox" name="groupBox">
+     <widget class="QGroupBox" name="groupBox_TextEditor">
       <property name="title">
        <string>Preferred Text Editor</string>
       </property>
@@ -60,6 +60,19 @@
       </layout>
      </widget>
     </item>
+    <item>
+     <widget class="QGroupBox" name="groupBox_Themes">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="title">
+       <string>Application Theme</string>
+      </property>
+     </widget>
+    </item>
     <item>
      <widget class="QDialogButtonBox" name="buttonBox">
       <property name="standardButtons">
diff --git a/include/editor.h b/include/editor.h
index fc8cfe26..748759b6 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -65,7 +65,6 @@ public:
     void displayMapBorder();
     void displayMapGrid();
     void displayWildMonTables();
-    void maskNonVisibleConnectionTiles();
 
     void updateMapBorder();
     void updateMapConnections();
@@ -154,6 +153,9 @@ public:
     void shouldReselectEvents();
     void scaleMapView(int);
 
+public slots:
+    void maskNonVisibleConnectionTiles();
+
 private:
     void setConnectionItemsVisible(bool);
     void setBorderItemsVisible(bool, qreal = 1);
diff --git a/include/mainwindow.h b/include/mainwindow.h
index 7cc74e6a..6293c627 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -218,7 +218,6 @@ private slots:
     void on_toolButton_ExpandAll_clicked();
     void on_toolButton_CollapseAll_clicked();
     void on_actionAbout_Porymap_triggered();
-    void on_actionThemes_triggered();
     void on_pushButton_AddCustomHeaderField_clicked();
     void on_pushButton_DeleteCustomHeaderField_clicked();
     void on_tableWidget_CustomHeaderFields_cellChanged(int row, int column);
diff --git a/include/ui/preferenceeditor.h b/include/ui/preferenceeditor.h
index 74085b6a..c16716d9 100644
--- a/include/ui/preferenceeditor.h
+++ b/include/ui/preferenceeditor.h
@@ -3,6 +3,7 @@
 
 #include <QMainWindow>
 
+class NoScrollComboBox;
 class QAbstractButton;
 
 
@@ -18,8 +19,13 @@ public:
     explicit PreferenceEditor(QWidget *parent = nullptr);
     ~PreferenceEditor();
 
+signals:
+    void preferencesSaved();
+    void themeChanged(const QString &theme);
+
 private:
     Ui::PreferenceEditor *ui;
+    NoScrollComboBox *themeSelector;
 
     void populateFields();
     void saveFields();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 31ad9da1..7f674ed3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2526,43 +2526,13 @@ void MainWindow::on_actionAbout_Porymap_triggered()
     window->show();
 }
 
-void MainWindow::on_actionThemes_triggered()
-{
-    QStringList themes;
-    QRegularExpression re(":/themes/([A-z0-9_-]+).qss");
-    themes.append("default");
-    QDirIterator it(":/themes", QDirIterator::Subdirectories);
-    while (it.hasNext()) {
-        QString themeName = re.match(it.next()).captured(1);
-        themes.append(themeName);
-    }
-
-    QDialog themeSelectorWindow(this);
-    QFormLayout form(&themeSelectorWindow);
-
-    NoScrollComboBox *themeSelector = new NoScrollComboBox();
-    themeSelector->addItems(themes);
-    themeSelector->setCurrentText(porymapConfig.getTheme());
-    form.addRow(new QLabel("Themes"), themeSelector);
-
-    QDialogButtonBox buttonBox(QDialogButtonBox::Apply | QDialogButtonBox::Close, Qt::Horizontal, &themeSelectorWindow);
-    form.addRow(&buttonBox);
-    connect(&buttonBox, &QDialogButtonBox::clicked, [&buttonBox, themeSelector, this](QAbstractButton *button){
-        if (button == buttonBox.button(QDialogButtonBox::Apply)) {
-            QString theme = themeSelector->currentText();
-            porymapConfig.setTheme(theme);
-            this->setTheme(theme);
-            editor->maskNonVisibleConnectionTiles();
-        }
-    });
-    connect(&buttonBox, SIGNAL(rejected()), &themeSelectorWindow, SLOT(reject()));
-
-    themeSelectorWindow.exec();
-}
-
 void MainWindow::on_actionEdit_Preferences_triggered() {
     if (!preferenceEditor) {
         preferenceEditor = new PreferenceEditor(this);
+        connect(preferenceEditor, &PreferenceEditor::themeChanged,
+                this, &MainWindow::setTheme);
+        connect(preferenceEditor, &PreferenceEditor::themeChanged,
+                editor, &Editor::maskNonVisibleConnectionTiles);
         connect(preferenceEditor, &QObject::destroyed, [=](QObject *) { preferenceEditor = nullptr; });
     }
 
diff --git a/src/ui/preferenceeditor.cpp b/src/ui/preferenceeditor.cpp
index 25476dfe..42edd313 100644
--- a/src/ui/preferenceeditor.cpp
+++ b/src/ui/preferenceeditor.cpp
@@ -1,15 +1,23 @@
 #include "preferenceeditor.h"
 #include "ui_preferenceeditor.h"
 #include "config.h"
+#include "noscrollcombobox.h"
 
 #include <QAbstractButton>
+#include <QRegularExpression>
+#include <QDirIterator>
+#include <QFormLayout>
 
 
 PreferenceEditor::PreferenceEditor(QWidget *parent) :
     QMainWindow(parent),
-    ui(new Ui::PreferenceEditor)
+    ui(new Ui::PreferenceEditor),
+    themeSelector(nullptr)
 {
     ui->setupUi(this);
+    auto *formLayout = new QFormLayout(ui->groupBox_Themes);
+    themeSelector = new NoScrollComboBox(ui->groupBox_Themes);
+    formLayout->addRow("Themes", themeSelector);
     setAttribute(Qt::WA_DeleteOnClose);
     connect(ui->buttonBox, &QDialogButtonBox::clicked,
             this, &PreferenceEditor::dialogButtonClicked);
@@ -23,10 +31,28 @@ PreferenceEditor::~PreferenceEditor()
 
 void PreferenceEditor::populateFields() {
     ui->lineEdit_TextEditor->setText(porymapConfig.getTextEditorCommand());
+
+    QStringList themes = { "default" };
+    QRegularExpression re(":/themes/([A-z0-9_-]+).qss");
+    QDirIterator it(":/themes", QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        QString themeName = re.match(it.next()).captured(1);
+        themes.append(themeName);
+    }
+    themeSelector->addItems(themes);
+    themeSelector->setCurrentText(porymapConfig.getTheme());
 }
 
 void PreferenceEditor::saveFields() {
     porymapConfig.setTextEditorCommand(ui->lineEdit_TextEditor->text());
+
+    if (themeSelector->currentText() != porymapConfig.getTheme()) {
+        const auto theme = themeSelector->currentText();
+        porymapConfig.setTheme(theme);
+        emit themeChanged(theme);
+    }
+
+    emit preferencesSaved();
 }
 
 void PreferenceEditor::dialogButtonClicked(QAbstractButton *button) {

From 3478846b6019efff0d8b8d5d4f0d7cbeba91ee3a Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Sat, 21 Nov 2020 17:33:16 -0500
Subject: [PATCH 04/16] Add Project::getMapScriptsFilePath() and rename text
 editor config members

---
 include/config.h            |  6 +++---
 include/project.h           |  5 +++--
 src/config.cpp              | 12 ++++++------
 src/project.cpp             | 14 ++++++++++++--
 src/ui/preferenceeditor.cpp |  4 ++--
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/include/config.h b/include/config.h
index a680c55d..bb740d41 100644
--- a/include/config.h
+++ b/include/config.h
@@ -61,7 +61,7 @@ public:
     void setMonitorFiles(bool monitor);
     void setRegionMapDimensions(int width, int height);
     void setTheme(QString theme);
-    void setTextEditorCommand(const QString &command);
+    void setTextEditorCommandTemplate(const QString &commandTemplate);
     QString getRecentProject();
     QString getRecentMap();
     MapSortOrder getMapSortOrder();
@@ -77,7 +77,7 @@ public:
     bool getMonitorFiles();
     QSize getRegionMapDimensions();
     QString getTheme();
-    QString getTextEditorCommand();
+    QString getTextEditorCommandTemplate();
 protected:
     virtual QString getConfigFilepath() override;
     virtual void parseConfigKeyValue(QString key, QString value) override;
@@ -109,7 +109,7 @@ private:
     bool monitorFiles;
     QSize regionMapDimensions;
     QString theme;
-    QString textEditorCommand;
+    QString textEditorCommandTemplate;
 };
 
 extern PorymapConfig porymapConfig;
diff --git a/include/project.h b/include/project.h
index 179a5a93..2dcaa345 100644
--- a/include/project.h
+++ b/include/project.h
@@ -172,8 +172,9 @@ public:
     QString fixPalettePath(QString path);
     QString fixGraphicPath(QString path);
 
-    QString getScriptFileExtension(bool usePoryScript);
-    QString getScriptDefaultString(bool usePoryScript, QString mapName);
+    QString getScriptFileExtension(bool usePoryScript) const;
+    QString getScriptDefaultString(bool usePoryScript, QString mapName) const;
+    QString getMapScriptsFilePath(const QString &mapName) const;
 
     bool loadMapBorder(Map *map);
 
diff --git a/src/config.cpp b/src/config.cpp
index 2a1b16c7..24798f7c 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -188,7 +188,7 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) {
     } else if (key == "theme") {
         this->theme = value;
     } else if (key == "text_editor") {
-        this->textEditorCommand = value;
+        this->textEditorCommandTemplate = value;
     } else {
         logWarn(QString("Invalid config key found in config file %1: '%2'").arg(this->getConfigFilepath()).arg(key));
     }
@@ -218,7 +218,7 @@ QMap<QString, QString> PorymapConfig::getKeyValueMap() {
     map.insert("region_map_dimensions", QString("%1x%2").arg(this->regionMapDimensions.width())
                                                         .arg(this->regionMapDimensions.height()));
     map.insert("theme", this->theme);
-    map.insert("text_editor", this->textEditorCommand);
+    map.insert("text_editor", this->textEditorCommandTemplate);
     return map;
 }
 
@@ -319,8 +319,8 @@ void PorymapConfig::setTheme(QString theme) {
     this->theme = theme;
 }
 
-void PorymapConfig::setTextEditorCommand(const QString &command) {
-    this->textEditorCommand = command;
+void PorymapConfig::setTextEditorCommandTemplate(const QString &commandTemplate) {
+    this->textEditorCommandTemplate = commandTemplate;
     this->save();
 }
 
@@ -406,8 +406,8 @@ QString PorymapConfig::getTheme() {
     return this->theme;
 }
 
-QString PorymapConfig::getTextEditorCommand() {
-    return this->textEditorCommand;
+QString PorymapConfig::getTextEditorCommandTemplate() {
+    return this->textEditorCommandTemplate;
 }
 
 const QMap<BaseGameVersion, QString> baseGameVersionMap = {
diff --git a/src/project.cpp b/src/project.cpp
index 270e9346..6cbd7c92 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -2410,7 +2410,7 @@ QString Project::fixGraphicPath(QString path) {
     return path;
 }
 
-QString Project::getScriptFileExtension(bool usePoryScript) {
+QString Project::getScriptFileExtension(bool usePoryScript) const {
     if(usePoryScript) {
         return ".pory";
     } else {
@@ -2418,13 +2418,23 @@ QString Project::getScriptFileExtension(bool usePoryScript) {
     }
 }
 
-QString Project::getScriptDefaultString(bool usePoryScript, QString mapName) {
+QString Project::getScriptDefaultString(bool usePoryScript, QString mapName) const {
     if(usePoryScript)
         return QString("mapscripts %1_MapScripts {}").arg(mapName);
     else
         return QString("%1_MapScripts::\n\t.byte 0\n").arg(mapName);
 }
 
+QString Project::getMapScriptsFilePath(const QString &mapName) const {
+    const bool usePoryscript = projectConfig.getUsePoryScript();
+    auto path = QDir::cleanPath(root + "/data/maps/" + mapName + "/scripts");
+    auto extension = getScriptFileExtension(usePoryscript);
+    if (usePoryscript && !QFile::exists(path + extension))
+        extension = getScriptFileExtension(false);
+    path += extension;
+    return path;
+}
+
 void Project::loadEventPixmaps(QList<Event*> objects) {
     bool needs_update = false;
     for (Event *object : objects) {
diff --git a/src/ui/preferenceeditor.cpp b/src/ui/preferenceeditor.cpp
index 42edd313..9a22a250 100644
--- a/src/ui/preferenceeditor.cpp
+++ b/src/ui/preferenceeditor.cpp
@@ -30,7 +30,7 @@ PreferenceEditor::~PreferenceEditor()
 }
 
 void PreferenceEditor::populateFields() {
-    ui->lineEdit_TextEditor->setText(porymapConfig.getTextEditorCommand());
+    ui->lineEdit_TextEditor->setText(porymapConfig.getTextEditorCommandTemplate());
 
     QStringList themes = { "default" };
     QRegularExpression re(":/themes/([A-z0-9_-]+).qss");
@@ -44,7 +44,7 @@ void PreferenceEditor::populateFields() {
 }
 
 void PreferenceEditor::saveFields() {
-    porymapConfig.setTextEditorCommand(ui->lineEdit_TextEditor->text());
+    porymapConfig.setTextEditorCommandTemplate(ui->lineEdit_TextEditor->text());
 
     if (themeSelector->currentText() != porymapConfig.getTheme()) {
         const auto theme = themeSelector->currentText();

From 4aaae1a264bd427d06fe276b1f0d6891d3e26f25 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Sun, 22 Nov 2020 01:04:46 -0500
Subject: [PATCH 05/16] Add support for opening .inc scripts to the selected
 event script

---
 include/core/parseutil.h |  8 ++++++--
 include/editor.h         |  2 ++
 include/mainwindow.h     |  3 ---
 src/core/parseutil.cpp   | 19 +++++++++++++++++++
 src/editor.cpp           | 39 +++++++++++++++++++++++++++++++++++++++
 src/mainwindow.cpp       | 16 +---------------
 6 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/include/core/parseutil.h b/include/core/parseutil.h
index 22abe367..4bc5301e 100644
--- a/include/core/parseutil.h
+++ b/include/core/parseutil.h
@@ -40,8 +40,8 @@ class ParseUtil
 public:
     ParseUtil();
     void set_root(QString);
-    QString readTextFile(QString);
-    void strip_comment(QString*);
+    static QString readTextFile(QString);
+    static void strip_comment(QString*);
     QList<QStringList>* parseAsm(QString);
     int evaluateDefine(QString, QMap<QString, int>*);
     QStringList readCArray(QString text, QString label);
@@ -54,6 +54,10 @@ public:
     bool tryParseJsonFile(QJsonDocument *out, QString filepath);
     bool ensureFieldsExist(QJsonObject obj, QList<QString> fields);
 
+    // Returns the 1-indexed line number for the definition of scriptLabel in the scripts file at filePath.
+    // Returns 0 if a definition for scriptLabel cannot be found.
+    static int getScriptLineNumber(const QString &scriptLabel, const QString &filePath);
+
 private:
     QString root;
     QString text;
diff --git a/include/editor.h b/include/editor.h
index 748759b6..6e04262e 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -154,6 +154,7 @@ public:
     void scaleMapView(int);
 
 public slots:
+    void openMapScripts() const;
     void maskNonVisibleConnectionTiles();
 
 private:
@@ -183,6 +184,7 @@ private:
     QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
     QString getMetatileDisplayMessage(uint16_t metatileId);
     bool eventLimitReached(Map *, QString);
+    QString constructTextEditorCommand(QString commandTemplate, const QString &path) const;
 
 private slots:
     void onMapStartPaint(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);
diff --git a/include/mainwindow.h b/include/mainwindow.h
index 6293c627..92be8c07 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -119,8 +119,6 @@ private slots:
 
     void duplicate();
 
-    void openInTextEditor();
-
     void onLoadMapRequested(QString, QString);
     void onMapChanged(Map *map);
     void onMapNeedsRedrawing();
@@ -164,7 +162,6 @@ private slots:
     void on_actionMap_Shift_triggered();
 
     void on_toolButton_deleteObject_clicked();
-    void on_toolButton_Open_Scripts_clicked();
 
     void addNewEvent(QString);
     void updateSelectedObjects();
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 80a4cf6c..431d7ba3 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -420,3 +420,22 @@ bool ParseUtil::ensureFieldsExist(QJsonObject obj, QList<QString> fields) {
     }
     return true;
 }
+
+int ParseUtil::getScriptLineNumber(const QString &scriptLabel, const QString &filePath) {
+    if (filePath.endsWith(".inc")) {
+        const QString text = readTextFile(filePath);
+        const QStringList lines = text.split('\n');
+        for (int lineNumber = 0; lineNumber < lines.count(); ++lineNumber) {
+            QString line = lines.at(lineNumber);
+            strip_comment(&line);
+            if (line.contains(':')) {
+                const QString parsedLabel = line.left(line.indexOf(':')).trimmed();
+                if (parsedLabel == scriptLabel)
+                    return lineNumber + 1;
+            }
+        }
+    } else if (filePath.endsWith(".pory")) {
+
+    }
+    return 0;
+}
diff --git a/src/editor.cpp b/src/editor.cpp
index 0b4eb6be7..47de6c1e 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -9,6 +9,7 @@
 #include "metatile.h"
 #include "montabwidget.h"
 #include "editcommands.h"
+#include "config.h"
 #include <QCheckBox>
 #include <QPainter>
 #include <QMouseEvent>
@@ -1999,6 +2000,44 @@ void Editor::deleteEvent(Event *event) {
     //updateSelectedObjects();
 }
 
+void Editor::openMapScripts() const {
+    const QString path = project->getMapScriptsFilePath(map->name);
+    const QString commandTemplate = porymapConfig.getTextEditorCommandTemplate();
+    if (commandTemplate.isEmpty()) {
+        // Open map scripts in the system's default editor.
+        QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+    } else {
+        const QString command = constructTextEditorCommand(commandTemplate, path);
+#ifdef Q_OS_WIN
+        // On Windows, a QProcess command must be wrapped in a cmd.exe command.
+        const QString program = QProcessEnvironment::systemEnvironment().value("COMSPEC");
+        QStringList arguments({ QString("/c"), command });
+#else
+        QStringList arguments = QProcess::splitCommand(command);
+        const QString program = arguments.takeFirst();
+#endif
+        static QProcess proc;
+        proc.setProgram(program);
+        proc.setArguments(arguments);
+        proc.start();
+    }
+}
+
+QString Editor::constructTextEditorCommand(QString commandTemplate, const QString &path) const {
+    if (commandTemplate.contains("%F")) {
+        if (commandTemplate.contains("%L")) {
+            const QString scriptLabel = selected_events->isEmpty() ?
+                                        QString() : selected_events->first()->event->get("script_label");
+            const int lineNum = ParseUtil::getScriptLineNumber(scriptLabel, path);
+            commandTemplate.replace("%L", QString::number(lineNum));
+        }
+        commandTemplate.replace("%F", path);
+    } else {
+        commandTemplate += path;
+    }
+    return commandTemplate;
+}
+
 // It doesn't seem to be possible to prevent the mousePress event
 // from triggering both event's DraggablePixmapItem and the background mousePress.
 // Since the DraggablePixmapItem's event fires first, we can set a temp
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7f674ed3..cb72165d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -154,6 +154,7 @@ void MainWindow::initEditor() {
     connect(this->editor, SIGNAL(warpEventDoubleClicked(QString,QString)), this, SLOT(openWarpMap(QString,QString)));
     connect(this->editor, SIGNAL(currentMetatilesSelectionChanged()), this, SLOT(currentMetatilesSelectionChanged()));
     connect(this->editor, SIGNAL(wildMonDataChanged()), this, SLOT(onWildMonDataChanged()));
+    connect(ui->toolButton_Open_Scripts, &QToolButton::clicked, this->editor, &Editor::openMapScripts);
 
     this->loadUserSettings();
 
@@ -1293,16 +1294,6 @@ void MainWindow::duplicate() {
     editor->duplicateSelectedEvents();
 }
 
-// Open current map scripts in system default editor for .inc files
-void MainWindow::openInTextEditor() {
-    bool usePoryscript = projectConfig.getUsePoryScript();
-    QString path = QDir::cleanPath("file://" + editor->project->root + QDir::separator() + "data/maps/" + editor->map->name + "/scripts");
-
-    // Try opening scripts file, if opening .pory failed try again with .inc
-    if (!QDesktopServices::openUrl(QUrl(path + editor->project->getScriptFileExtension(usePoryscript))) && usePoryscript)
-        QDesktopServices::openUrl(QUrl(path + editor->project->getScriptFileExtension(false)));
-}
-
 void MainWindow::on_action_Save_triggered() {
     editor->save();
     updateMapList();
@@ -2093,11 +2084,6 @@ void MainWindow::on_toolButton_deleteObject_clicked() {
     }
 }
 
-void MainWindow::on_toolButton_Open_Scripts_clicked()
-{
-    openInTextEditor();
-}
-
 void MainWindow::on_toolButton_Paint_clicked()
 {
     if (ui->mainTabBar->currentIndex() == 0)

From a4528fb0d9482fb63392ddefd4b2f860a1754539 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Thu, 26 Nov 2020 06:09:58 -0500
Subject: [PATCH 06/16] Add support for opening .pory scripts to the selected
 event script

---
 include/core/parseutil.h |  9 +++--
 src/core/parseutil.cpp   | 75 ++++++++++++++++++++++++++++++++--------
 src/editor.cpp           | 14 ++++----
 3 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/include/core/parseutil.h b/include/core/parseutil.h
index 4bc5301e..b65dbf76 100644
--- a/include/core/parseutil.h
+++ b/include/core/parseutil.h
@@ -41,7 +41,7 @@ public:
     ParseUtil();
     void set_root(QString);
     static QString readTextFile(QString);
-    static void strip_comment(QString*);
+    void strip_comment(QString*);
     QList<QStringList>* parseAsm(QString);
     int evaluateDefine(QString, QMap<QString, int>*);
     QStringList readCArray(QString text, QString label);
@@ -56,7 +56,12 @@ public:
 
     // Returns the 1-indexed line number for the definition of scriptLabel in the scripts file at filePath.
     // Returns 0 if a definition for scriptLabel cannot be found.
-    static int getScriptLineNumber(const QString &scriptLabel, const QString &filePath);
+    static int getScriptLineNumber(const QString &filePath, const QString &scriptLabel);
+    static int getRawScriptLineNumber(QString text, const QString &scriptLabel);
+    static int getPoryScriptLineNumber(QString text, const QString &scriptLabel);
+    static QString &removeStringLiterals(QString &text);
+    static QString &removeLineComments(QString &text, const QString &commentSymbol);
+    static QString &removeLineComments(QString &text, const QStringList &commentSymbols);
 
 private:
     QString root;
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 431d7ba3..5dc4f176 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -421,21 +421,66 @@ bool ParseUtil::ensureFieldsExist(QJsonObject obj, QList<QString> fields) {
     return true;
 }
 
-int ParseUtil::getScriptLineNumber(const QString &scriptLabel, const QString &filePath) {
-    if (filePath.endsWith(".inc")) {
-        const QString text = readTextFile(filePath);
-        const QStringList lines = text.split('\n');
-        for (int lineNumber = 0; lineNumber < lines.count(); ++lineNumber) {
-            QString line = lines.at(lineNumber);
-            strip_comment(&line);
-            if (line.contains(':')) {
-                const QString parsedLabel = line.left(line.indexOf(':')).trimmed();
-                if (parsedLabel == scriptLabel)
-                    return lineNumber + 1;
-            }
-        }
-    } else if (filePath.endsWith(".pory")) {
+int ParseUtil::getScriptLineNumber(const QString &filePath, const QString &scriptLabel) {
+    if (filePath.endsWith(".inc"))
+        return getRawScriptLineNumber(readTextFile(filePath), scriptLabel);
+    else if (filePath.endsWith(".pory"))
+        return getPoryScriptLineNumber(readTextFile(filePath), scriptLabel);
 
-    }
     return 0;
 }
+
+int ParseUtil::getRawScriptLineNumber(QString text, const QString &scriptLabel) {
+    removeStringLiterals(text);
+    removeLineComments(text, "@");
+
+    static const QRegularExpression re_incScriptLabel("(?<label>[a-zA-Z_]+[a-zA-Z0-9_]*):");
+    QRegularExpressionMatchIterator it = re_incScriptLabel.globalMatch(text);
+    while (it.hasNext()) {
+        const QRegularExpressionMatch match = it.next();
+        if (match.captured("label") == scriptLabel)
+            return text.left(match.capturedStart("label")).count('\n') + 1;
+    }
+
+    return 0;
+}
+
+int ParseUtil::getPoryScriptLineNumber(QString text, const QString &scriptLabel) {
+    removeStringLiterals(text);
+    removeLineComments(text, {"//", "#"});
+
+    static const QRegularExpression re_poryScriptLabel("\\b(script)\\b[\\s]+(?<label>[a-zA-Z_]+[a-zA-Z0-9_]*)");
+    QRegularExpressionMatchIterator it = re_poryScriptLabel.globalMatch(text);
+    while (it.hasNext()) {
+        const QRegularExpressionMatch match = it.next();
+        if (match.captured("label") == scriptLabel)
+            return text.left(match.capturedStart("label")).count('\n') + 1;
+    }
+
+    static const QRegularExpression re_poryRawSection("\\b(raw)\\b[\\s]*`(?<script>[^`]*)");
+    QRegularExpressionMatchIterator raw_it = re_poryRawSection.globalMatch(text);
+    while (raw_it.hasNext()) {
+        const QRegularExpressionMatch match = raw_it.next();
+        const int relative_lineNum = getRawScriptLineNumber(match.captured("script"), scriptLabel);
+        if (relative_lineNum)
+            return text.left(match.capturedStart("script")).count('\n') + relative_lineNum;
+    }
+
+    return 0;
+}
+
+QString &ParseUtil::removeStringLiterals(QString &text) {
+    static const QRegularExpression re_string("\".*\"");
+    return text.remove(re_string);
+}
+
+QString &ParseUtil::removeLineComments(QString &text, const QString &commentSymbol) {
+    const QRegularExpression re_lineComment(commentSymbol + "+.*");
+    return text.remove(re_lineComment);
+}
+
+QString &ParseUtil::removeLineComments(QString &text, const QStringList &commentSymbols) {
+    for (const auto &commentSymbol : commentSymbols)
+        removeLineComments(text, commentSymbol);
+    return text;
+}
diff --git a/src/editor.cpp b/src/editor.cpp
index 47de6c1e..ab9ff039 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -2001,13 +2001,13 @@ void Editor::deleteEvent(Event *event) {
 }
 
 void Editor::openMapScripts() const {
-    const QString path = project->getMapScriptsFilePath(map->name);
+    const QString scriptsPath = project->getMapScriptsFilePath(map->name);
     const QString commandTemplate = porymapConfig.getTextEditorCommandTemplate();
     if (commandTemplate.isEmpty()) {
         // Open map scripts in the system's default editor.
-        QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+        QDesktopServices::openUrl(QUrl::fromLocalFile(scriptsPath));
     } else {
-        const QString command = constructTextEditorCommand(commandTemplate, path);
+        const QString command = constructTextEditorCommand(commandTemplate, scriptsPath);
 #ifdef Q_OS_WIN
         // On Windows, a QProcess command must be wrapped in a cmd.exe command.
         const QString program = QProcessEnvironment::systemEnvironment().value("COMSPEC");
@@ -2023,17 +2023,17 @@ void Editor::openMapScripts() const {
     }
 }
 
-QString Editor::constructTextEditorCommand(QString commandTemplate, const QString &path) const {
+QString Editor::constructTextEditorCommand(QString commandTemplate, const QString &filePath) const {
     if (commandTemplate.contains("%F")) {
         if (commandTemplate.contains("%L")) {
             const QString scriptLabel = selected_events->isEmpty() ?
                                         QString() : selected_events->first()->event->get("script_label");
-            const int lineNum = ParseUtil::getScriptLineNumber(scriptLabel, path);
+            const int lineNum = ParseUtil::getScriptLineNumber(filePath, scriptLabel);
             commandTemplate.replace("%L", QString::number(lineNum));
         }
-        commandTemplate.replace("%F", path);
+        commandTemplate.replace("%F", filePath);
     } else {
-        commandTemplate += path;
+        commandTemplate += filePath;
     }
     return commandTemplate;
 }

From dbafb99fd4b60433c6fb9437d03179f0873021d8 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Tue, 1 Dec 2020 07:12:32 -0500
Subject: [PATCH 07/16] Add action to open the project root in a text editor

---
 forms/mainwindow.ui         |  10 +++
 forms/preferenceeditor.ui   | 161 +++++++++++++++++++++++++-----------
 include/config.h            |  11 ++-
 include/editor.h            |   5 +-
 src/config.cpp              |  26 ++++--
 src/core/parseutil.cpp      |  12 +--
 src/editor.cpp              |  62 +++++++-------
 src/mainwindow.cpp          |   2 +-
 src/ui/preferenceeditor.cpp |  12 ++-
 9 files changed, 204 insertions(+), 97 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index b3179047..f2aa614f 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -2623,6 +2623,8 @@
     <addaction name="actionNew_Tileset"/>
     <addaction name="actionTileset_Editor"/>
     <addaction name="actionRegion_Map_Editor"/>
+    <addaction name="separator"/>
+    <addaction name="actionOpen_Project_in_Text_Editor"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -2904,6 +2906,14 @@
    <property name="text">
     <string>Edit Preferences...</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+,</string>
+   </property>
+  </action>
+  <action name="actionOpen_Project_in_Text_Editor">
+   <property name="text">
+    <string>Open Project in Text Editor</string>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
diff --git a/forms/preferenceeditor.ui b/forms/preferenceeditor.ui
index d9e7fa72..eafffcbf 100644
--- a/forms/preferenceeditor.ui
+++ b/forms/preferenceeditor.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
-    <height>320</height>
+    <width>500</width>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,51 +15,6 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QGroupBox" name="groupBox_TextEditor">
-      <property name="title">
-       <string>Preferred Text Editor</string>
-      </property>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_TextEditor">
-         <property name="text">
-          <string>Command</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineEdit_TextEditor">
-         <property name="toolTip">
-          <string>The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, $D, %N) are used, the action will be applicable even if more than one item is selected. Esle the action will only be applicable f exactly one item is selected.</string>
-         </property>
-         <property name="placeholderText">
-          <string>e.g. code --goto %F:%L</string>
-         </property>
-         <property name="clearButtonEnabled">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="QLabel" name="label_TextEditorHelp">
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The command that will be executed when clicking the &amp;quot;Open Map Scripts&amp;quot; button. You may optionally include '%F' and '%L' in the command. '%F' will be substituted with the scripts file path and '%L' will be substituted with a line number. If '%L' is specified then the scripts file will be opened to map script cooresponding to the currently selected event (If the script can be found). If '%F' is &lt;span style=&quot; font-weight:600;&quot;&gt;not&lt;/span&gt; specified then the map scripts file path will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="scaledContents">
-          <bool>false</bool>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
     <item>
      <widget class="QGroupBox" name="groupBox_Themes">
       <property name="sizePolicy">
@@ -73,6 +28,118 @@
       </property>
      </widget>
     </item>
+    <item>
+     <widget class="QGroupBox" name="groupBox_TextEditor">
+      <property name="title">
+       <string>Preferred Text Editor</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item row="2" column="0">
+        <widget class="QScrollArea" name="scrollArea_TextEditor">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents_TextEditor">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>482</width>
+            <height>398</height>
+           </rect>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_2">
+           <property name="sizeConstraint">
+            <enum>QLayout::SetMinimumSize</enum>
+           </property>
+           <item row="5" column="0" colspan="2">
+            <widget class="QLabel" name="label_TextEditorGotoLineHelp">
+             <property name="text">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The command that will be executed when clicking the &lt;span style=&quot; font-weight:600;&quot;&gt;Open Map Scripts&lt;/span&gt; button&lt;span style=&quot; font-weight:600;&quot;&gt;. %F&lt;/span&gt; will be substituted with the scripts file path and &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; will be substituted with the line number of the event that is currently selected. &lt;span style=&quot; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;must&lt;/span&gt; be specified if &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; is specified. If &lt;span style=&quot; font-weight:600;&quot;&gt;%F&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the scripts file path will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLineEdit" name="lineEdit_TextEditorGotoLine">
+             <property name="toolTip">
+              <string>The shell command for your preferred text editor to open a file to a specific line number (possibly an absolute path if the program doesn't exist in your PATH).</string>
+             </property>
+             <property name="placeholderText">
+              <string>e.g. code --goto %F:%L</string>
+             </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" colspan="2">
+            <widget class="QLabel" name="label_TextEditorOpenFolderHelp">
+             <property name="text">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The command that will be executed when clicking &lt;span style=&quot; font-weight:600;&quot;&gt;Open Project in Text Editor&lt;/span&gt; in the &lt;span style=&quot; font-weight:600;&quot;&gt;Tools&lt;/span&gt; menu. &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; will be substituted with the current project's root directory. If &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the project directory will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_TextEditorOpenFolder">
+             <property name="text">
+              <string>Open Directory Command</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEdit_TextEditorOpenFolder">
+             <property name="toolTip">
+              <string>The shell command for your preferred text editor (possibly an absolute path if the program doesn't exist in your PATH).</string>
+             </property>
+             <property name="placeholderText">
+              <string>e.g. code %D</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_TextEditorGotoLine">
+             <property name="text">
+              <string>Goto Line Command</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
     <item>
      <widget class="QDialogButtonBox" name="buttonBox">
       <property name="standardButtons">
diff --git a/include/config.h b/include/config.h
index bb740d41..37c5fb25 100644
--- a/include/config.h
+++ b/include/config.h
@@ -45,6 +45,8 @@ public:
         this->monitorFiles = true;
         this->regionMapDimensions = QSize(32, 20);
         this->theme = "default";
+        this->textEditorOpenFolder = "";
+        this->textEditorGotoLine = "";
     }
     void setRecentProject(QString project);
     void setRecentMap(QString map);
@@ -61,7 +63,8 @@ public:
     void setMonitorFiles(bool monitor);
     void setRegionMapDimensions(int width, int height);
     void setTheme(QString theme);
-    void setTextEditorCommandTemplate(const QString &commandTemplate);
+    void setTextEditorOpenFolder(const QString &command);
+    void setTextEditorGotoLine(const QString &command);
     QString getRecentProject();
     QString getRecentMap();
     MapSortOrder getMapSortOrder();
@@ -77,7 +80,8 @@ public:
     bool getMonitorFiles();
     QSize getRegionMapDimensions();
     QString getTheme();
-    QString getTextEditorCommandTemplate();
+    QString getTextEditorOpenFolder();
+    QString getTextEditorGotoLine();
 protected:
     virtual QString getConfigFilepath() override;
     virtual void parseConfigKeyValue(QString key, QString value) override;
@@ -109,7 +113,8 @@ private:
     bool monitorFiles;
     QSize regionMapDimensions;
     QString theme;
-    QString textEditorCommandTemplate;
+    QString textEditorOpenFolder;
+    QString textEditorGotoLine;
 };
 
 extern PorymapConfig porymapConfig;
diff --git a/include/editor.h b/include/editor.h
index 6e04262e..8dfa91ae 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -155,6 +155,7 @@ public:
 
 public slots:
     void openMapScripts() const;
+    void openProjectInTextEditor() const;
     void maskNonVisibleConnectionTiles();
 
 private:
@@ -184,7 +185,9 @@ private:
     QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
     QString getMetatileDisplayMessage(uint16_t metatileId);
     bool eventLimitReached(Map *, QString);
-    QString constructTextEditorCommand(QString commandTemplate, const QString &path) const;
+    bool startDetachedProcess(const QString &command,
+                              const QString &workingDirectory = QString(),
+                              qint64 *pid = nullptr) const;
 
 private slots:
     void onMapStartPaint(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);
diff --git a/src/config.cpp b/src/config.cpp
index 24798f7c..831e5507 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -187,8 +187,10 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) {
         }
     } else if (key == "theme") {
         this->theme = value;
-    } else if (key == "text_editor") {
-        this->textEditorCommandTemplate = value;
+    } else if (key == "text_editor_open_directory") {
+        this->textEditorOpenFolder = value;
+    } else if (key == "text_editor_goto_line") {
+        this->textEditorGotoLine = value;
     } else {
         logWarn(QString("Invalid config key found in config file %1: '%2'").arg(this->getConfigFilepath()).arg(key));
     }
@@ -218,7 +220,8 @@ QMap<QString, QString> PorymapConfig::getKeyValueMap() {
     map.insert("region_map_dimensions", QString("%1x%2").arg(this->regionMapDimensions.width())
                                                         .arg(this->regionMapDimensions.height()));
     map.insert("theme", this->theme);
-    map.insert("text_editor", this->textEditorCommandTemplate);
+    map.insert("text_editor_open_directory", this->textEditorOpenFolder);
+    map.insert("text_editor_goto_line", this->textEditorGotoLine);
     return map;
 }
 
@@ -319,8 +322,13 @@ void PorymapConfig::setTheme(QString theme) {
     this->theme = theme;
 }
 
-void PorymapConfig::setTextEditorCommandTemplate(const QString &commandTemplate) {
-    this->textEditorCommandTemplate = commandTemplate;
+void PorymapConfig::setTextEditorOpenFolder(const QString &command) {
+    this->textEditorOpenFolder = command;
+    this->save();
+}
+
+void PorymapConfig::setTextEditorGotoLine(const QString &command) {
+    this->textEditorGotoLine = command;
     this->save();
 }
 
@@ -406,8 +414,12 @@ QString PorymapConfig::getTheme() {
     return this->theme;
 }
 
-QString PorymapConfig::getTextEditorCommandTemplate() {
-    return this->textEditorCommandTemplate;
+QString PorymapConfig::getTextEditorOpenFolder() {
+    return this->textEditorOpenFolder;
+}
+
+QString PorymapConfig::getTextEditorGotoLine() {
+    return this->textEditorGotoLine;
 }
 
 const QMap<BaseGameVersion, QString> baseGameVersionMap = {
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 5dc4f176..733cf5fe 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -434,7 +434,7 @@ int ParseUtil::getRawScriptLineNumber(QString text, const QString &scriptLabel)
     removeStringLiterals(text);
     removeLineComments(text, "@");
 
-    static const QRegularExpression re_incScriptLabel("(?<label>[a-zA-Z_]+[a-zA-Z0-9_]*):");
+    static const QRegularExpression re_incScriptLabel("(?<label>[\\w_][\\w\\d_]*):");
     QRegularExpressionMatchIterator it = re_incScriptLabel.globalMatch(text);
     while (it.hasNext()) {
         const QRegularExpressionMatch match = it.next();
@@ -449,7 +449,7 @@ int ParseUtil::getPoryScriptLineNumber(QString text, const QString &scriptLabel)
     removeStringLiterals(text);
     removeLineComments(text, {"//", "#"});
 
-    static const QRegularExpression re_poryScriptLabel("\\b(script)\\b[\\s]+(?<label>[a-zA-Z_]+[a-zA-Z0-9_]*)");
+    static const QRegularExpression re_poryScriptLabel("\\b(script)\\b[\\s]+(?<label>[\\w_][\\w\\d_]*)");
     QRegularExpressionMatchIterator it = re_poryScriptLabel.globalMatch(text);
     while (it.hasNext()) {
         const QRegularExpressionMatch match = it.next();
@@ -457,13 +457,13 @@ int ParseUtil::getPoryScriptLineNumber(QString text, const QString &scriptLabel)
             return text.left(match.capturedStart("label")).count('\n') + 1;
     }
 
-    static const QRegularExpression re_poryRawSection("\\b(raw)\\b[\\s]*`(?<script>[^`]*)");
+    static const QRegularExpression re_poryRawSection("\\b(raw)\\b[\\s]*`(?<raw_script>[^`]*)");
     QRegularExpressionMatchIterator raw_it = re_poryRawSection.globalMatch(text);
     while (raw_it.hasNext()) {
         const QRegularExpressionMatch match = raw_it.next();
-        const int relative_lineNum = getRawScriptLineNumber(match.captured("script"), scriptLabel);
-        if (relative_lineNum)
-            return text.left(match.capturedStart("script")).count('\n') + relative_lineNum;
+        const int relativelineNum = getRawScriptLineNumber(match.captured("raw_script"), scriptLabel);
+        if (relativelineNum)
+            return text.left(match.capturedStart("raw_script")).count('\n') + relativelineNum;
     }
 
     return 0;
diff --git a/src/editor.cpp b/src/editor.cpp
index ab9ff039..36512679 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -14,6 +14,7 @@
 #include <QPainter>
 #include <QMouseEvent>
 #include <QDir>
+#include <QProcess>
 #include <math.h>
 
 static bool selectNewEvents = false;
@@ -2002,40 +2003,45 @@ void Editor::deleteEvent(Event *event) {
 
 void Editor::openMapScripts() const {
     const QString scriptsPath = project->getMapScriptsFilePath(map->name);
-    const QString commandTemplate = porymapConfig.getTextEditorCommandTemplate();
-    if (commandTemplate.isEmpty()) {
+    QString command = porymapConfig.getTextEditorGotoLine();
+    if (command.isEmpty()) {
         // Open map scripts in the system's default editor.
         QDesktopServices::openUrl(QUrl::fromLocalFile(scriptsPath));
     } else {
-        const QString command = constructTextEditorCommand(commandTemplate, scriptsPath);
-#ifdef Q_OS_WIN
-        // On Windows, a QProcess command must be wrapped in a cmd.exe command.
-        const QString program = QProcessEnvironment::systemEnvironment().value("COMSPEC");
-        QStringList arguments({ QString("/c"), command });
-#else
-        QStringList arguments = QProcess::splitCommand(command);
-        const QString program = arguments.takeFirst();
-#endif
-        static QProcess proc;
-        proc.setProgram(program);
-        proc.setArguments(arguments);
-        proc.start();
+        if (command.contains("%F")) {
+            if (command.contains("%L")) {
+                const QString scriptLabel = selected_events->isEmpty() ?
+                                            QString() : selected_events->first()->event->get("script_label");
+                const int lineNum = ParseUtil::getScriptLineNumber(scriptsPath, scriptLabel);
+                command.replace("%L", QString::number(lineNum));
+            }
+            command.replace("%F", scriptsPath);
+        } else {
+            command += ' ' + scriptsPath;
+        }
+        startDetachedProcess(command);
     }
 }
 
-QString Editor::constructTextEditorCommand(QString commandTemplate, const QString &filePath) const {
-    if (commandTemplate.contains("%F")) {
-        if (commandTemplate.contains("%L")) {
-            const QString scriptLabel = selected_events->isEmpty() ?
-                                        QString() : selected_events->first()->event->get("script_label");
-            const int lineNum = ParseUtil::getScriptLineNumber(filePath, scriptLabel);
-            commandTemplate.replace("%L", QString::number(lineNum));
-        }
-        commandTemplate.replace("%F", filePath);
-    } else {
-        commandTemplate += filePath;
-    }
-    return commandTemplate;
+void Editor::openProjectInTextEditor() const {
+    QString command = porymapConfig.getTextEditorOpenFolder();
+    if (command.contains("%D"))
+        command.replace("%D", project->root);
+    else
+        command += ' ' + project->root;
+    startDetachedProcess(command);
+}
+
+bool Editor::startDetachedProcess(const QString &command, const QString &workingDirectory, qint64 *pid) const {
+#ifdef Q_OS_WIN
+    // On Windows, a QProcess command must be wrapped in a cmd.exe command.
+    const QString program = QProcessEnvironment::systemEnvironment().value("COMSPEC");
+    QStringList arguments({ QString("/c"), command });
+#else
+    QStringList arguments = QProcess::splitCommand(command);
+    const QString program = arguments.takeFirst();
+#endif
+    return QProcess::startDetached(program, arguments, workingDirectory, pid);
 }
 
 // It doesn't seem to be possible to prevent the mousePress event
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cb72165d..10a79a28 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -29,7 +29,6 @@
 #include <QDialogButtonBox>
 #include <QScroller>
 #include <math.h>
-#include <QProcess>
 #include <QSysInfo>
 #include <QDesktopServices>
 #include <QTransform>
@@ -155,6 +154,7 @@ void MainWindow::initEditor() {
     connect(this->editor, SIGNAL(currentMetatilesSelectionChanged()), this, SLOT(currentMetatilesSelectionChanged()));
     connect(this->editor, SIGNAL(wildMonDataChanged()), this, SLOT(onWildMonDataChanged()));
     connect(ui->toolButton_Open_Scripts, &QToolButton::clicked, this->editor, &Editor::openMapScripts);
+    connect(ui->actionOpen_Project_in_Text_Editor, &QAction::triggered, this->editor, &Editor::openProjectInTextEditor);
 
     this->loadUserSettings();
 
diff --git a/src/ui/preferenceeditor.cpp b/src/ui/preferenceeditor.cpp
index 9a22a250..25b5fc72 100644
--- a/src/ui/preferenceeditor.cpp
+++ b/src/ui/preferenceeditor.cpp
@@ -30,8 +30,6 @@ PreferenceEditor::~PreferenceEditor()
 }
 
 void PreferenceEditor::populateFields() {
-    ui->lineEdit_TextEditor->setText(porymapConfig.getTextEditorCommandTemplate());
-
     QStringList themes = { "default" };
     QRegularExpression re(":/themes/([A-z0-9_-]+).qss");
     QDirIterator it(":/themes", QDirIterator::Subdirectories);
@@ -41,17 +39,23 @@ void PreferenceEditor::populateFields() {
     }
     themeSelector->addItems(themes);
     themeSelector->setCurrentText(porymapConfig.getTheme());
+
+    ui->lineEdit_TextEditorOpenFolder->setText(porymapConfig.getTextEditorOpenFolder());
+
+    ui->lineEdit_TextEditorGotoLine->setText(porymapConfig.getTextEditorGotoLine());
 }
 
 void PreferenceEditor::saveFields() {
-    porymapConfig.setTextEditorCommandTemplate(ui->lineEdit_TextEditor->text());
-
     if (themeSelector->currentText() != porymapConfig.getTheme()) {
         const auto theme = themeSelector->currentText();
         porymapConfig.setTheme(theme);
         emit themeChanged(theme);
     }
 
+    porymapConfig.setTextEditorOpenFolder(ui->lineEdit_TextEditorOpenFolder->text());
+
+    porymapConfig.setTextEditorGotoLine(ui->lineEdit_TextEditorGotoLine->text());
+
     emit preferencesSaved();
 }
 

From e70479335036283384dbd8e697f30c99a4ecf5fd Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Tue, 1 Dec 2020 10:13:56 -0500
Subject: [PATCH 08/16] Disable actionOpen_Project_in_Text_Editor when no
 command is set

---
 include/mainwindow.h |  1 +
 src/mainwindow.cpp   | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/include/mainwindow.h b/include/mainwindow.h
index 92be8c07..607a713a 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -224,6 +224,7 @@ private slots:
 
     void on_actionRegion_Map_Editor_triggered();
     void on_actionEdit_Preferences_triggered();
+    void togglePreferenceSpecificUi();
 
 private:
     Ui::MainWindow *ui;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 10a79a28..60d6018b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -81,6 +81,8 @@ void MainWindow::setWindowDisabled(bool disabled) {
     ui->action_Exit->setDisabled(false);
     ui->menuHelp->setDisabled(false);
     ui->actionAbout_Porymap->setDisabled(false);
+    if (!disabled)
+        togglePreferenceSpecificUi();
 }
 
 void MainWindow::initWindow() {
@@ -2519,6 +2521,8 @@ void MainWindow::on_actionEdit_Preferences_triggered() {
                 this, &MainWindow::setTheme);
         connect(preferenceEditor, &PreferenceEditor::themeChanged,
                 editor, &Editor::maskNonVisibleConnectionTiles);
+        connect(preferenceEditor, &PreferenceEditor::preferencesSaved,
+                this, &MainWindow::togglePreferenceSpecificUi);
         connect(preferenceEditor, &QObject::destroyed, [=](QObject *) { preferenceEditor = nullptr; });
     }
 
@@ -2531,6 +2535,13 @@ void MainWindow::on_actionEdit_Preferences_triggered() {
     }
 }
 
+void MainWindow::togglePreferenceSpecificUi() {
+    if (porymapConfig.getTextEditorOpenFolder().isEmpty())
+        ui->actionOpen_Project_in_Text_Editor->setEnabled(false);
+    else
+        ui->actionOpen_Project_in_Text_Editor->setEnabled(true);
+}
+
 void MainWindow::on_pushButton_AddCustomHeaderField_clicked()
 {
     int rowIndex = this->ui->tableWidget_CustomHeaderFields->rowCount();

From e97b50a24932956fa3ac461b75b7c0c45a6fbc50 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Tue, 1 Dec 2020 12:02:02 -0500
Subject: [PATCH 09/16] Refine regexes for script parsing

---
 src/core/parseutil.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 733cf5fe..a402e188 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -434,7 +434,7 @@ int ParseUtil::getRawScriptLineNumber(QString text, const QString &scriptLabel)
     removeStringLiterals(text);
     removeLineComments(text, "@");
 
-    static const QRegularExpression re_incScriptLabel("(?<label>[\\w_][\\w\\d_]*):");
+    static const QRegularExpression re_incScriptLabel("\\b(?<label>[\\w_][\\w\\d_]*):{1,2}");
     QRegularExpressionMatchIterator it = re_incScriptLabel.globalMatch(text);
     while (it.hasNext()) {
         const QRegularExpressionMatch match = it.next();
@@ -449,7 +449,7 @@ int ParseUtil::getPoryScriptLineNumber(QString text, const QString &scriptLabel)
     removeStringLiterals(text);
     removeLineComments(text, {"//", "#"});
 
-    static const QRegularExpression re_poryScriptLabel("\\b(script)\\b[\\s]+(?<label>[\\w_][\\w\\d_]*)");
+    static const QRegularExpression re_poryScriptLabel("\\b(script)(\\((global|local)\\))?\\s*\\b(?<label>[\\w_][\\w\\d_]*)");
     QRegularExpressionMatchIterator it = re_poryScriptLabel.globalMatch(text);
     while (it.hasNext()) {
         const QRegularExpressionMatch match = it.next();
@@ -457,7 +457,7 @@ int ParseUtil::getPoryScriptLineNumber(QString text, const QString &scriptLabel)
             return text.left(match.capturedStart("label")).count('\n') + 1;
     }
 
-    static const QRegularExpression re_poryRawSection("\\b(raw)\\b[\\s]*`(?<raw_script>[^`]*)");
+    static const QRegularExpression re_poryRawSection("\\b(raw)\\s*`(?<raw_script>[^`]*)");
     QRegularExpressionMatchIterator raw_it = re_poryRawSection.globalMatch(text);
     while (raw_it.hasNext()) {
         const QRegularExpressionMatch match = raw_it.next();

From 62f73bee04170970c81695c23b24cc3d2a8890b5 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Tue, 1 Dec 2020 16:32:08 -0500
Subject: [PATCH 10/16] Populate scripts comboboxes with scripts found in
 map.json

---
 forms/preferenceeditor.ui | 69 +++++++++++++++++++++++++++++----------
 include/core/event.h      | 12 +++----
 include/core/map.h        |  3 +-
 src/core/map.cpp          | 30 ++++++++++++++---
 src/mainwindow.cpp        |  1 +
 5 files changed, 86 insertions(+), 29 deletions(-)

diff --git a/forms/preferenceeditor.ui b/forms/preferenceeditor.ui
index eafffcbf..b082ec1d 100644
--- a/forms/preferenceeditor.ui
+++ b/forms/preferenceeditor.ui
@@ -15,6 +15,9 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>9</number>
+    </property>
     <item>
      <widget class="QGroupBox" name="groupBox_Themes">
       <property name="sizePolicy">
@@ -63,17 +66,17 @@
             <x>0</x>
             <y>0</y>
             <width>482</width>
-            <height>398</height>
+            <height>392</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
            <property name="sizeConstraint">
             <enum>QLayout::SetMinimumSize</enum>
            </property>
-           <item row="5" column="0" colspan="2">
+           <item row="6" column="0" colspan="2">
             <widget class="QLabel" name="label_TextEditorGotoLineHelp">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The command that will be executed when clicking the &lt;span style=&quot; font-weight:600;&quot;&gt;Open Map Scripts&lt;/span&gt; button&lt;span style=&quot; font-weight:600;&quot;&gt;. %F&lt;/span&gt; will be substituted with the scripts file path and &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; will be substituted with the line number of the event that is currently selected. &lt;span style=&quot; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;must&lt;/span&gt; be specified if &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; is specified. If &lt;span style=&quot; font-weight:600;&quot;&gt;%F&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the scripts file path will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the command that will be executed when clicking the &lt;span style=&quot; font-weight:600;&quot;&gt;Open Map Scripts&lt;/span&gt; button&lt;span style=&quot; font-weight:600;&quot;&gt;. %F&lt;/span&gt; will be substituted with the scripts file path and &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; will be substituted with the line number of the script for the currently selected event. &lt;span style=&quot; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;must&lt;/span&gt; be specified if &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; is specified. If &lt;span style=&quot; font-weight:600;&quot;&gt;%F&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the scripts file path will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -83,13 +86,20 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
-            <widget class="QLineEdit" name="lineEdit_TextEditorGotoLine">
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_TextEditorGotoLine">
+             <property name="text">
+              <string>Goto Line Command</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEdit_TextEditorOpenFolder">
              <property name="toolTip">
-              <string>The shell command for your preferred text editor to open a file to a specific line number (possibly an absolute path if the program doesn't exist in your PATH).</string>
+              <string>The shell command for your preferred text editor (possibly an absolute path if the program doesn't exist in your PATH).</string>
              </property>
              <property name="placeholderText">
-              <string>e.g. code --goto %F:%L</string>
+              <string>e.g. code %D</string>
              </property>
              <property name="clearButtonEnabled">
               <bool>true</bool>
@@ -99,7 +109,7 @@
            <item row="1" column="0" colspan="2">
             <widget class="QLabel" name="label_TextEditorOpenFolderHelp">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The command that will be executed when clicking &lt;span style=&quot; font-weight:600;&quot;&gt;Open Project in Text Editor&lt;/span&gt; in the &lt;span style=&quot; font-weight:600;&quot;&gt;Tools&lt;/span&gt; menu. &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; will be substituted with the current project's root directory. If &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the project directory will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the command that will be executed when clicking &lt;span style=&quot; font-weight:600;&quot;&gt;Open Project in Text Editor&lt;/span&gt; in the &lt;span style=&quot; font-weight:600;&quot;&gt;Tools&lt;/span&gt; menu. &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; will be substituted with the current project's root directory. If &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the project directory will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -116,22 +126,47 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
-            <widget class="QLineEdit" name="lineEdit_TextEditorOpenFolder">
+           <item row="5" column="1">
+            <widget class="QLineEdit" name="lineEdit_TextEditorGotoLine">
              <property name="toolTip">
-              <string>The shell command for your preferred text editor (possibly an absolute path if the program doesn't exist in your PATH).</string>
+              <string>The shell command for your preferred text editor to open a file to a specific line number (possibly an absolute path if the program doesn't exist in your PATH).</string>
              </property>
              <property name="placeholderText">
-              <string>e.g. code %D</string>
+              <string>e.g. code --goto %F:%L</string>
+             </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="4" column="0">
-            <widget class="QLabel" name="label_TextEditorGotoLine">
-             <property name="text">
-              <string>Goto Line Command</string>
+           <item row="2" column="0" colspan="2">
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
              </property>
-            </widget>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>15</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="7" column="0" colspan="2">
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
            </item>
           </layout>
          </widget>
diff --git a/include/core/event.h b/include/core/event.h
index 48d13253..b6e0d175 100644
--- a/include/core/event.h
+++ b/include/core/event.h
@@ -31,10 +31,10 @@ public:
     Event(const Event&);
     Event(QJsonObject, QString);
 public:
-    int x() {
+    int x() const {
         return getInt("x");
     }
-    int y() {
+    int y() const {
         return getInt("y");
     }
     int elevation() {
@@ -46,16 +46,16 @@ public:
     void setY(int y) {
         put("y", y);
     }
-    QString get(QString key) {
+    QString get(const QString &key) const {
         return values.value(key);
     }
-    int getInt(QString key) {
+    int getInt(const QString &key) const {
         return values.value(key).toInt(nullptr, 0);
     }
-    uint16_t getU16(QString key) {
+    uint16_t getU16(const QString &key) const {
         return values.value(key).toUShort(nullptr, 0);
     }
-    int16_t getS16(QString key) {
+    int16_t getS16(const QString &key) const {
         return values.value(key).toShort(nullptr, 0);
     }
     void put(QString key, int value) {
diff --git a/include/core/map.h b/include/core/map.h
index 4d34a071..a2a51551 100644
--- a/include/core/map.h
+++ b/include/core/map.h
@@ -83,7 +83,8 @@ public:
     void floodFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
     void _floodFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
     void magicFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
-    QList<Event*> getAllEvents();
+    QList<Event*> getAllEvents() const;
+    QStringList eventScriptLabels(const QString &event_group_type = QString()) const;
     void removeEvent(Event*);
     void addEvent(Event*);
     QPixmap renderConnection(MapConnection, MapLayout *);
diff --git a/src/core/map.cpp b/src/core/map.cpp
index 02cd15f8..14da4650 100644
--- a/src/core/map.cpp
+++ b/src/core/map.cpp
@@ -450,12 +450,32 @@ void Map::magicFillCollisionElevation(int initialX, int initialY, uint16_t colli
     }
 }
 
-QList<Event *> Map::getAllEvents() {
-    QList<Event*> all;
-    for (QList<Event*> list : events.values()) {
-        all += list;
+QList<Event *> Map::getAllEvents() const {
+    QList<Event *> all_events;
+    for (const auto &event_list : events) {
+        all_events << event_list;
     }
-    return all;
+    return all_events;
+}
+
+QStringList Map::eventScriptLabels(const QString &event_group_type) const {
+    QStringList scriptLabels;
+    if (event_group_type.isEmpty()) {
+        for (const auto *event : getAllEvents())
+            scriptLabels << event->get("script_label");
+    } else {
+        for (const auto *event : events.value(event_group_type))
+            scriptLabels << event->get("script_label");
+    }
+
+    scriptLabels.removeDuplicates();
+    scriptLabels.removeAll(QString());
+    if (scriptLabels.contains("0x0"))
+        scriptLabels.move(scriptLabels.indexOf("0x0"), scriptLabels.count() - 1);
+    if (scriptLabels.contains("NULL"))
+        scriptLabels.move(scriptLabels.indexOf("NULL"), scriptLabels.count() - 1);
+
+    return scriptLabels;
 }
 
 void Map::removeEvent(Event *event) {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 60d6018b..fe104371 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1789,6 +1789,7 @@ void MainWindow::updateSelectedObjects() {
                                   "normal movement behavior actions.");
                 combo->setMinimumContentsLength(4);
             } else if (key == "script_label") {
+                combo->addItems(editor->map->eventScriptLabels());
                 combo->setToolTip("The script which is executed with this event.");
             } else if (key == "trainer_type") {
                 combo->addItems(*editor->project->trainerTypes);

From 9da465fe5310b0c375106c787de8c41f2d4e1fd6 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Tue, 1 Dec 2020 17:51:42 -0500
Subject: [PATCH 11/16] Update docs and CHANGELOG

---
 CHANGELOG.md                           | 1 +
 docsrc/manual/editing-map-events.rst   | 2 +-
 docsrc/manual/settings-and-options.rst | 2 ++
 docsrc/manual/shortcuts.rst            | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed0fc4de..c78b0d8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 - The window sizes and positions of the tileset editor, palette editor, and region map editor are now stored in `porymap.cfg`.
 - Add ruler tool for measuring metatile distance in events tab (Right-click to turn on/off, left-click to lock in place).
 - Add delete button to wild pokemon encounters tab.
+- Add ability to specify preferred text editor commands in `Options -> Edit Preferences`. These allow `Open Map Scripts` to open directly to the script for the currently selected event, and to open the project root directory in a text editor directly from porymap.
 
 ### Changed
 - Holding `shift` now toggles "Smart Path" drawing; when the "Smart Paths" checkbox is checked, holding `shift` will temporarily disable it.
diff --git a/docsrc/manual/editing-map-events.rst b/docsrc/manual/editing-map-events.rst
index 7837d48d..e950e4e3 100644
--- a/docsrc/manual/editing-map-events.rst
+++ b/docsrc/manual/editing-map-events.rst
@@ -225,7 +225,7 @@ Respawn NPC
 Open Map Scripts
 ----------------
 
-Clicking the ``Open Map Scripts`` button |open-map-scripts-button| will open the map's scripts file in your default text editor.  If nothing happens when this button is clicked, you may need to associate a text editor with the `.inc` file extension.
+Clicking the ``Open Map Scripts`` button |open-map-scripts-button| will open the map's scripts file in your default text editor.  If nothing happens when this button is clicked, you may need to associate a text editor with the `.inc` file extension (or `.pory` if you're using Porycript).  `Alternatively`, you may specify a preferred text editor command in *Options -> Edit Preferences*. By specifying a text editor like this you can allow Porymap to open the scripts file directly to the script of the currently selected event.
 
 .. |open-map-scripts-button|
    image:: images/editing-map-events/open-map-scripts-button.png
diff --git a/docsrc/manual/settings-and-options.rst b/docsrc/manual/settings-and-options.rst
index 9b055226..84c01e20 100644
--- a/docsrc/manual/settings-and-options.rst
+++ b/docsrc/manual/settings-and-options.rst
@@ -31,6 +31,8 @@ determined by this file.
    ``monitor_files``, 1, global, yes, Whether porymap will monitor changes to project files
    ``region_map_dimensions``, 32x20, global, yes, The dimensions of the region map tilemap
    ``theme``, default, global, yes, The color theme for porymap windows and widgets
+   ``text_editor_goto_line``, , global, yes, Optional command that will be executed when clicking ``Open Map Scripts``.
+   ``text_editor_open_directory``, , global, yes, The command that will be executed when clicking ``Open Project in Text Editor``.
    ``base_game_version``, , project, no, The base pret repo for this project
    ``use_encounter_json``, 1, project, yes, Enables wild encounter table editing
    ``use_poryscript``, 0, project, yes, Whether to open .pory files for scripts
diff --git a/docsrc/manual/shortcuts.rst b/docsrc/manual/shortcuts.rst
index 0acd894d..2cea79a2 100644
--- a/docsrc/manual/shortcuts.rst
+++ b/docsrc/manual/shortcuts.rst
@@ -33,6 +33,7 @@ Main Window
    Open New Tileset Dialog, ``Ctrl+Shift+N``
    Open Tileset Editor, ``Ctrl+T``
    Open Region Map Editor, ``Ctrl+M``
+   Edit Preferences, ``Ctrl+,``
 
 .. csv-table::
    :header: Map Editing

From afc0c0c501f1e4450df14c3ac390eab2dc6bcf09 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Wed, 2 Dec 2020 03:39:08 -0500
Subject: [PATCH 12/16] Add button next to script combo-box to open file to
 that script. Revert the behavior of Open Map Scripts button.

---
 CHANGELOG.md                                  |   2 +-
 docsrc/manual/editing-map-events.rst          |   8 +++++++-
 .../go-to-script-button.png                   | Bin 0 -> 4908 bytes
 docsrc/manual/settings-and-options.rst        |   2 +-
 include/editor.h                              |   3 ++-
 src/core/parseutil.cpp                        |   3 +++
 src/editor.cpp                                |   4 +---
 src/mainwindow.cpp                            |  19 ++++++++++++++++--
 8 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 docsrc/manual/images/editing-map-events/go-to-script-button.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c78b0d8c..e9b49704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 - The window sizes and positions of the tileset editor, palette editor, and region map editor are now stored in `porymap.cfg`.
 - Add ruler tool for measuring metatile distance in events tab (Right-click to turn on/off, left-click to lock in place).
 - Add delete button to wild pokemon encounters tab.
-- Add ability to specify preferred text editor commands in `Options -> Edit Preferences`. These allow `Open Map Scripts` to open directly to the script for the currently selected event, and to open the project root directory in a text editor directly from porymap.
+- Add custom text editor commands in `Options -> Edit Preferences`, a tool-button next to the `Script` combo-box, and `Tools -> Open Project in Text Editor`. The tool-button will open the map's scripts file to the cooresponding script.
 
 ### Changed
 - Holding `shift` now toggles "Smart Path" drawing; when the "Smart Paths" checkbox is checked, holding `shift` will temporarily disable it.
diff --git a/docsrc/manual/editing-map-events.rst b/docsrc/manual/editing-map-events.rst
index e950e4e3..cc2f017a 100644
--- a/docsrc/manual/editing-map-events.rst
+++ b/docsrc/manual/editing-map-events.rst
@@ -225,11 +225,17 @@ Respawn NPC
 Open Map Scripts
 ----------------
 
-Clicking the ``Open Map Scripts`` button |open-map-scripts-button| will open the map's scripts file in your default text editor.  If nothing happens when this button is clicked, you may need to associate a text editor with the `.inc` file extension (or `.pory` if you're using Porycript).  `Alternatively`, you may specify a preferred text editor command in *Options -> Edit Preferences*. By specifying a text editor like this you can allow Porymap to open the scripts file directly to the script of the currently selected event.
+Clicking the ``Open Map Scripts`` button |open-map-scripts-button| will open the map's scripts file in your default text editor.  If nothing happens when this button is clicked, you may need to associate a text editor with the `.inc` file extension (or `.pory` if you're using Porycript).
+
+Additionally, if you specify a ``Goto Line Command`` in *Options -> Edit Preferences* then a tool-button will appear next to the `Script` combo-box for selected events. Clicking this button will open the map's scripts file directly to the cooresponding script (if the script can be found in that file).
+|go-to-script-button|
 
 .. |open-map-scripts-button|
    image:: images/editing-map-events/open-map-scripts-button.png
 
+.. |go-to-script-button|
+    image:: images/editing-map-events/go-to-script-button.png
+
 Tool Buttons
 ------------
 
diff --git a/docsrc/manual/images/editing-map-events/go-to-script-button.png b/docsrc/manual/images/editing-map-events/go-to-script-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..859ed2f30da6e234ce8af5e232d795f87f5fc6cf
GIT binary patch
literal 4908
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

literal 0
HcmV?d00001

diff --git a/docsrc/manual/settings-and-options.rst b/docsrc/manual/settings-and-options.rst
index 84c01e20..2e0ce77f 100644
--- a/docsrc/manual/settings-and-options.rst
+++ b/docsrc/manual/settings-and-options.rst
@@ -31,7 +31,7 @@ determined by this file.
    ``monitor_files``, 1, global, yes, Whether porymap will monitor changes to project files
    ``region_map_dimensions``, 32x20, global, yes, The dimensions of the region map tilemap
    ``theme``, default, global, yes, The color theme for porymap windows and widgets
-   ``text_editor_goto_line``, , global, yes, Optional command that will be executed when clicking ``Open Map Scripts``.
+   ``text_editor_goto_line``, , global, yes, The command that will be executed when clicking the tool-button next the ``Script`` combo-box.
    ``text_editor_open_directory``, , global, yes, The command that will be executed when clicking ``Open Project in Text Editor``.
    ``base_game_version``, , project, no, The base pret repo for this project
    ``use_encounter_json``, 1, project, yes, Enables wild encounter table editing
diff --git a/include/editor.h b/include/editor.h
index a8646eb8..21b413b1 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -155,7 +155,8 @@ public:
     void scaleMapView(int);
 
 public slots:
-    void openMapScripts() const;
+    void openMapScripts(const QString &scriptLabel) const;
+    void openMapScripts() const { openMapScripts(QString()); }
     void openProjectInTextEditor() const;
     void maskNonVisibleConnectionTiles();
 
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index a402e188..9b3ac1ff 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -422,6 +422,9 @@ bool ParseUtil::ensureFieldsExist(QJsonObject obj, QList<QString> fields) {
 }
 
 int ParseUtil::getScriptLineNumber(const QString &filePath, const QString &scriptLabel) {
+    if (scriptLabel.isEmpty())
+        return 0;
+
     if (filePath.endsWith(".inc"))
         return getRawScriptLineNumber(readTextFile(filePath), scriptLabel);
     else if (filePath.endsWith(".pory"))
diff --git a/src/editor.cpp b/src/editor.cpp
index a83f03d0..ed0fd424 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -2026,7 +2026,7 @@ void Editor::deleteEvent(Event *event) {
     //updateSelectedObjects();
 }
 
-void Editor::openMapScripts() const {
+void Editor::openMapScripts(const QString &scriptLabel) const {
     const QString scriptsPath = project->getMapScriptsFilePath(map->name);
     QString command = porymapConfig.getTextEditorGotoLine();
     if (command.isEmpty()) {
@@ -2035,8 +2035,6 @@ void Editor::openMapScripts() const {
     } else {
         if (command.contains("%F")) {
             if (command.contains("%L")) {
-                const QString scriptLabel = selected_events->isEmpty() ?
-                                            QString() : selected_events->first()->event->get("script_label");
                 const int lineNum = ParseUtil::getScriptLineNumber(scriptsPath, scriptLabel);
                 command.replace("%L", QString::number(lineNum));
             }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c0713226..ebb232e6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -169,7 +169,7 @@ void MainWindow::initEditor() {
     connect(this->editor, SIGNAL(currentMetatilesSelectionChanged()), this, SLOT(currentMetatilesSelectionChanged()));
     connect(this->editor, SIGNAL(wildMonDataChanged()), this, SLOT(onWildMonDataChanged()));
     connect(this->editor, &Editor::mapRulerStatusChanged, this, &MainWindow::onMapRulerStatusChanged);
-    connect(ui->toolButton_Open_Scripts, &QToolButton::clicked, this->editor, &Editor::openMapScripts);
+    connect(ui->toolButton_Open_Scripts, &QToolButton::pressed, this->editor, QOverload<>::of(&Editor::openMapScripts));
     connect(ui->actionOpen_Project_in_Text_Editor, &QAction::triggered, this->editor, &Editor::openProjectInTextEditor);
 
     this->loadUserSettings();
@@ -1866,7 +1866,22 @@ void MainWindow::updateSelectedObjects() {
             } else {
                 combo->setCurrentText(value);
 
-                fl->addRow(new QLabel(field_labels[key], widget), combo);
+                if (key == "script_label" && !porymapConfig.getTextEditorGotoLine().isEmpty()) {
+                    // Add tool button next to combo to open scripts file to combo's current script label.
+                    auto *hl = new QHBoxLayout();
+                    hl->setSpacing(3);
+                    auto *openScriptButton = new QToolButton(widget);
+                    openScriptButton->setFixedSize(combo->height(), combo->height());
+                    openScriptButton->setIcon(QFileIconProvider().icon(QFileIconProvider::File));
+                    openScriptButton->setToolTip("Go to this script definition in the map's scripts file.");
+                    connect(openScriptButton, &QToolButton::clicked,
+                            [this, combo]() { this->editor->openMapScripts(combo->currentText()); });
+                    hl->addWidget(combo);
+                    hl->addWidget(openScriptButton);
+                    fl->addRow(new QLabel(field_labels[key], widget), hl);
+                } else {
+                    fl->addRow(new QLabel(field_labels[key], widget), combo);
+                }
                 widget->setLayout(fl);
                 frame->layout()->addWidget(widget);
 

From 7a4de9f3d922c298350c4a130e2682238d334e76 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Fri, 4 Dec 2020 09:29:38 -0500
Subject: [PATCH 13/16] Add support for finding and opening any event script

---
 CHANGELOG.md                           |  2 +-
 docsrc/manual/editing-map-events.rst   |  2 +-
 docsrc/manual/settings-and-options.rst |  2 +-
 forms/preferenceeditor.ui              |  4 +--
 include/editor.h                       |  5 ++--
 include/mainwindow.h                   |  1 +
 include/project.h                      |  1 +
 src/core/parseutil.cpp                 |  2 +-
 src/editor.cpp                         | 36 ++++++++++++++++++++------
 src/mainwindow.cpp                     | 24 ++++++++++++++---
 src/project.cpp                        | 27 +++++++++++++++++++
 11 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9b49704..aa367a92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 - The window sizes and positions of the tileset editor, palette editor, and region map editor are now stored in `porymap.cfg`.
 - Add ruler tool for measuring metatile distance in events tab (Right-click to turn on/off, left-click to lock in place).
 - Add delete button to wild pokemon encounters tab.
-- Add custom text editor commands in `Options -> Edit Preferences`, a tool-button next to the `Script` combo-box, and `Tools -> Open Project in Text Editor`. The tool-button will open the map's scripts file to the cooresponding script.
+- Add custom text editor commands in `Options -> Edit Preferences`, a tool-button next to the `Script` combo-box, and `Tools -> Open Project in Text Editor`. The tool-button will open the containing file to the cooresponding script.
 
 ### Changed
 - Holding `shift` now toggles "Smart Path" drawing; when the "Smart Paths" checkbox is checked, holding `shift` will temporarily disable it.
diff --git a/docsrc/manual/editing-map-events.rst b/docsrc/manual/editing-map-events.rst
index cc2f017a..ca0b4e41 100644
--- a/docsrc/manual/editing-map-events.rst
+++ b/docsrc/manual/editing-map-events.rst
@@ -227,7 +227,7 @@ Open Map Scripts
 
 Clicking the ``Open Map Scripts`` button |open-map-scripts-button| will open the map's scripts file in your default text editor.  If nothing happens when this button is clicked, you may need to associate a text editor with the `.inc` file extension (or `.pory` if you're using Porycript).
 
-Additionally, if you specify a ``Goto Line Command`` in *Options -> Edit Preferences* then a tool-button will appear next to the `Script` combo-box for selected events. Clicking this button will open the map's scripts file directly to the cooresponding script (if the script can be found in that file).
+Additionally, if you specify a ``Goto Line Command`` in *Options -> Edit Preferences* then a tool-button will appear next to the `Script` combo-box in the *Events* tab. Clicking this button will open the file that contains the script directly to the line number of that script. If the script cannot be found in the project then the current map's scripts file is opened.
 |go-to-script-button|
 
 .. |open-map-scripts-button|
diff --git a/docsrc/manual/settings-and-options.rst b/docsrc/manual/settings-and-options.rst
index 2e0ce77f..5a4968e3 100644
--- a/docsrc/manual/settings-and-options.rst
+++ b/docsrc/manual/settings-and-options.rst
@@ -31,7 +31,7 @@ determined by this file.
    ``monitor_files``, 1, global, yes, Whether porymap will monitor changes to project files
    ``region_map_dimensions``, 32x20, global, yes, The dimensions of the region map tilemap
    ``theme``, default, global, yes, The color theme for porymap windows and widgets
-   ``text_editor_goto_line``, , global, yes, The command that will be executed when clicking the tool-button next the ``Script`` combo-box.
+   ``text_editor_goto_line``, , global, yes, The command that will be executed when clicking the button next the ``Script`` combo-box.
    ``text_editor_open_directory``, , global, yes, The command that will be executed when clicking ``Open Project in Text Editor``.
    ``base_game_version``, , project, no, The base pret repo for this project
    ``use_encounter_json``, 1, project, yes, Enables wild encounter table editing
diff --git a/forms/preferenceeditor.ui b/forms/preferenceeditor.ui
index b082ec1d..2d9f25b0 100644
--- a/forms/preferenceeditor.ui
+++ b/forms/preferenceeditor.ui
@@ -76,7 +76,7 @@
            <item row="6" column="0" colspan="2">
             <widget class="QLabel" name="label_TextEditorGotoLineHelp">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the command that will be executed when clicking the &lt;span style=&quot; font-weight:600;&quot;&gt;Open Map Scripts&lt;/span&gt; button&lt;span style=&quot; font-weight:600;&quot;&gt;. %F&lt;/span&gt; will be substituted with the scripts file path and &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; will be substituted with the line number of the script for the currently selected event. &lt;span style=&quot; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;must&lt;/span&gt; be specified if &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; is specified. If &lt;span style=&quot; font-weight:600;&quot;&gt;%F&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the scripts file path will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;When this command is set a button will appear next to the &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Script&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; combo-box in the &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Events&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; tab which executes this command.&lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt; %F&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; will be substituted with the file path of the script and &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%L&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; will be substituted with the line number of the script in that file. &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;must&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; be given if &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%L&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; is given. If &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%F&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; is &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; given then the script's file path will be added to the end of the command. If the script can't be found then the current map's scripts file is opened.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -109,7 +109,7 @@
            <item row="1" column="0" colspan="2">
             <widget class="QLabel" name="label_TextEditorOpenFolderHelp">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the command that will be executed when clicking &lt;span style=&quot; font-weight:600;&quot;&gt;Open Project in Text Editor&lt;/span&gt; in the &lt;span style=&quot; font-weight:600;&quot;&gt;Tools&lt;/span&gt; menu. &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; will be substituted with the current project's root directory. If &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the project directory will be appended to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;This is the command that is executed when clicking &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Open Project in Text Editor&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; in the &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Tools&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; menu. &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%D&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; will be substituted with the project's root directory. If &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%D&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; is &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; specified then the project directory will be added to the end of the command.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/include/editor.h b/include/editor.h
index 21b413b1..90361ca3 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -155,8 +155,8 @@ public:
     void scaleMapView(int);
 
 public slots:
-    void openMapScripts(const QString &scriptLabel) const;
-    void openMapScripts() const { openMapScripts(QString()); }
+    void openMapScripts() const;
+    void openScript(const QString &scriptLabel) const;
     void openProjectInTextEditor() const;
     void maskNonVisibleConnectionTiles();
 
@@ -187,6 +187,7 @@ private:
     QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
     QString getMetatileDisplayMessage(uint16_t metatileId);
     bool eventLimitReached(Map *, QString);
+    void openInTextEditor(const QString &path, int lineNum = 0) const;
     bool startDetachedProcess(const QString &command,
                               const QString &workingDirectory = QString(),
                               qint64 *pid = nullptr) const;
diff --git a/include/mainwindow.h b/include/mainwindow.h
index 2e81721d..653bd2bc 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -263,6 +263,7 @@ private:
     DraggablePixmapItem *selectedHealspot;
 
     QList<QAction *> registeredActions;
+    QVector<QToolButton *> openScriptButtons;
 
     bool isProgrammaticEventTabChange;
     bool projectHasUnsavedChanges;
diff --git a/include/project.h b/include/project.h
index 2dcaa345..afc82030 100644
--- a/include/project.h
+++ b/include/project.h
@@ -175,6 +175,7 @@ public:
     QString getScriptFileExtension(bool usePoryScript) const;
     QString getScriptDefaultString(bool usePoryScript, QString mapName) const;
     QString getMapScriptsFilePath(const QString &mapName) const;
+    QStringList getEventScriptsFilePaths() const;
 
     bool loadMapBorder(Map *map);
 
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 9b3ac1ff..3b72a9b6 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -425,7 +425,7 @@ int ParseUtil::getScriptLineNumber(const QString &filePath, const QString &scrip
     if (scriptLabel.isEmpty())
         return 0;
 
-    if (filePath.endsWith(".inc"))
+    if (filePath.endsWith(".inc") || filePath.endsWith(".s"))
         return getRawScriptLineNumber(readTextFile(filePath), scriptLabel);
     else if (filePath.endsWith(".pory"))
         return getPoryScriptLineNumber(readTextFile(filePath), scriptLabel);
diff --git a/src/editor.cpp b/src/editor.cpp
index ed0fd424..7a460222 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -2026,21 +2026,40 @@ void Editor::deleteEvent(Event *event) {
     //updateSelectedObjects();
 }
 
-void Editor::openMapScripts(const QString &scriptLabel) const {
-    const QString scriptsPath = project->getMapScriptsFilePath(map->name);
+void Editor::openMapScripts() const {
+    const QString scriptPath = project->getMapScriptsFilePath(map->name);
+    openInTextEditor(scriptPath);
+}
+
+void Editor::openScript(const QString &scriptLabel) const {
+    // Find the location of scriptLabel.
+    QStringList scriptPaths(project->getMapScriptsFilePath(map->name));
+    scriptPaths << project->getEventScriptsFilePaths();
+    int lineNum = 0;
+    QString scriptPath = scriptPaths.first();
+    for (const auto &path : scriptPaths) {
+        lineNum = ParseUtil::getScriptLineNumber(path, scriptLabel);
+        if (lineNum != 0) {
+            scriptPath = path;
+            break;
+        }
+    }
+
+    openInTextEditor(scriptPath, lineNum);
+}
+
+void Editor::openInTextEditor(const QString &path, int lineNum) const {
     QString command = porymapConfig.getTextEditorGotoLine();
     if (command.isEmpty()) {
         // Open map scripts in the system's default editor.
-        QDesktopServices::openUrl(QUrl::fromLocalFile(scriptsPath));
+        QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     } else {
         if (command.contains("%F")) {
-            if (command.contains("%L")) {
-                const int lineNum = ParseUtil::getScriptLineNumber(scriptsPath, scriptLabel);
+            if (command.contains("%L"))
                 command.replace("%L", QString::number(lineNum));
-            }
-            command.replace("%F", scriptsPath);
+            command.replace("%F", path);
         } else {
-            command += ' ' + scriptsPath;
+            command += ' ' + path;
         }
         startDetachedProcess(command);
     }
@@ -2056,6 +2075,7 @@ void Editor::openProjectInTextEditor() const {
 }
 
 bool Editor::startDetachedProcess(const QString &command, const QString &workingDirectory, qint64 *pid) const {
+    logInfo("Executing command: " + command);
 #ifdef Q_OS_WIN
     // On Windows, a QProcess command must be wrapped in a cmd.exe command.
     const QString program = QProcessEnvironment::systemEnvironment().value("COMSPEC");
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ebb232e6..5573a223 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1544,6 +1544,10 @@ void MainWindow::updateSelectedObjects() {
         }
     }
 
+    for (auto *button : openScriptButtons)
+        delete button;
+    openScriptButtons.clear();
+
     QMap<QString, int> event_obj_gfx_constants = editor->project->getEventObjGfxConstants();
 
     QList<EventPropertiesFrame *> frames;
@@ -1866,22 +1870,26 @@ void MainWindow::updateSelectedObjects() {
             } else {
                 combo->setCurrentText(value);
 
-                if (key == "script_label" && !porymapConfig.getTextEditorGotoLine().isEmpty()) {
-                    // Add tool button next to combo to open scripts file to combo's current script label.
+                if (key == "script_label") {
+                    // Add button next to combo which opens combo's current script.
                     auto *hl = new QHBoxLayout();
                     hl->setSpacing(3);
                     auto *openScriptButton = new QToolButton(widget);
+                    openScriptButtons << openScriptButton;
                     openScriptButton->setFixedSize(combo->height(), combo->height());
                     openScriptButton->setIcon(QFileIconProvider().icon(QFileIconProvider::File));
-                    openScriptButton->setToolTip("Go to this script definition in the map's scripts file.");
+                    openScriptButton->setToolTip("Go to this script definition in text editor.");
                     connect(openScriptButton, &QToolButton::clicked,
-                            [this, combo]() { this->editor->openMapScripts(combo->currentText()); });
+                            [this, combo]() { this->editor->openScript(combo->currentText()); });
                     hl->addWidget(combo);
                     hl->addWidget(openScriptButton);
                     fl->addRow(new QLabel(field_labels[key], widget), hl);
+                    if (porymapConfig.getTextEditorGotoLine().isEmpty())
+                        openScriptButton->hide();
                 } else {
                     fl->addRow(new QLabel(field_labels[key], widget), combo);
                 }
+
                 widget->setLayout(fl);
                 frame->layout()->addWidget(widget);
 
@@ -2587,6 +2595,14 @@ void MainWindow::on_actionEdit_Preferences_triggered() {
 }
 
 void MainWindow::togglePreferenceSpecificUi() {
+    if (porymapConfig.getTextEditorGotoLine().isEmpty()) {
+        for (auto *button : openScriptButtons)
+            button->hide();
+    } else {
+        for (auto *button : openScriptButtons)
+            button->show();
+    }
+
     if (porymapConfig.getTextEditorOpenFolder().isEmpty())
         ui->actionOpen_Project_in_Text_Editor->setEnabled(false);
     else
diff --git a/src/project.cpp b/src/project.cpp
index 6cbd7c92..2b2388cd 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -2435,6 +2435,33 @@ QString Project::getMapScriptsFilePath(const QString &mapName) const {
     return path;
 }
 
+QStringList Project::getEventScriptsFilePaths() const {
+    QStringList filePaths(QDir::cleanPath(root + "/data/event_scripts.s"));
+    const QString scriptsDir = QDir::cleanPath(root + "/data/scripts");
+    const QString mapsDir = QDir::cleanPath(root + "/data/maps");
+    const bool usePoryscript = projectConfig.getUsePoryScript();
+
+    if (usePoryscript) {
+        QDirIterator it_pory_shared(scriptsDir, {"*.pory"}, QDir::Files);
+        while (it_pory_shared.hasNext())
+            filePaths << it_pory_shared.next();
+
+        QDirIterator it_pory_maps(mapsDir, {"scripts.pory"}, QDir::Files, QDirIterator::Subdirectories);
+        while (it_pory_maps.hasNext())
+            filePaths << it_pory_maps.next();
+    }
+
+    QDirIterator it_inc_shared(scriptsDir, {"*.inc"}, QDir::Files);
+    while (it_inc_shared.hasNext())
+        filePaths << it_inc_shared.next();
+
+    QDirIterator it_inc_maps(mapsDir, {"scripts.inc"}, QDir::Files, QDirIterator::Subdirectories);
+    while (it_inc_maps.hasNext())
+        filePaths << it_inc_maps.next();
+
+    return filePaths;
+}
+
 void Project::loadEventPixmaps(QList<Event*> objects) {
     bool needs_update = false;
     for (Event *object : objects) {

From 520bd7e6c8d62af93ad9f17f5dbfdda8fb763b4d Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Sun, 13 Dec 2020 00:06:50 -0500
Subject: [PATCH 14/16] Fix external processes on Windows

---
 src/editor.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/editor.cpp b/src/editor.cpp
index 7a460222..66c73944 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -2075,16 +2075,21 @@ void Editor::openProjectInTextEditor() const {
 }
 
 bool Editor::startDetachedProcess(const QString &command, const QString &workingDirectory, qint64 *pid) const {
+    static QProcess process;
     logInfo("Executing command: " + command);
 #ifdef Q_OS_WIN
     // On Windows, a QProcess command must be wrapped in a cmd.exe command.
-    const QString program = QProcessEnvironment::systemEnvironment().value("COMSPEC");
-    QStringList arguments({ QString("/c"), command });
+    process.setProcessEnvironment(QProcessEnvironment::systemEnvironment());
+    process.setProgram(process.processEnvironment().value("COMSPEC"));
+    process.setNativeArguments("/c " + command);
+    process.setWorkingDirectory(workingDirectory);
 #else
     QStringList arguments = QProcess::splitCommand(command);
-    const QString program = arguments.takeFirst();
+    process.setProgram(arguments.takeFirst());
+    process.setArguments(arguments);
+    process.setWorkingDirectory(workingDirectory);
 #endif
-    return QProcess::startDetached(program, arguments, workingDirectory, pid);
+    return process.startDetached(pid);
 }
 
 // It doesn't seem to be possible to prevent the mousePress event

From 8be6dc2f74179cb6ec91f43cc1f8366542522aee Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Sun, 13 Dec 2020 00:24:03 -0500
Subject: [PATCH 15/16] Adjust the appearance of PreferenceEditor (Help text
 appeared too large on Windows)

---
 forms/preferenceeditor.ui | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/forms/preferenceeditor.ui b/forms/preferenceeditor.ui
index 2d9f25b0..c44fa98c 100644
--- a/forms/preferenceeditor.ui
+++ b/forms/preferenceeditor.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>500</height>
+    <width>600</width>
+    <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -65,8 +65,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>482</width>
-            <height>392</height>
+            <width>582</width>
+            <height>372</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
@@ -76,7 +76,7 @@
            <item row="6" column="0" colspan="2">
             <widget class="QLabel" name="label_TextEditorGotoLineHelp">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;When this command is set a button will appear next to the &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Script&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; combo-box in the &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Events&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; tab which executes this command.&lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt; %F&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; will be substituted with the file path of the script and &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%L&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; will be substituted with the line number of the script in that file. &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;must&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; be given if &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%L&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; is given. If &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%F&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; is &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; given then the script's file path will be added to the end of the command. If the script can't be found then the current map's scripts file is opened.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this command is set a button will appear next to the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Script&lt;/span&gt; combo-box in the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Events&lt;/span&gt; tab which executes this command.&lt;span style=&quot; font-weight:600;&quot;&gt; %F&lt;/span&gt; will be substituted with the file path of the script and &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; will be substituted with the line number of the script in that file. &lt;span style=&quot; font-weight:600;&quot;&gt;%F &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;must&lt;/span&gt; be given if &lt;span style=&quot; font-weight:600;&quot;&gt;%L&lt;/span&gt; is given. If &lt;span style=&quot; font-weight:600;&quot;&gt;%F&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; given then the script's file path will be added to the end of the command. If the script can't be found then the current map's scripts file is opened.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -109,7 +109,7 @@
            <item row="1" column="0" colspan="2">
             <widget class="QLabel" name="label_TextEditorOpenFolderHelp">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;This is the command that is executed when clicking &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Open Project in Text Editor&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; in the &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600; font-style:italic;&quot;&gt;Tools&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; menu. &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%D&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; will be substituted with the project's root directory. If &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;%D&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; is &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; specified then the project directory will be added to the end of the command.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the command that is executed when clicking &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Open Project in Text Editor&lt;/span&gt; in the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Tools&lt;/span&gt; menu. &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; will be substituted with the project's root directory. If &lt;span style=&quot; font-weight:600;&quot;&gt;%D&lt;/span&gt; is &lt;span style=&quot; font-style:italic;&quot;&gt;not&lt;/span&gt; specified then the project directory will be added to the end of the command.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

From 3a04f59cb0824253dba047b02592f6cc311f9d4a Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Sun, 13 Dec 2020 04:00:00 -0500
Subject: [PATCH 16/16] Fix QProcess::splitCommand() dependency on Qt 5.15. Fix
 shortcut for Open Map Scripts (Due to merge).

---
 include/core/parseutil.h |  2 ++
 porymap.pro              |  2 +-
 src/core/parseutil.cpp   | 48 ++++++++++++++++++++++++++++++++++++++++
 src/editor.cpp           |  2 +-
 src/mainwindow.cpp       |  8 +++----
 5 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/include/core/parseutil.h b/include/core/parseutil.h
index b65dbf76..bd614686 100644
--- a/include/core/parseutil.h
+++ b/include/core/parseutil.h
@@ -63,6 +63,8 @@ public:
     static QString &removeLineComments(QString &text, const QString &commentSymbol);
     static QString &removeLineComments(QString &text, const QStringList &commentSymbols);
 
+    static QStringList splitShellCommand(QStringView command);
+
 private:
     QString root;
     QString text;
diff --git a/porymap.pro b/porymap.pro
index 56331b25..a741f69a 100644
--- a/porymap.pro
+++ b/porymap.pro
@@ -165,7 +165,7 @@ FORMS    += forms/mainwindow.ui \
     forms/aboutporymap.ui \
     forms/newtilesetdialog.ui \
     forms/mapimageexporter.ui \
-    forms/shortcutseditor.ui
+    forms/shortcutseditor.ui \
     forms/preferenceeditor.ui
 
 RESOURCES += \
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 3b72a9b6..84f924f2 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -487,3 +487,51 @@ QString &ParseUtil::removeLineComments(QString &text, const QStringList &comment
         removeLineComments(text, commentSymbol);
     return text;
 }
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+#include <QProcess>
+
+QStringList ParseUtil::splitShellCommand(QStringView command) {
+    return QProcess::splitCommand(command);
+}
+#else
+// The source for QProcess::splitCommand() as of Qt 5.15.2
+QStringList ParseUtil::splitShellCommand(QStringView command) {
+    QStringList args;
+    QString tmp;
+    int quoteCount = 0;
+    bool inQuote = false;
+
+    // handle quoting. tokens can be surrounded by double quotes
+    // "hello world". three consecutive double quotes represent
+    // the quote character itself.
+    for (int i = 0; i < command.size(); ++i) {
+        if (command.at(i) == QLatin1Char('"')) {
+            ++quoteCount;
+            if (quoteCount == 3) {
+                // third consecutive quote
+                quoteCount = 0;
+                tmp += command.at(i);
+            }
+            continue;
+        }
+        if (quoteCount) {
+            if (quoteCount == 1)
+                inQuote = !inQuote;
+            quoteCount = 0;
+        }
+        if (!inQuote && command.at(i).isSpace()) {
+            if (!tmp.isEmpty()) {
+                args += tmp;
+                tmp.clear();
+            }
+        } else {
+            tmp += command.at(i);
+        }
+    }
+    if (!tmp.isEmpty())
+        args += tmp;
+
+    return args;
+}
+#endif
diff --git a/src/editor.cpp b/src/editor.cpp
index 66c73944..98d3ba19 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -2084,7 +2084,7 @@ bool Editor::startDetachedProcess(const QString &command, const QString &working
     process.setNativeArguments("/c " + command);
     process.setWorkingDirectory(workingDirectory);
 #else
-    QStringList arguments = QProcess::splitCommand(command);
+    QStringList arguments = ParseUtil::splitShellCommand(command);
     process.setProgram(arguments.takeFirst());
     process.setArguments(arguments);
     process.setWorkingDirectory(workingDirectory);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7882b4f3..4c3cb660 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -144,9 +144,9 @@ void MainWindow::initExtraShortcuts() {
     shortcutCollapse_All->setObjectName("shortcutCollapse_All");
     shortcutCollapse_All->setWhatsThis("Map List: Collapse all folders");
 
-    auto *shortcutNew_Event = new Shortcut(QKeySequence(), this, SLOT(on_toolButton_Open_Scripts_clicked()));
-    shortcutNew_Event->setObjectName("shortcut_Open_Scripts");
-    shortcutNew_Event->setWhatsThis("Open Map Scripts");
+    auto *shortcut_Open_Scripts = new Shortcut(QKeySequence(), ui->toolButton_Open_Scripts, SLOT(click()));
+    shortcut_Open_Scripts->setObjectName("shortcut_Open_Scripts");
+    shortcut_Open_Scripts->setWhatsThis("Open Map Scripts");
 }
 
 QObjectList MainWindow::shortcutableObjects() const {
@@ -231,7 +231,7 @@ void MainWindow::initEditor() {
     connect(this->editor, SIGNAL(currentMetatilesSelectionChanged()), this, SLOT(currentMetatilesSelectionChanged()));
     connect(this->editor, SIGNAL(wildMonDataChanged()), this, SLOT(onWildMonDataChanged()));
     connect(this->editor, &Editor::mapRulerStatusChanged, this, &MainWindow::onMapRulerStatusChanged);
-    connect(ui->toolButton_Open_Scripts, &QToolButton::pressed, this->editor, QOverload<>::of(&Editor::openMapScripts));
+    connect(ui->toolButton_Open_Scripts, &QToolButton::pressed, this->editor, &Editor::openMapScripts);
     connect(ui->actionOpen_Project_in_Text_Editor, &QAction::triggered, this->editor, &Editor::openProjectInTextEditor);
 
     this->loadUserSettings();