Merge branch 'master' into large_text_performance

This commit is contained in:
Veronica K. Berglyd Olsen
2019-11-19 10:42:05 +01:00
committed by GitHub
9 changed files with 53 additions and 10 deletions
+6 -3
View File
@@ -417,17 +417,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
@@ -451,7 +454,7 @@ class GuiMain(QMainWindow):
else:
return False
self.docEditor.setText(theText)
self.docEditor.replaceText(theText)
return True