From 378d5bb660ee2e53c65e538ff0154bfd3ccfe69b Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Tue, 11 Sep 2018 20:41:58 -0400
Subject: [PATCH 1/3] Open Map Scripts button

---
 mainwindow.cpp | 34 ++++++++++++++++++++++++++++++++++
 mainwindow.h   |  3 +++
 mainwindow.ui  | 49 ++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b9979dc3..7b09396c 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -15,8 +15,11 @@
 #include <QSpacerItem>
 #include <QFont>
 #include <QScrollBar>
+#include <QPushButton>
 #include <QMessageBox>
 #include <QDialogButtonBox>
+#include <QProcess>
+#include <QSysInfo>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -549,6 +552,32 @@ void MainWindow::redo() {
     editor->redo();
 }
 
+// Open current map scripts in system default editor for .inc files
+void MainWindow::openInTextEditor() {
+    QProcess *process = new QProcess(this);
+    QSysInfo sysInfo;
+    process->setWorkingDirectory(editor->project->root);
+
+    #ifdef Q_OS_DARWIN
+        QString cmd = "open ";
+    #elif defined Q_OS_LINUX
+        QString cmd = "xdg-open ";
+    #elif defined Q_OS_WIN 
+        QString cmd = "cmd /c start \"";
+    #else
+        qDebug() << "Functionality is not available with this OS ("
+                 << sysInfo.productType() << ")";
+    #endif
+
+    cmd += "data/maps/" + editor->map->name + "/scripts.inc";
+
+    #ifdef Q_OS_WIN
+        cmd += "\"";
+    #endif
+
+    process->start(cmd);
+}
+
 void MainWindow::on_action_Save_triggered() {
     editor->save();
     updateMapList();
@@ -873,6 +902,11 @@ void MainWindow::on_toolButton_deleteObject_clicked()
     }
 }
 
+void MainWindow::on_toolButton_Open_Scripts_clicked()
+{
+    openInTextEditor();
+}
+
 void MainWindow::on_toolButton_Paint_clicked()
 {
     editor->map_edit_mode = "paint";
diff --git a/mainwindow.h b/mainwindow.h
index b8a12f8b..be782842 100755
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -37,6 +37,8 @@ private slots:
     void undo();
     void redo();
 
+    void openInTextEditor();
+
     void onLoadMapRequested(QString, QString);
     void onMapChanged(Map *map);
     void onMapNeedsRedrawing(Map *map);
@@ -59,6 +61,7 @@ private slots:
     void on_actionRedo_triggered();
 
     void on_toolButton_deleteObject_clicked();
+    void on_toolButton_Open_Scripts_clicked();
 
     void addNewEvent(QString);
     void updateSelectedObjects();
diff --git a/mainwindow.ui b/mainwindow.ui
index f3f19222..d24583d2 100755
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -334,8 +334,8 @@
                     <rect>
                      <x>0</x>
                      <y>0</y>
-                     <width>429</width>
-                     <height>620</height>
+                     <width>462</width>
+                     <height>599</height>
                     </rect>
                    </property>
                    <layout class="QGridLayout" name="gridLayout_8">
@@ -708,7 +708,7 @@
                         <rect>
                          <x>0</x>
                          <y>0</y>
-                         <width>315</width>
+                         <width>252</width>
                          <height>86</height>
                         </rect>
                        </property>
@@ -812,10 +812,10 @@
                     </property>
                     <property name="geometry">
                      <rect>
-                      <x>0</x>
+                      <x>8</x>
                       <y>0</y>
-                      <width>365</width>
-                      <height>405</height>
+                      <width>323</width>
+                      <height>368</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -1050,8 +1050,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>381</width>
-               <height>657</height>
+               <width>371</width>
+               <height>643</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_7">
@@ -1216,8 +1216,8 @@
                        <rect>
                         <x>0</x>
                         <y>0</y>
-                        <width>420</width>
-                        <height>584</height>
+                        <width>410</width>
+                        <height>560</height>
                        </rect>
                       </property>
                       <property name="sizePolicy">
@@ -1330,6 +1330,29 @@
                   </property>
                  </spacer>
                 </item>
+                <item>
+                 <widget class="QToolButton" name="toolButton_Open_Scripts">
+                  <property name="text">
+                   <string>Open Map Scripts</string>
+                  </property>
+                  <property name="autoRaise">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_20">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
                </layout>
               </widget>
              </item>
@@ -1849,8 +1872,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>826</width>
-                    <height>557</height>
+                    <width>818</width>
+                    <height>539</height>
                    </rect>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_14">
@@ -2022,7 +2045,7 @@
      <x>0</x>
      <y>0</y>
      <width>1117</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

From 65adc2bdd0e375e29ae3550aa3f9001ef4e2d050 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 12 Sep 2018 09:17:50 -0500
Subject: [PATCH 2/3] Use Qt built-in functionality for opening scripts with
 default editor

---
 mainwindow.cpp | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7b09396c..a596f0b3 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -20,6 +20,7 @@
 #include <QDialogButtonBox>
 #include <QProcess>
 #include <QSysInfo>
+#include <QDesktopServices>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -554,28 +555,8 @@ void MainWindow::redo() {
 
 // Open current map scripts in system default editor for .inc files
 void MainWindow::openInTextEditor() {
-    QProcess *process = new QProcess(this);
-    QSysInfo sysInfo;
-    process->setWorkingDirectory(editor->project->root);
-
-    #ifdef Q_OS_DARWIN
-        QString cmd = "open ";
-    #elif defined Q_OS_LINUX
-        QString cmd = "xdg-open ";
-    #elif defined Q_OS_WIN 
-        QString cmd = "cmd /c start \"";
-    #else
-        qDebug() << "Functionality is not available with this OS ("
-                 << sysInfo.productType() << ")";
-    #endif
-
-    cmd += "data/maps/" + editor->map->name + "/scripts.inc";
-
-    #ifdef Q_OS_WIN
-        cmd += "\"";
-    #endif
-
-    process->start(cmd);
+    QString path = QDir::cleanPath(editor->project->root + QDir::separator() + "data/maps/" + editor->map->name + "/scripts.inc");
+    QDesktopServices::openUrl(QUrl(path));
 }
 
 void MainWindow::on_action_Save_triggered() {

From 475f63d0f279a8c2953354ddf87517fed8ea0d4a Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Wed, 12 Sep 2018 21:10:11 -0400
Subject: [PATCH 3/3] small fix

---
 mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index a596f0b3..a6484c80 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -555,7 +555,7 @@ void MainWindow::redo() {
 
 // Open current map scripts in system default editor for .inc files
 void MainWindow::openInTextEditor() {
-    QString path = QDir::cleanPath(editor->project->root + QDir::separator() + "data/maps/" + editor->map->name + "/scripts.inc");
+    QString path = QDir::cleanPath("file://" + editor->project->root + QDir::separator() + "data/maps/" + editor->map->name + "/scripts.inc");
     QDesktopServices::openUrl(QUrl(path));
 }