novelWriter 2.4.4__py3-none-any.whl → 2.5__py3-none-any.whl

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,23 @@ class SharedData(QObject):
         logger.debug("Thread Pool Max Count: %d", QThreadPool.globalInstance().maxThreadCount())
         return
 
+    def closeEditor(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 saveEditor(self, tHandle: str | None = None) -> None:
+        """Save the editor content, optionally a specific document."""
+        docEditor = self.mainGui.docEditor
+        if (
+            self.hasProject and docEditor.docHandle
+            and (tHandle is None or tHandle == docEditor.docHandle)
+        ):
+            logger.debug("Saving editor document before action")
+            docEditor.saveText()
+        return
+
     def openProject(self, path: str | Path, clearLock: bool = False) -> bool:
         """Open a project."""
         if self.project.isValid:
@@ -198,25 +216,12 @@ class SharedData(QObject):
 
     def closeProject(self) -> None:
         """Close the current project."""
-        self._closeDialogs()
+        self._closeToolDialogs()
         self.project.closeProject(self._idleTime)
         self._resetProject()
         self._resetIdleTimer()
         return
 
-    def ensureEditorSaved(self, tHandle: str | None) -> None:
-        """Ensure that the editor content is saved. Optionally, only if
-        it is a specific handle.
-        """
-        docEditor = self.mainGui.docEditor
-        if (
-            self.hasProject and docEditor.docHandle
-            and (tHandle is None or tHandle == docEditor.docHandle)
-        ):
-            logger.debug("Saving editor document before action")
-            docEditor.saveText()
-        return
-
     def updateSpellCheckLanguage(self, reload: bool = False) -> None:
         """Update the active spell check language from settings."""
         from novelwriter import CONFIG
@@ -257,8 +262,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"))
@@ -269,6 +277,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():
@@ -307,7 +322,6 @@ class SharedData(QObject):
         if log:
             logger.info(self._lastAlert, stacklevel=2)
         alert.exec()
-        alert.deleteLater()
         return
 
     def warn(self, text: str, info: str = "", details: str = "", log: bool = True) -> None:
@@ -319,7 +333,6 @@ class SharedData(QObject):
         if log:
             logger.warning(self._lastAlert, stacklevel=2)
         alert.exec()
-        alert.deleteLater()
         return
 
     def error(self, text: str, info: str = "", details: str = "", log: bool = True,
@@ -334,7 +347,6 @@ class SharedData(QObject):
         if log:
             logger.error(self._lastAlert, stacklevel=2)
         alert.exec()
-        alert.deleteLater()
         return
 
     def question(self, text: str, info: str = "", details: str = "", warn: bool = False) -> bool:
@@ -345,7 +357,6 @@ class SharedData(QObject):
         self._lastAlert = alert.logMessage
         alert.exec()
         isYes = alert.result() == QMessageBox.StandardButton.Yes
-        alert.deleteLater()
         return isYes
 
     ##
@@ -370,19 +381,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):
 
@@ -443,5 +449,3 @@ class _GuiAlert(QMessageBox):
             self.setIconPixmap(self._theme.getPixmap("alert_question", (pSz, pSz)))
             self.setWindowTitle(self.tr("Question"))
         return
-
-# END Class _GuiAlert

novelwriter/text/patterns.py

@@ -0,0 +1,113 @@
+"""
+novelWriter – Text Pattern Functions
+====================================
+
+File History:
+Created: 2024-06-01 [2.5ec1]
+
+This file is a part of novelWriter
+Copyright 2018–2024, Veronica Berglyd Olsen
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+"""
+from __future__ import annotations
+
+from PyQt5.QtCore import QRegularExpression
+
+from novelwriter import CONFIG
+from novelwriter.constants import nwRegEx
+from novelwriter.types import QRegExUnicode
+
+
+class RegExPatterns:
+
+    @property
+    def markdownItalic(self) -> QRegularExpression:
+        """Markdown italic style."""
+        rxRule = QRegularExpression(nwRegEx.FMT_EI)
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def markdownBold(self) -> QRegularExpression:
+        """Markdown bold style."""
+        rxRule = QRegularExpression(nwRegEx.FMT_EB)
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def markdownStrike(self) -> QRegularExpression:
+        """Markdown strikethrough style."""
+        rxRule = QRegularExpression(nwRegEx.FMT_ST)
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def shortcodePlain(self) -> QRegularExpression:
+        """Plain shortcode style."""
+        rxRule = QRegularExpression(nwRegEx.FMT_SC)
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def shortcodeValue(self) -> QRegularExpression:
+        """Plain shortcode style."""
+        rxRule = QRegularExpression(nwRegEx.FMT_SV)
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def dialogStyle(self) -> QRegularExpression:
+        """Dialogue detection rule based on user settings."""
+        symO = ""
+        symC = ""
+        if CONFIG.dialogStyle in (1, 3):
+            symO += CONFIG.fmtSQuoteOpen
+            symC += CONFIG.fmtSQuoteClose
+        if CONFIG.dialogStyle in (2, 3):
+            symO += CONFIG.fmtDQuoteOpen
+            symC += CONFIG.fmtDQuoteClose
+
+        rxEnd = "|$" if CONFIG.allowOpenDial else ""
+        rxRule = QRegularExpression(f"\\B[{symO}].*?(?:[{symC}]\\B{rxEnd})")
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def dialogLine(self) -> QRegularExpression:
+        """Dialogue line rule based on user settings."""
+        sym = QRegularExpression.escape(CONFIG.dialogLine)
+        rxRule = QRegularExpression(f"^{sym}.*?$")
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def narratorBreak(self) -> QRegularExpression:
+        """Dialogue narrator break rule based on user settings."""
+        sym = QRegularExpression.escape(CONFIG.narratorBreak)
+        rxRule = QRegularExpression(f"\\B{sym}\\S.*?\\S{sym}\\B")
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+    @property
+    def altDialogStyle(self) -> QRegularExpression:
+        """Dialogue alternative rule based on user settings."""
+        symO = QRegularExpression.escape(CONFIG.altDialogOpen)
+        symC = QRegularExpression.escape(CONFIG.altDialogClose)
+        rxRule = QRegularExpression(f"\\B{symO}.*?{symC}\\B")
+        rxRule.setPatternOptions(QRegExUnicode)
+        return rxRule
+
+
+REGEX_PATTERNS = RegExPatterns()

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)
@@ -109,7 +109,7 @@ class GuiDictionaries(QDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(QtDialogClose, self)
-        self.buttonBox.rejected.connect(self._doClose)
+        self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
         self.innerBox = QVBoxLayout()
@@ -172,7 +172,7 @@ class GuiDictionaries(QDialog):
     def closeEvent(self, event: QCloseEvent) -> None:
         """Capture the user closing the window."""
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -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()
@@ -220,12 +220,6 @@ class GuiDictionaries(QDialog):
             SHARED.error("Path not found.")
         return
 
-    @pyqtSlot()
-    def _doClose(self) -> None:
-        """Close the dialog."""
-        self.close()
-        return
-
     ##
     #  Internal Functions
     ##
@@ -257,13 +251,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,37 +23,35 @@ 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.QtCore import pyqtSlot
 from PyQt5.QtWidgets import (
-    QDialog, QDialogButtonBox, QGridLayout, QHBoxLayout, QLabel, QSpinBox,
-    QVBoxLayout, QWidget
+    QDialogButtonBox, QGridLayout, QHBoxLayout, QLabel, QSpinBox, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import readTextFile
+from novelwriter.extensions.modified import NDialog
 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__)
 
 
-class GuiLipsum(QDialog):
+class GuiLipsum(NDialog):
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
         logger.debug("Create: GuiLipsum")
         self.setObjectName("GuiLipsum")
-        if CONFIG.osDarwin:
-            self.setWindowFlag(Qt.WindowType.Tool)
+        self.setWindowTitle(self.tr("Insert Placeholder Text"))
 
         self._lipsumText = ""
 
-        self.setWindowTitle(self.tr("Insert Placeholder Text"))
-
         vSp = CONFIG.pxInt(4)
         nPx = CONFIG.pxInt(64)
 
@@ -95,7 +93,7 @@ class GuiLipsum(QDialog):
 
         # Buttons
         self.buttonBox = QDialogButtonBox(self)
-        self.buttonBox.rejected.connect(self.close)
+        self.buttonBox.rejected.connect(self.reject)
 
         self.btnClose = self.buttonBox.addButton(QtDialogClose)
         self.btnClose.setAutoDefault(False)
@@ -104,8 +102,6 @@ class GuiLipsum(QDialog):
         self.btnInsert.clicked.connect(self._doInsert)
         self.btnInsert.setAutoDefault(False)
 
-        self.rejected.connect(self.close)
-
         # Assemble
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.innerBox)
@@ -132,7 +128,7 @@ class GuiLipsum(QDialog):
         cls = GuiLipsum(parent)
         cls.exec()
         text = cls.lipsumText
-        cls.deleteLater()
+        cls.softDelete()
         return text
 
     ##
@@ -150,5 +146,3 @@ class GuiLipsum(QDialog):
         self._lipsumText = "\n\n".join(lipsumText[0:pCount]) + "\n\n"
         self.close()
         return
-
-# END Class GuiLipsum

novelwriter/tools/manusbuild.py

@@ -30,7 +30,7 @@ from pathlib import Path
 from PyQt5.QtCore import QTimer, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFileDialog,
+    QAbstractButton, QAbstractItemView, QDialogButtonBox, QFileDialog,
     QGridLayout, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
     QPushButton, QSplitter, QVBoxLayout, QWidget
 )
@@ -42,14 +42,14 @@ from novelwriter.core.buildsettings import BuildSettings
 from novelwriter.core.docbuild import NWBuildDocument
 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.extensions.modified import NDialog, NIconToolButton
+from novelwriter.extensions.progressbars import NProgressSimple
 from novelwriter.types import QtAlignCenter, QtDialogClose, QtRoleAction, QtRoleReject, QtUserRole
 
 logger = logging.getLogger(__name__)
 
 
-class GuiManuscriptBuild(QDialog):
+class GuiManuscriptBuild(NDialog):
     """GUI Tools: Manuscript Build Dialog
 
     This is the tool for running the build itself. It can be accessed
@@ -220,7 +220,7 @@ class GuiManuscriptBuild(QDialog):
 
         self.btnBuild.setFocus()
         self._populateContentList()
-        self.buildPath.setText(str(self._build.lastPath))
+        self.buildPath.setText(str(self._build.lastBuildPath))
         if self._build.lastBuildName:
             self.buildName.setText(self._build.lastBuildName)
         else:
@@ -250,7 +250,7 @@ class GuiManuscriptBuild(QDialog):
         """
         self._saveSettings()
         event.accept()
-        self.deleteLater()
+        self.softDelete()
         return
 
     ##
@@ -274,7 +274,7 @@ class GuiManuscriptBuild(QDialog):
     def _doSelectPath(self) -> None:
         """Select a folder for output."""
         bPath = Path(self.buildPath.text())
-        bPath = bPath if bPath.is_dir() else self._build.lastPath
+        bPath = bPath if bPath.is_dir() else self._build.lastBuildPath
         savePath = QFileDialog.getExistingDirectory(
             self, self.tr("Select Folder"), str(bPath)
         )
@@ -327,7 +327,7 @@ class GuiManuscriptBuild(QDialog):
                 return False
 
         # Make sure editor content is saved before we start
-        SHARED.mainGui.saveDocument()
+        SHARED.saveEditor()
 
         docBuild = NWBuildDocument(SHARED.project, self._build)
         docBuild.queueAll()
@@ -336,7 +336,7 @@ class GuiManuscriptBuild(QDialog):
         for i, _ in docBuild.iterBuild(buildPath, bFormat):
             self.buildProgress.setValue(i+1)
 
-        self._build.setLastPath(bPath)
+        self._build.setLastBuildPath(bPath)
         self._build.setLastBuildName(bName)
         self._build.setLastFormat(bFormat)
 
@@ -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