Merge branch 'master' into session_log

This commit is contained in:
Veronica K. B. Olsen
2019-10-20 14:41:40 +02:00
4 changed files with 22 additions and 14 deletions
+1 -1
View File
@@ -259,7 +259,7 @@ class GuiConfigEditGeneral(QWidget):
self.mainConf.backupOnClose = backupOnClose
self.mainConf.askBeforeBackup = askBeforeBackup
self.mainConf.confChanged = True
self.mainConf.confChanged = True
return validEntries, needsRestart
+1
View File
@@ -185,6 +185,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
# Build a QRegExp for each pattern and for the spell checker
self.rules = [(QRegularExpression(a),b) for (a,b) in self.hRules]
self.spellRx = QRegularExpression(r"\b[^\s]+\b")
self.spellRx.setPatternOptions(QRegularExpression.UseUnicodePropertiesOption)
return True
+2 -1
View File
@@ -226,7 +226,7 @@ class GuiMain(QMainWindow):
if self.docEditor.docChanged:
self.saveDocument()
if self.theProject.projChanged:
if self.theProject.projAltered:
saveOK = self.saveProject()
doBackup = False
if self.theProject.doBackup and self.mainConf.backupOnClose:
@@ -503,6 +503,7 @@ class GuiMain(QMainWindow):
logger.debug("Applying new preferences")
self.initMain()
self.theTheme.updateTheme()
self.saveDocument()
self.docEditor.initEditor()
self.docViewer.initViewer()
return True