Fixed a minor issue when insert from file was cancelled.

This commit is contained in:
Veronica K. B. Olsen
2019-11-17 22:10:33 +01:00
parent d63e07becb
commit ba9f471695
2 changed files with 14 additions and 3 deletions
+8
View File
@@ -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:
+6 -3
View File
@@ -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