Autosaving works, and document and project tracks whether they have been changed or not.

nw/gui/doceditor.py

@@ -204,7 +204,7 @@ class GuiDocEditor(QTextEdit):
             self.wcTimer.start()
         if self.mainConf.doReplace and not self.hasSelection:
             self._docAutoReplace(self.theDoc.findBlock(thePos))
-        logger.verbose("Doc change signal took %.3f µs" % ((time()-self.lastEdit)*1e6))
+        # logger.verbose("Doc change signal took %.3f µs" % ((time()-self.lastEdit)*1e6))
         return
 
     def _docAutoReplace(self, theBlock):
@@ -267,7 +267,7 @@ class GuiDocEditor(QTextEdit):
         """
         sinceActive = time()-self.lastEdit
         if sinceActive > 5*self.wcInterval:
-            logger.verbose("Stopping word count timer due to no activity over the last %.3f seconds" % sinceActive)
+            logger.debug("Stopping word count timer due to no activity over the last %.3f seconds" % sinceActive)
             self.wcTimer.stop()
         elif self.wCounter.isRunning():
             logger.verbose("Word counter thread is busy")

nw/gui/dochighlight.py

@@ -143,9 +143,9 @@ class GuiDocHighlighter(QSyntaxHighlighter):
             }
         ))
 
-        # Build a QRegExp for each pattern
+        # 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"[\w\'{:s}]+".format(self.mainConf.fmtSingleQuotes[1]))
+        self.spellRx = QRegularExpression(r"[\w\'{:s}]+".format(self.mainConf.fmtApostrophe))
 
         logger.debug("DocHighlighter initialisation complete")
 

nw/gui/doctree.py

@@ -137,7 +137,7 @@ class GuiDocTree(QTreeWidget):
         trItem.setSelected(True)
         self.theParent.editItem()
 
-        return
+        return True
 
     def moveTreeItem(self, nStep):
         """Move an item up or down in the tree, but only if the treeView has focus. This also
@@ -163,6 +163,7 @@ class GuiDocTree(QTreeWidget):
                 pItem.insertChild(nIndex, cItem)
             self.clearSelection()
             cItem.setSelected(True)
+            self.theProject.projChanged = True
         return
 
     def saveTreeOrder(self):
@@ -208,6 +209,7 @@ class GuiDocTree(QTreeWidget):
             nwItemS.setParent(self.theProject.trashRoot)
             self.clearSelection()
             trItemP.setSelected(True)
+            self.theProject.projChanged = True
 
         elif nwItemS.itemType == nwItemType.FOLDER:
             logger.debug("User requested folder %s deleted" % tHandle)
@@ -220,6 +222,7 @@ class GuiDocTree(QTreeWidget):
                 trItemP.takeChild(tIndex)
                 self.clearSelection()
                 trItemP.setSelected(True)
+                self.theProject.projChanged = True
             else:
                 self.theParent.makeAlert(["Cannot delete folder.","It is not empty."],2)
                 return
@@ -230,6 +233,7 @@ class GuiDocTree(QTreeWidget):
             if trItemS.childCount() == 0:
                 self.takeTopLevelItem(tIndex)
                 self.theParent.mainMenu.setAvailableRoot()
+                self.theProject.projChanged = True
             else:
                 self.theParent.makeAlert(["Cannot delete root folder.","It is not empty."],2)
                 return
@@ -387,6 +391,7 @@ class GuiDocTree(QTreeWidget):
         pHandle = trItemP.text(self.C_HANDLE)
         nwItemS.setParent(pHandle)
         self.setTreeItemValues(tHandle)
+        self.theProject.projChanged = True
         return
 
     def _moveOrphanedItem(self, tHandle, dHandle):
@@ -401,6 +406,7 @@ class GuiDocTree(QTreeWidget):
         pHandle = trItemP.text(self.C_HANDLE)
         nwItemS.setParent(pHandle)
         self.setTreeItemValues(tHandle)
+        self.theProject.projChanged = True
         return
 
     ##

nw/gui/winmain.py

@@ -16,7 +16,7 @@ import nw
 from os                   import path
 from PyQt5.QtWidgets      import QWidget, QMainWindow, QVBoxLayout, QFrame, QSplitter, QFileDialog, QStackedWidget, QShortcut, QMessageBox
 from PyQt5.QtGui          import QIcon
-from PyQt5.QtCore         import Qt
+from PyQt5.QtCore         import Qt, QTimer
 
 from nw.gui.doctree       import GuiDocTree
 from nw.gui.doceditor     import GuiDocEditor
@@ -91,6 +91,16 @@ class GuiMain(QMainWindow):
                 theCss = inFile.read()
             self.setStyleSheet(theCss)
 
+        self.asProjTimer = QTimer()
+        self.asProjTimer.setInterval(int(self.mainConf.autoSaveProj*1000))
+        self.asProjTimer.timeout.connect(self._autoSaveProject)
+        self.asProjTimer.start()
+
+        self.asDocTimer = QTimer()
+        self.asDocTimer.setInterval(int(self.mainConf.autoSaveDoc*1000))
+        self.asDocTimer.timeout.connect(self._autoSaveDocument)
+        self.asDocTimer.start()
+
         self.show()
 
         logger.debug("GUI initialisation complete")
@@ -162,6 +172,8 @@ class GuiMain(QMainWindow):
     ##
 
     def openDocument(self, tHandle):
+        if self._takeDocumentAction():
+            self.saveDocument()
         self.stackPane.setCurrentIndex(self.stackDoc)
         self.docEditor.setText(self.theDocument.openDocument(tHandle))
         self.docEditor.changeWidth()
@@ -174,6 +186,7 @@ class GuiMain(QMainWindow):
             self.theDocument.theItem.setWordCount(self.docEditor.wordCount)
             self.theDocument.theItem.setParaCount(self.docEditor.paraCount)
             self.theDocument.saveDocument(docHtml)
+            self.docEditor.theDoc.setModified(False)
         return
 
     ##
@@ -245,6 +258,10 @@ class GuiMain(QMainWindow):
 
     def closeMain(self):
         logger.info("Exiting %s" % nw.__package__)
+        if self._takeDocumentAction():
+            self.saveDocument()
+        if self._takeProjectAction():
+            self.saveProject()
         self.mainConf.setWinSize(self.width(), self.height())
         self.mainConf.setTreeColWidths(self.treeView.getColumnSizes())
         self.mainConf.setMainPanePos(self.splitMain.sizes())
@@ -270,6 +287,34 @@ class GuiMain(QMainWindow):
         self.setWindowTitle(winTitle)
         return True
 
+    def _autoSaveProject(self):
+        if self._takeProjectAction():
+            logger.debug("Autosaving project")
+            self.saveProject()
+        return
+
+    def _autoSaveDocument(self):
+        if self._takeDocumentAction():
+            logger.debug("Autosaving document")
+            self.saveDocument()
+        return
+
+    def _takeProjectAction(self):
+        if self.theProject.projPath is None:
+            return False
+        if not self.theProject.projChanged:
+            return False
+        return True
+
+    def _takeDocumentAction(self):
+        if self.stackPane.currentIndex() != self.stackDoc:
+            return False
+        if self.theDocument.theItem is None:
+            return False
+        if not self.docEditor.theDoc.isModified():
+            return False
+        return True
+
     ##
     #  Events
     ##