Merge branch 'release'

novelwriter/shared.py

@@ -26,21 +26,21 @@ from __future__ import annotations
 
 import logging
 
+from pathlib import Path
 from time import time
 from typing import TYPE_CHECKING, TypeVar
-from pathlib import Path
 
 from PyQt5.QtCore import QObject, QRunnable, QThreadPool, QTimer, pyqtSignal
 from PyQt5.QtWidgets import QFileDialog, QMessageBox, QWidget
-from novelwriter.common import formatFileFilter
 
+from novelwriter.common import formatFileFilter
 from novelwriter.constants import nwFiles
 from novelwriter.core.spellcheck import NWSpellEnchant
 
 if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
-    from novelwriter.gui.theme import GuiTheme
     from novelwriter.core.project import NWProject
+    from novelwriter.gui.theme import GuiTheme
+    from novelwriter.guimain import GuiMain
 
 logger = logging.getLogger(__name__)
 
@@ -198,6 +198,7 @@ class SharedData(QObject):
 
     def closeProject(self) -> None:
         """Close the current project."""
+        self._closeDialogs()
         self.project.closeProject(self._idleTime)
         self._resetProject()
         self._resetIdleTimer()
@@ -356,6 +357,17 @@ class SharedData(QObject):
         self._idleTime = 0.0
         return
 
+    def _closeDialogs(self) -> None:
+        """Close non-modal dialogs."""
+        from novelwriter.tools.manuscript import GuiManuscript
+        from novelwriter.tools.writingstats import GuiWritingStats
+
+        for widget in self.mainGui.children():
+            if isinstance(widget, (GuiManuscript, GuiWritingStats)):
+                widget.close()
+
+        return
+
 # END Class SharedData
 
 

novelwriter/tools/manusbuild.py

@@ -44,9 +44,7 @@ from novelwriter.core.item import NWItem
 from novelwriter.enum import nwBuildFmt
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.extensions.simpleprogress import NProgressSimple
-from novelwriter.types import (
-    QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
-)
+from novelwriter.types import QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
 
 logger = logging.getLogger(__name__)
 
@@ -328,6 +326,9 @@ class GuiManuscriptBuild(QDialog):
             ):
                 return False
 
+        # Make sure editor content is saved before we start
+        SHARED.mainGui.saveDocument()
+
         docBuild = NWBuildDocument(SHARED.project, self._build)
         docBuild.queueAll()
 

novelwriter/tools/manuscript.py

@@ -334,6 +334,9 @@ class GuiManuscript(NToolDialog):
         if not (build := self._getSelectedBuild()):
             return
 
+        # Make sure editor content is saved before we start
+        SHARED.mainGui.saveDocument()
+
         docBuild = NWBuildDocument(SHARED.project, build)
         docBuild.setPreviewMode(True)
         docBuild.queueAll()
@@ -737,6 +740,7 @@ class _PreviewWidget(QTextBrowser):
 
         self._docTime = 0
         self._buildName = ""
+        self._scrollPos = 0
 
         # Document Setup
         dPalette = self.palette()
@@ -833,6 +837,7 @@ class _PreviewWidget(QTextBrowser):
         self.buildProgress.setValue(0)
         self.buildProgress.setCentreText(None)
         self.buildProgress.setVisible(True)
+        self._scrollPos = self.verticalScrollBar().value()
         self.setPlaceholderText("")
         self.clear()
         return
@@ -845,7 +850,6 @@ class _PreviewWidget(QTextBrowser):
 
     def setContent(self, data: dict) -> None:
         """Set the content of the preview widget."""
-        sPos = self.verticalScrollBar().value()
         QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
 
         self.buildProgress.setCentreText(self.tr("Processing ..."))
@@ -862,7 +866,6 @@ class _PreviewWidget(QTextBrowser):
             cursor = self.textCursor()
             cursor.insertText("\t")
 
-        self.verticalScrollBar().setValue(sPos)
         self._docTime = checkInt(data.get("time"), 0)
         self._updateBuildAge()
 
@@ -873,7 +876,7 @@ class _PreviewWidget(QTextBrowser):
         self.buildProgress.setCentreText(self.tr("Done"))
         QApplication.restoreOverrideCursor()
         QApplication.processEvents()
-        QTimer.singleShot(300, self._hideProgress)
+        QTimer.singleShot(300, self._postUpdate)
 
         return
 
@@ -928,9 +931,10 @@ class _PreviewWidget(QTextBrowser):
         return
 
     @pyqtSlot()
-    def _hideProgress(self) -> None:
-        """Clean up the build progress bar."""
+    def _postUpdate(self) -> None:
+        """Run tasks after content update."""
         self.buildProgress.setVisible(False)
+        self.verticalScrollBar().setValue(self._scrollPos)
         return
 
     ##