novelWriter 2.4.3__py3-none-any.whl → 2.5b1__py3-none-any.whl

novelwriter/guimain.py

@@ -23,18 +23,18 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import sys
 import logging
+import sys
 
-from time import time
-from pathlib import Path
 from datetime import datetime
+from pathlib import Path
+from time import time
 
 from PyQt5.QtCore import Qt, QTimer, pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QCursor, QIcon
 from PyQt5.QtWidgets import (
-    QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox, QShortcut, QSplitter,
-    QStackedWidget, QVBoxLayout, QWidget
+    QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox,
+    QShortcut, QSplitter, QStackedWidget, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED, __hexversion__, __version__
@@ -44,7 +44,7 @@ from novelwriter.dialogs.about import GuiAbout
 from novelwriter.dialogs.preferences import GuiPreferences
 from novelwriter.dialogs.projectsettings import GuiProjectSettings
 from novelwriter.dialogs.wordlist import GuiWordList
-from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemType, nwWidget, nwView
+from novelwriter.enum import nwDocAction, nwDocInsert, nwDocMode, nwItemType, nwView, nwWidget
 from novelwriter.gui.doceditor import GuiDocEditor
 from novelwriter.gui.docviewer import GuiDocViewer
 from novelwriter.gui.docviewerpanel import GuiDocViewerPanel
@@ -263,6 +263,7 @@ class GuiMain(QMainWindow):
         self.docEditor.requestProjectItemRenamed.connect(self.projView.renameTreeItem)
         self.docEditor.requestNewNoteCreation.connect(self.projView.createNewNote)
         self.docEditor.docTextChanged.connect(self.projSearch.textChanged)
+        self.docEditor.requestNextDocument.connect(self.openNextDocument)
 
         self.docViewer.documentLoaded.connect(self.docViewerPanel.updateHandle)
         self.docViewer.loadDocumentTagRequest.connect(self._followTag)
@@ -369,9 +370,7 @@ class GuiMain(QMainWindow):
             if not msgYes:
                 return False
 
-        if self.docEditor.docChanged:
-            self.saveDocument()
-
+        self.saveDocument()
         saveOK = self.saveProject()
         doBackup = False
         if SHARED.project.data.doBackup and CONFIG.backupOnClose:
@@ -514,9 +513,7 @@ class GuiMain(QMainWindow):
             # Disable focus mode if it is active
             if SHARED.focusMode:
                 SHARED.setFocusMode(False)
-            self.docEditor.saveCursorPosition()
-            if self.docEditor.docChanged:
-                self.saveDocument()
+            self.saveDocument()
             self.docEditor.clearEditor()
             if not beforeOpen:
                 self.novelView.setActiveHandle(None)
@@ -553,42 +550,43 @@ class GuiMain(QMainWindow):
 
         return True
 
-    def openNextDocument(self, tHandle: str, wrapAround: bool = False) -> bool:
+    @pyqtSlot(str, bool)
+    def openNextDocument(self, tHandle: str, wrapAround: bool) -> None:
         """Open the next document in the project tree, following the
         document with the given handle. Stop when reaching the end.
         """
-        if not SHARED.hasProject:
-            logger.error("No project open")
-            return False
-
-        nHandle = None   # The next handle after tHandle
-        fHandle = None   # The first file handle we encounter
-        foundIt = False  # We've found tHandle, pick the next we see
-        for tItem in SHARED.project.tree:
-            if not tItem.isFileType():
-                continue
-            if fHandle is None:
-                fHandle = tItem.itemHandle
-            if tItem.itemHandle == tHandle:
-                foundIt = True
-            elif foundIt:
-                nHandle = tItem.itemHandle
-                break
-
-        if nHandle is not None:
-            self.openDocument(nHandle, tLine=1, doScroll=True)
-            return True
-        elif wrapAround:
-            self.openDocument(fHandle, tLine=1, doScroll=True)
-            return False
-
-        return False
+        if SHARED.hasProject:
+            nHandle = None   # The next handle after tHandle
+            fHandle = None   # The first file handle we encounter
+            foundIt = False  # We've found tHandle, pick the next we see
+            for tItem in SHARED.project.tree:
+                if not tItem.isFileType():
+                    continue
+                if fHandle is None:
+                    fHandle = tItem.itemHandle
+                if tItem.itemHandle == tHandle:
+                    foundIt = True
+                elif foundIt:
+                    nHandle = tItem.itemHandle
+                    break
+            if nHandle is not None:
+                self.openDocument(nHandle, tLine=1, doScroll=True)
+            elif wrapAround:
+                self.openDocument(fHandle, tLine=1, doScroll=True)
+        return
 
-    @pyqtSlot()
-    def saveDocument(self) -> None:
+    def saveDocument(self, force: bool = False) -> None:
         """Save the current documents."""
         if SHARED.hasProject:
-            self.docEditor.saveText()
+            self.docEditor.saveCursorPosition()
+            if force or self.docEditor.docChanged:
+                self.docEditor.saveText()
+        return
+
+    @pyqtSlot()
+    def forceSaveDocument(self) -> None:
+        """Save document even of it has not changed."""
+        self.saveDocument(force=True)
         return
 
     def viewDocument(self, tHandle: str | None = None, sTitle: str | None = None) -> bool:
@@ -794,10 +792,7 @@ class GuiMain(QMainWindow):
         """Open the novel details dialog."""
         if SHARED.hasProject:
             dialog = GuiNovelDetails(self)
-            dialog.setModal(True)
-            dialog.show()
-            dialog.raise_()
-            QApplication.processEvents()
+            dialog.activateDialog()
             dialog.updateValues()
         return
 
@@ -805,12 +800,8 @@ class GuiMain(QMainWindow):
     def showBuildManuscriptDialog(self) -> None:
         """Open the build manuscript dialog."""
         if SHARED.hasProject:
-            if (dialog := SHARED.findTopLevelWidget(GuiManuscript)) is None:
-                dialog = GuiManuscript(self)
-            dialog.setModal(False)
-            dialog.show()
-            dialog.raise_()
-            QApplication.processEvents()
+            dialog = GuiManuscript(self)
+            dialog.activateDialog()
             dialog.loadContent()
         return
 
@@ -827,12 +818,8 @@ class GuiMain(QMainWindow):
     def showWritingStatsDialog(self) -> None:
         """Open the session stats dialog."""
         if SHARED.hasProject:
-            if (dialog := SHARED.findTopLevelWidget(GuiWritingStats)) is None:
-                dialog = GuiWritingStats(self)
-            dialog.setModal(False)
-            dialog.show()
-            dialog.raise_()
-            QApplication.processEvents()
+            dialog = GuiWritingStats(self)
+            dialog.activateDialog()
             dialog.populateGUI()
         return
 
@@ -840,10 +827,7 @@ class GuiMain(QMainWindow):
     def showAboutNWDialog(self) -> None:
         """Show the novelWriter about dialog."""
         dialog = GuiAbout(self)
-        dialog.setModal(True)
-        dialog.show()
-        dialog.raise_()
-        QApplication.processEvents()
+        dialog.activateDialog()
         dialog.populateGUI()
         return
 
@@ -858,10 +842,7 @@ class GuiMain(QMainWindow):
     def showDictionariesDialog(self) -> None:
         """Show the download dictionaries dialog."""
         dialog = GuiDictionaries(self)
-        dialog.setModal(True)
-        dialog.show()
-        dialog.raise_()
-        QApplication.processEvents()
+        dialog.activateDialog()
         if not dialog.initDialog():
             dialog.close()
             SHARED.error(self.tr("Could not initialise the dialog."))
@@ -1148,7 +1129,7 @@ class GuiMain(QMainWindow):
     @pyqtSlot()
     def _reloadViewer(self) -> None:
         """Reload the document in the viewer."""
-        if self.docEditor.docChanged and self.docEditor.docHandle == self.docViewer.docHandle:
+        if self.docEditor.docHandle == self.docViewer.docHandle:
             # If the two panels have the same document, save any changes in the editor
             self.saveDocument()
         self.docViewer.reloadText()
@@ -1228,7 +1209,7 @@ class GuiMain(QMainWindow):
         doSave &= SHARED.project.projChanged
         doSave &= SHARED.project.storage.isOpen()
         if doSave:
-            logger.debug("Autosaving project")
+            logger.debug("Auto-saving project")
             self.saveProject(autoSave=True)
         return
 
@@ -1236,7 +1217,7 @@ class GuiMain(QMainWindow):
     def _autoSaveDocument(self) -> None:
         """Autosave of the document. This is a timer-activated slot."""
         if SHARED.hasProject and self.docEditor.docChanged:
-            logger.debug("Autosaving document")
+            logger.debug("Auto-saving document")
             self.saveDocument()
         return
 
@@ -1416,5 +1397,3 @@ class GuiMain(QMainWindow):
             ))
             return None, None
         return tHandle, sTitle
-
-# END Class GuiMain

novelwriter/shared.py

@@ -31,7 +31,8 @@ from time import time
 from typing import TYPE_CHECKING, TypeVar
 
 from PyQt5.QtCore import QObject, QRunnable, QThreadPool, QTimer, pyqtSignal
-from PyQt5.QtWidgets import QFileDialog, QMessageBox, QWidget
+from PyQt5.QtGui import QFont
+from PyQt5.QtWidgets import QFileDialog, QFontDialog, QMessageBox, QWidget
 
 from novelwriter.common import formatFileFilter
 from novelwriter.constants import nwFiles
@@ -171,6 +172,17 @@ class SharedData(QObject):
         logger.debug("Thread Pool Max Count: %d", QThreadPool.globalInstance().maxThreadCount())
         return
 
+    def closeDocument(self, tHandle: str | None = None) -> None:
+        """Close the document editor, optionally a specific document."""
+        if tHandle is None or tHandle == self.mainGui.docEditor.docHandle:
+            self.mainGui.closeDocument()
+        return
+
+    def saveDocument(self) -> None:
+        """Forward save document call to main GUI."""
+        self.mainGui.saveDocument()
+        return
+
     def openProject(self, path: str | Path, clearLock: bool = False) -> bool:
         """Open a project."""
         if self.project.isValid:
@@ -198,7 +210,7 @@ class SharedData(QObject):
 
     def closeProject(self) -> None:
         """Close the current project."""
-        self._closeDialogs()
+        self._closeToolDialogs()
         self.project.closeProject(self._idleTime)
         self._resetProject()
         self._resetIdleTimer()
@@ -244,8 +256,11 @@ class SharedData(QObject):
         QThreadPool.globalInstance().start(runnable, priority=priority)
         return
 
-    def getProjectPath(self, parent: QWidget, path: str | Path | None = None,
-                       allowZip: bool = False) -> Path | None:
+    def getProjectPath(
+        self, parent: QWidget,
+        path: str | Path | None = None,
+        allowZip: bool = False
+    ) -> Path | None:
         """Open the file dialog and select a novelWriter project file."""
         label = (self.tr("novelWriter Project File or Zip File")
                  if allowZip else self.tr("novelWriter Project File"))
@@ -256,6 +271,13 @@ class SharedData(QObject):
         )
         return Path(selected) if selected else None
 
+    def getFont(self, current: QFont, native: bool) -> tuple[QFont, bool]:
+        """Open the font dialog and select a font."""
+        kwargs = {}
+        if not native:
+            kwargs["options"] = QFontDialog.FontDialogOption.DontUseNativeDialog
+        return QFontDialog.getFont(current, self.mainGui, self.tr("Select Font"), **kwargs)
+
     def findTopLevelWidget(self, kind: type[NWWidget]) -> NWWidget | None:
         """Find a top level widget."""
         for widget in self.mainGui.children():
@@ -357,19 +379,14 @@ 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
-
+    def _closeToolDialogs(self) -> None:
+        """Close all open tool dialogs."""
+        from novelwriter.extensions.modified import NToolDialog
         for widget in self.mainGui.children():
-            if isinstance(widget, (GuiManuscript, GuiWritingStats)):
+            if isinstance(widget, NToolDialog):
                 widget.close()
-
         return
 
-# END Class SharedData
-
 
 class _GuiAlert(QMessageBox):
 
@@ -430,5 +447,3 @@ class _GuiAlert(QMessageBox):
             self.setIconPixmap(self._theme.getPixmap("alert_question", (pSz, pSz)))
             self.setWindowTitle(self.tr("Question"))
         return
-
-# END Class _GuiAlert

novelwriter/tools/dictionaries.py

@@ -31,20 +31,20 @@ from zipfile import ZipFile
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtGui import QCloseEvent, QTextCursor
 from PyQt5.QtWidgets import (
-    QApplication, QDialog, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout,
-    QLabel, QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget
+    QApplication, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout, QLabel,
+    QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import formatFileFilter, formatInt, getFileSize, openExternalPath
+from novelwriter.common import cssCol, formatFileFilter, formatInt, getFileSize, openExternalPath
 from novelwriter.error import formatException
-from novelwriter.extensions.modified import NIconToolButton
+from novelwriter.extensions.modified import NIconToolButton, NNonBlockingDialog
 from novelwriter.types import QtDialogClose
 
 logger = logging.getLogger(__name__)
 
 
-class GuiDictionaries(QDialog):
+class GuiDictionaries(NNonBlockingDialog):
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -186,7 +186,7 @@ class GuiDictionaries(QDialog):
             (self.tr("Free or Libre Office extension"), "*.sox *.oxt"), "*"
         ])
         soxFile, _ = QFileDialog.getOpenFileName(
-            self, self.tr("Browse Files"), "", filter=ffilter
+            self, self.tr("Browse Files"), str(CONFIG.homePath()), filter=ffilter
         )
         if soxFile:
             path = Path(soxFile).absolute()
@@ -257,13 +257,9 @@ class GuiDictionaries(QDialog):
         cursor.movePosition(QTextCursor.MoveOperation.End)
         if cursor.position() > 0:
             cursor.insertText("\n")
-        if err:
-            cursor.insertHtml(f"<font color='red'>{text}</font>")
-        else:
-            cursor.insertText(text)
+        textCol = cssCol(SHARED.theme.errorText if err else self.palette().text().color())
+        cursor.insertHtml(f"<font style='color: {textCol}'>{text}</font>")
         cursor.movePosition(QTextCursor.MoveOperation.End)
         cursor.deleteChar()
         self.infoBox.setTextCursor(cursor)
         return
-
-# END Class GuiDictionaries

novelwriter/tools/lipsum.py

@@ -23,8 +23,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import random
 import logging
+import random
 
 from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtWidgets import (
@@ -35,7 +35,7 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import readTextFile
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtAlignLeft, QtAlignRight, QtRoleAction, QtDialogClose
+from novelwriter.types import QtAlignLeft, QtAlignRight, QtDialogClose, QtRoleAction
 
 logger = logging.getLogger(__name__)
 
@@ -150,5 +150,3 @@ class GuiLipsum(QDialog):
         self._lipsumText = "\n\n".join(lipsumText[0:pCount]) + "\n\n"
         self.close()
         return
-
-# END Class GuiLipsum

novelwriter/tools/manusbuild.py

@@ -327,7 +327,7 @@ class GuiManuscriptBuild(QDialog):
                 return False
 
         # Make sure editor content is saved before we start
-        SHARED.mainGui.saveDocument()
+        SHARED.saveDocument()
 
         docBuild = NWBuildDocument(SHARED.project, self._build)
         docBuild.queueAll()
@@ -403,5 +403,3 @@ class GuiManuscriptBuild(QDialog):
         """Open the build folder in the system's file explorer."""
         openExternalPath(Path(self.buildPath.text()))
         return
-
-# END Class GuiManuscriptBuild