Merge pull request #149 from vkbo/insert_from_file_fix

Fixed a minor issue when insert from file was cancelled.

nw/gui/elements/doceditor.py

@@ -229,6 +229,14 @@ class GuiDocEditor(QTextEdit):
 
         return True
 
+    def replaceText(self, theText):
+        """Replaces the text of the current document with the provided
+        text. This also clears undo history.
+        """
+        self.setPlainText(theText)
+        self.setDocumentChanged(True)
+        return
+
     def saveText(self):
 
         if self.nwDocument.theItem is None:

nw/guimain.py

@@ -415,17 +415,20 @@ class GuiMain(QMainWindow):
         )
         if inPath:
             loadFile = inPath[0]
-            self.mainConf.setLastPath(loadFile)
         else:
             return False
 
+        if loadFile.strip() == "":
+            return False
+
         theText = None
         try:
             with open(loadFile,mode="rt",encoding="utf8") as inFile:
                 theText = inFile.read()
+            self.mainConf.setLastPath(loadFile)
         except Exception as e:
             self.makeAlert(
-                ["Could not read file. The file cannot be a binary file.",str(e)],
+                ["Could not read file. The file must be an existing text file.",str(e)],
                 nwAlert.ERROR
             )
             return False
@@ -449,7 +452,7 @@ class GuiMain(QMainWindow):
             else:
                 return False
 
-        self.docEditor.setText(theText)
+        self.docEditor.replaceText(theText)
 
         return True