Merge branch 'master' of https://github.com/dail8859/NotepadNext

Author: matthewyang204

src/NotepadNext/ScintillaNext.cpp

@@ -347,11 +347,26 @@ void ScintillaNext::reload()
     if (readSuccessful) {
         updateTimestamp();
         setSavePoint();
+
+        // If this was a temporary file, make sure it is not any more
+        setTemporary(false);
+        
+        emit reloaded();
     }
 
     return;
 }
 
+void ScintillaNext::omitModifications()
+{
+    // If file modifications will be omitted just update file timestamp
+    // so pop-up will be displayed only once per file modifications.
+    updateTimestamp();
+    setTemporary(true);
+
+    return;
+}
+
 QFileDevice::FileError ScintillaNext::saveAs(const QString &newFilePath)
 {
     bool isRenamed = bufferType == ScintillaNext::New || fileInfo.canonicalFilePath() != newFilePath;

src/NotepadNext/ScintillaNext.h

@@ -122,6 +122,7 @@ public slots:
     void close();
     QFileDevice::FileError save();
     void reload();
+    void omitModifications();
     QFileDevice::FileError saveAs(const QString &newFilePath);
     QFileDevice::FileError saveCopyAs(const QString &filePath);
     bool rename(const QString &newFilePath);
@@ -139,6 +140,7 @@ public slots:
     void renamed();
 
     void lexerChanged();
+    void reloaded();
 
 protected:
     void dragEnterEvent(QDragEnterEvent *event) override;

src/NotepadNext/decorators/URLFinder.cpp

@@ -46,6 +46,7 @@ URLFinder::URLFinder(ScintillaNext *editor) :
     connect(this, &EditorDecorator::stateChanged, this, [=](bool b) {
         if (b) {
             connect(editor, &ScintillaNext::resized, timer, qOverload<>(&QTimer::start));
+            connect(editor, &ScintillaNext::reloaded, timer, qOverload<>(&QTimer::start));
             findURLs();
         }
         else {

src/NotepadNext/dialogs/MainWindow.cpp

@@ -1854,7 +1854,15 @@ bool MainWindow::checkFileForModification(ScintillaNext *editor)
     }
     else if (state == ScintillaNext::Modified) {
         qInfo("ScintillaNext::Modified");
-        editor->reload();
+        const QString filePath = editor->getFilePath();
+        auto reply = QMessageBox::question(this, tr("Reload File"), tr("<b>%1</b> has been modified by another program. Do you want to reload it?").arg(filePath));
+
+        if (reply == QMessageBox::Yes) {
+            editor->reload();
+        }
+        else {
+            editor->omitModifications();
+        }
     }
     else if (state == ScintillaNext::Deleted) {
         qInfo("ScintillaNext::Deleted");

src/NotepadNext/languages/abaqus.lua

@@ -0,0 +1,56 @@
+local L = {}
+
+L.lexer = "abaqus"
+
+L.singleLineComment = ""
+
+L.extensions = {
+	"inp",
+}
+
+L.keywords = {
+}
+
+L.styles = {
+	["DEFAULT"] = {
+		id = 0,
+		fgColor = rgb(0x000000),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["COMMENT"] = {
+		id = 1,
+		fgColor = rgb(0x008000),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["NUMBER"] = {
+		id = 3,
+		fgColor = rgb(0xFF8000),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["STRING"] = {
+		id = 4,
+		fgColor = rgb(0xFF8000),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["OPERATOR"] = {
+		id = 5,
+		fgColor = rgb(0x000080),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["PROCESSORS"] = {
+		id = 7,
+		fgColor = rgb(0x8000FF),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["STARCOMMAND"] = {
+		id = 10,
+		fgColor = rgb(0x0000FF),
+		bgColor = rgb(0xFFFFFF),
+	},
+	["ARGUMENT"] = {
+		id = 11,
+		fgColor = rgb(0x8800FF),
+		bgColor = rgb(0xFFFFFF),
+	},
+}
+return L

src/NotepadNext/scripts.qrc

@@ -87,5 +87,6 @@
         <file>languages/go.lua</file>
         <file>languages/markdown.lua</file>
         <file>languages/nix.lua</file>
+        <file>languages/abaqus.lua</file>
     </qresource>
 </RCC>

src/NotepadNext/scripts/init.lua

@@ -189,3 +189,4 @@ languages["VHDL"] = require("vhdl")
 languages["Visual Prolog"] = require("visualprolog")
 languages["XML"] = require("xml")
 languages["YAML"] = require("yaml")
+languages["Abaqus"] = require("abaqus")