novelWriter 2.6.2__py3-none-any.whl → 2.7b1__py3-none-any.whl

novelwriter/guimain.py

@@ -30,11 +30,11 @@ 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 (
+from PyQt6.QtCore import Qt, QTimer, pyqtSlot
+from PyQt6.QtGui import QCloseEvent, QCursor, QIcon, QShortcut
+from PyQt6.QtWidgets import (
     QApplication, QFileDialog, QHBoxLayout, QMainWindow, QMessageBox,
-    QShortcut, QSplitter, QStackedWidget, QVBoxLayout, QWidget
+    QSplitter, QStackedWidget, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED, __hexversion__, __version__
@@ -56,7 +56,6 @@ from novelwriter.gui.projtree import GuiProjectView
 from novelwriter.gui.search import GuiProjectSearch
 from novelwriter.gui.sidebar import GuiSideBar
 from novelwriter.gui.statusbar import GuiMainStatus
-from novelwriter.gui.theme import GuiTheme
 from novelwriter.tools.dictionaries import GuiDictionaries
 from novelwriter.tools.manuscript import GuiManuscript
 from novelwriter.tools.noveldetails import GuiNovelDetails
@@ -92,8 +91,8 @@ class GuiMain(QMainWindow):
         logger.info("OS: %s", CONFIG.osType)
         logger.info("Kernel: %s", CONFIG.kernelVer)
         logger.info("Host: %s", CONFIG.hostName)
-        logger.info("Qt5: %s (0x%06x)", CONFIG.verQtString, CONFIG.verQtValue)
-        logger.info("PyQt5: %s (0x%06x)", CONFIG.verPyQtString, CONFIG.verPyQtValue)
+        logger.info("Qt: %s (0x%06x)", CONFIG.verQtString, CONFIG.verQtValue)
+        logger.info("PyQt: %s (0x%06x)", CONFIG.verPyQtString, CONFIG.verPyQtValue)
         logger.info("Python: %s (0x%08x)", CONFIG.verPyString, sys.hexversion)
         logger.info("GUI Language: %s", CONFIG.guiLocale)
 
@@ -101,7 +100,7 @@ class GuiMain(QMainWindow):
         # ============
 
         # Initialise UserData Instance
-        SHARED.initSharedData(self, GuiTheme())
+        SHARED.initSharedData(self)
 
         # Prepare Main Window
         self.resize(*CONFIG.mainWinSize)
@@ -115,10 +114,6 @@ class GuiMain(QMainWindow):
         # Build the GUI
         # =============
 
-        # Sizes
-        mPx = CONFIG.pxInt(4)
-        hWd = CONFIG.pxInt(4)
-
         # Main GUI Elements
         self.mainStatus     = GuiMainStatus(self)
         self.projView       = GuiProjectView(self)
@@ -143,7 +138,7 @@ class GuiMain(QMainWindow):
         self.treePane = QWidget(self)
         self.treeBox = QVBoxLayout()
         self.treeBox.setContentsMargins(0, 0, 0, 0)
-        self.treeBox.setSpacing(mPx)
+        self.treeBox.setSpacing(4)
         self.treeBox.addWidget(self.projStack)
         self.treeBox.addWidget(self.itemDetails)
         self.treePane.setLayout(self.treeBox)
@@ -152,7 +147,7 @@ class GuiMain(QMainWindow):
         self.splitView = QSplitter(Qt.Orientation.Vertical, self)
         self.splitView.addWidget(self.docViewer)
         self.splitView.addWidget(self.docViewerPanel)
-        self.splitView.setHandleWidth(hWd)
+        self.splitView.setHandleWidth(4)
         self.splitView.setOpaqueResize(False)
         self.splitView.setSizes(CONFIG.viewPanePos)
         self.splitView.setCollapsible(0, False)
@@ -163,7 +158,7 @@ class GuiMain(QMainWindow):
         self.splitDocs.addWidget(self.docEditor)
         self.splitDocs.addWidget(self.splitView)
         self.splitDocs.setOpaqueResize(False)
-        self.splitDocs.setHandleWidth(hWd)
+        self.splitDocs.setHandleWidth(4)
         self.splitDocs.setCollapsible(0, False)
         self.splitDocs.setCollapsible(1, False)
 
@@ -173,7 +168,7 @@ class GuiMain(QMainWindow):
         self.splitMain.addWidget(self.treePane)
         self.splitMain.addWidget(self.splitDocs)
         self.splitMain.setOpaqueResize(False)
-        self.splitMain.setHandleWidth(hWd)
+        self.splitMain.setHandleWidth(4)
         self.splitMain.setSizes(CONFIG.mainPanePos)
         self.splitMain.setCollapsible(0, False)
         self.splitMain.setCollapsible(0, False)
@@ -252,8 +247,6 @@ class GuiMain(QMainWindow):
         self.docEditor.itemHandleChanged.connect(self.novelView.setActiveHandle)
         self.docEditor.itemHandleChanged.connect(self.projView.setActiveHandle)
         self.docEditor.loadDocumentTagRequest.connect(self._followTag)
-        self.docEditor.novelItemMetaChanged.connect(self.novelView.updateNovelItemMeta)
-        self.docEditor.novelStructureChanged.connect(self.novelView.refreshTree)
         self.docEditor.openDocumentRequest.connect(self._openDocument)
         self.docEditor.requestNewNoteCreation.connect(SHARED.createNewNote)
         self.docEditor.requestNextDocument.connect(self.openNextDocument)
@@ -377,7 +370,7 @@ class GuiMain(QMainWindow):
             return True
 
         if not isYes:
-            msgYes = SHARED.question("%s<br>%s" % (
+            msgYes = SHARED.question("{0}<br>{1}".format(
                 self.tr("Close the current project?"),
                 self.tr("Changes are saved automatically.")
             ))
@@ -537,7 +530,7 @@ class GuiMain(QMainWindow):
     ) -> bool:
         """Open a specific document, optionally at a given line."""
         if not (SHARED.hasProject and tHandle):
-            logger.error("Nothing to open open")
+            logger.error("Nothing to open")
             return False
 
         if sTitle and tLine is None:
@@ -740,7 +733,6 @@ class GuiMain(QMainWindow):
 
             SHARED.project.index.rebuild()
             SHARED.project.tree.refreshAllItems()
-            self.novelView.refreshTree()
 
             tEnd = time()
             self.mainStatus.setStatusMessage(
@@ -852,7 +844,7 @@ class GuiMain(QMainWindow):
 
     def closeMain(self) -> bool:
         """Save everything, and close novelWriter."""
-        if SHARED.hasProject and CONFIG.askBeforeExit and not SHARED.question("%s<br>%s" % (
+        if SHARED.hasProject and CONFIG.askBeforeExit and not SHARED.question("{0}<br>{1}".format(
             self.tr("Do you want to exit novelWriter?"),
             self.tr("Changes are saved automatically.")
         )):
@@ -861,10 +853,10 @@ class GuiMain(QMainWindow):
         logger.info("Exiting novelWriter")
 
         if not SHARED.focusMode:
-            CONFIG.setMainPanePos(self.splitMain.sizes())
-            CONFIG.setOutlinePanePos(self.outlineView.splitSizes())
+            CONFIG.mainPanePos = self.splitMain.sizes()
+            CONFIG.outlinePanePos = self.outlineView.splitSizes()
             if self.docViewerPanel.isVisible():
-                CONFIG.setViewPanePos(self.splitView.sizes())
+                CONFIG.viewPanePos = self.splitView.sizes()
 
         CONFIG.showViewerPanel = self.docViewerPanel.isVisible()
         wFull = Qt.WindowState.WindowFullScreen
@@ -1017,7 +1009,7 @@ class GuiMain(QMainWindow):
             fN = self.novelView.treeHasFocus()
 
             self._changeView(nwView.EDITOR)
-            if (vM and (vP and fP or vN and not fN)) or (not vM and vN):
+            if (vM and ((vP and fP) or (vN and not fN))) or (not vM and vN):
                 self._changeView(nwView.NOVEL)
                 self.novelView.setTreeFocus()
             else:
@@ -1051,9 +1043,8 @@ class GuiMain(QMainWindow):
             SHARED.project.tree.refreshAllItems()
 
         if theme:
-            # We are doing this manually instead of connecting to
-            # paletteChanged since the processing order matters
             SHARED.theme.loadTheme()
+            self.setPalette(QApplication.palette())
             self.docEditor.updateTheme()
             self.docViewer.updateTheme()
             self.docViewerPanel.updateTheme()
@@ -1064,10 +1055,11 @@ class GuiMain(QMainWindow):
             self.outlineView.updateTheme()
             self.itemDetails.updateTheme()
             self.mainStatus.updateTheme()
+            SHARED.project.tree.refreshAllItems()
 
         if syntax:
             SHARED.theme.loadSyntax()
-            self.docEditor.updateSyntaxColours()
+            self.docEditor.updateSyntaxColors()
 
         self.docEditor.initEditor()
         self.docViewer.initViewer()
@@ -1179,6 +1171,12 @@ class GuiMain(QMainWindow):
             )
         elif view == nwView.OUTLINE:
             self.mainStack.setCurrentWidget(self.outlineView)
+
+        # Set active status
+        isMain = self.mainStack.currentWidget() == self.splitMain
+        isNovel = self.projStack.currentWidget() == self.novelView
+        self.novelView.setActive(isMain and isNovel)
+
         return
 
     @pyqtSlot(nwDocAction)

novelwriter/shared.py

@@ -31,16 +31,16 @@ from pathlib import Path
 from time import time
 from typing import TYPE_CHECKING, TypeVar
 
-from PyQt5.QtCore import QObject, QRunnable, QThreadPool, QTimer, QUrl, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import QDesktopServices, QFont
-from PyQt5.QtWidgets import QFileDialog, QFontDialog, QMessageBox, QWidget
+from PyQt6.QtCore import QObject, QRunnable, QThreadPool, QTimer, QUrl, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QDesktopServices, QFont
+from PyQt6.QtWidgets import QFileDialog, QFontDialog, QMessageBox, QWidget
 
 from novelwriter.common import formatFileFilter
 from novelwriter.constants import nwFiles
 from novelwriter.core.spellcheck import NWSpellEnchant
 from novelwriter.enum import nwChange, nwItemClass
 
-if TYPE_CHECKING:  # pragma: no cover
+if TYPE_CHECKING:
     from novelwriter.core.project import NWProject
     from novelwriter.core.status import T_StatusKind
     from novelwriter.gui.theme import GuiTheme
@@ -54,8 +54,8 @@ NWWidget = TypeVar("NWWidget", bound=QWidget)
 class SharedData(QObject):
 
     __slots__ = (
-        "_gui", "_theme", "_project", "_spelling", "_lockedBy", "_lastAlert",
-        "_idleTime", "_idleRefTime",
+        "_gui", "_idleRefTime", "_idleTime", "_lastAlert", "_lockedBy",
+        "_project", "_spelling", "_theme",
     )
 
     focusModeChanged = pyqtSignal(bool)
@@ -63,10 +63,11 @@ class SharedData(QObject):
     indexChangedTags = pyqtSignal(list, list)
     indexCleared = pyqtSignal()
     mainClockTick = pyqtSignal()
+    novelStructureChanged = pyqtSignal(str)
     projectItemChanged = pyqtSignal(str, Enum)
-    rootFolderChanged = pyqtSignal(str, Enum)
     projectStatusChanged = pyqtSignal(bool)
     projectStatusMessage = pyqtSignal(str)
+    rootFolderChanged = pyqtSignal(str, Enum)
     spellLanguageChanged = pyqtSignal(str, str)
     statusLabelsChanged = pyqtSignal(str)
 
@@ -100,28 +101,28 @@ class SharedData(QObject):
     def mainGui(self) -> GuiMain:
         """Return the Main GUI instance."""
         if self._gui is None:
-            raise Exception("SharedData class not fully initialised")
+            raise RuntimeError("SharedData class not fully initialised")
         return self._gui
 
     @property
     def theme(self) -> GuiTheme:
         """Return the GUI Theme instance."""
         if self._theme is None:
-            raise Exception("SharedData class not fully initialised")
+            raise RuntimeError("SharedData class not fully initialised")
         return self._theme
 
     @property
     def project(self) -> NWProject:
         """Return the active NWProject instance."""
         if self._project is None:
-            raise Exception("SharedData class not fully initialised")
+            raise RuntimeError("SharedData class not fully initialised")
         return self._project
 
     @property
     def spelling(self) -> NWSpellEnchant:
         """Return the active NWProject instance."""
         if self._spelling is None:
-            raise Exception("SharedData class not fully initialised")
+            raise RuntimeError("SharedData class not fully initialised")
         return self._spelling
 
     @property
@@ -164,17 +165,24 @@ class SharedData(QObject):
     #  Methods
     ##
 
-    def initSharedData(self, gui: GuiMain, theme: GuiTheme) -> None:
+    def initTheme(self, theme: GuiTheme) -> None:
+        """Initialise the GUI theme. This must be called before the GUI
+        is created.
+        """
+        self._theme = theme
+        return
+
+    def initSharedData(self, gui: GuiMain) -> None:
         """Initialise the SharedData instance. This must be called as
         soon as the Main GUI is created to ensure the SHARED singleton
         has the properties needed for operation.
         """
         self._clock.start()
         self._gui = gui
-        self._theme = theme
         self._resetProject()
         logger.debug("Ready: SharedData")
-        logger.debug("Thread Pool Max Count: %d", QThreadPool.globalInstance().maxThreadCount())
+        if pool := QThreadPool.globalInstance():
+            logger.debug("Thread Pool Max Count: %d", pool.maxThreadCount())
         return
 
     def closeDocument(self, tHandle: str | None = None) -> None:
@@ -266,7 +274,8 @@ class SharedData(QObject):
 
     def runInThreadPool(self, runnable: QRunnable, priority: int = 0) -> None:
         """Queue a runnable in the application thread pool."""
-        QThreadPool.globalInstance().start(runnable, priority=priority)
+        if pool := QThreadPool.globalInstance():
+            pool.start(runnable, priority=priority)
         return
 
     def getProjectPath(
@@ -278,13 +287,13 @@ class SharedData(QObject):
         label = (self.tr("novelWriter Project File or Zip File")
                  if allowZip else self.tr("novelWriter Project File"))
         ext = f"{nwFiles.PROJ_FILE} *.zip" if allowZip else nwFiles.PROJ_FILE
-        ffilter = formatFileFilter([(label, ext), "*"])
+        fFilter = formatFileFilter([(label, ext), "*"])
         selected, _ = QFileDialog.getOpenFileName(
-            parent, self.tr("Open Project"), str(path or ""), filter=ffilter
+            parent, self.tr("Open Project"), str(path or ""), filter=fFilter
         )
         return Path(selected) if selected else None
 
-    def getFont(self, current: QFont, native: bool) -> tuple[QFont, bool]:
+    def getFont(self, current: QFont, native: bool) -> tuple[QFont, bool | None]:
         """Open the font dialog and select a font."""
         kwargs = {}
         if not native:
@@ -471,7 +480,7 @@ class _GuiAlert(QMessageBox):
     def setException(self, exception: Exception) -> None:
         """Add exception details."""
         info = self.informativeText()
-        text = f"<b>{type(exception).__name__}</b>: {str(exception)}"
+        text = f"<b>{type(exception).__name__}</b>: {exception!s}"
         self.setInformativeText(f"{info}<br>{text}" if info else text)
         return
 
@@ -485,15 +494,15 @@ class _GuiAlert(QMessageBox):
             self.setStandardButtons(QMessageBox.StandardButton.Ok)
         pSz = 2*self._theme.baseIconHeight
         if level == self.INFO:
-            self.setIconPixmap(self._theme.getPixmap("alert_info", (pSz, pSz)))
+            self.setIconPixmap(self._theme.getPixmap("alert_info", (pSz, pSz), "blue"))
             self.setWindowTitle(self.tr("Information"))
         elif level == self.WARN:
-            self.setIconPixmap(self._theme.getPixmap("alert_warn", (pSz, pSz)))
+            self.setIconPixmap(self._theme.getPixmap("alert_warn", (pSz, pSz), "orange"))
             self.setWindowTitle(self.tr("Warning"))
         elif level == self.ERROR:
-            self.setIconPixmap(self._theme.getPixmap("alert_error", (pSz, pSz)))
+            self.setIconPixmap(self._theme.getPixmap("alert_error", (pSz, pSz), "red"))
             self.setWindowTitle(self.tr("Error"))
         elif level == self.ASK:
-            self.setIconPixmap(self._theme.getPixmap("alert_question", (pSz, pSz)))
+            self.setIconPixmap(self._theme.getPixmap("alert_question", (pSz, pSz), "blue"))
             self.setWindowTitle(self.tr("Question"))
         return

novelwriter/text/comments.py

@@ -0,0 +1,70 @@
+"""
+novelWriter – Text Comments
+===========================
+
+File History:
+Created: 2023-11-23 [2.2b1]
+Moved:   2025-02-09 [2.7b1]
+
+This file is a part of novelWriter
+Copyright (C) 2025 Veronica Berglyd Olsen and novelWriter contributors
+
+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 novelwriter.enum import nwComment
+
+MODIFIERS = {
+    "synopsis": nwComment.SYNOPSIS,
+    "short":    nwComment.SHORT,
+    "note":     nwComment.NOTE,
+    "footnote": nwComment.FOOTNOTE,
+    "story":    nwComment.STORY,
+}
+KEY_REQ = {
+    "synopsis": 0,  # Key not allowed
+    "short":    0,  # Key not allowed
+    "note":     1,  # Key optional
+    "footnote": 2,  # Key required
+    "story":    2,  # Key required
+}
+
+
+def _checkModKey(modifier: str, key: str) -> bool:
+    """Check if a modifier and key set are ok."""
+    if modifier in MODIFIERS:
+        if key == "":
+            return KEY_REQ[modifier] < 2
+        elif key.replace("_", "").isalnum():
+            return KEY_REQ[modifier] > 0
+    return False
+
+
+def processComment(text: str) -> tuple[nwComment, str, str, int, int]:
+    """Extract comment style, key and text. Should only be called on
+    text starting with a %.
+    """
+    if text[:2] == "%~":
+        return nwComment.IGNORE, "", text[2:].lstrip(), 0, 0
+
+    check = text[1:].strip()
+    start, _, content = check.partition(":")
+    modifier, _, key = start.rstrip().partition(".")
+    if content and (clean := modifier.lower()) and _checkModKey(clean, key):
+        col = text.find(":") + 1
+        dot = text.find(".", 0, col) + 1
+        return MODIFIERS[clean], key, content.lstrip(), dot, col
+
+    return nwComment.PLAIN, "", check, 0, 0

novelwriter/text/patterns.py

@@ -93,7 +93,7 @@ class RegExPatterns:
             if CONFIG.dialogStyle in (1, 3):
                 qO = CONFIG.fmtSQuoteOpen.strip()[:1]
                 qC = CONFIG.fmtSQuoteClose.strip()[:1]
-                if qO == qC:
+                if qO == qC or qC in self.AMBIGUOUS:
                     rx.append(f"(?:\\B{qO}.+?{qC}\\B)")
                 else:
                     rx.append(f"(?:{qO}[^{qO}]+{qC})")
@@ -102,7 +102,7 @@ class RegExPatterns:
             if CONFIG.dialogStyle in (2, 3):
                 qO = CONFIG.fmtDQuoteOpen.strip()[:1]
                 qC = CONFIG.fmtDQuoteClose.strip()[:1]
-                if qO == qC:
+                if qO == qC or qC in self.AMBIGUOUS:
                     rx.append(f"(?:\\B{qO}.+?{qC}\\B)")
                 else:
                     rx.append(f"(?:{qO}[^{qO}]+{qC})")
@@ -128,8 +128,8 @@ REGEX_PATTERNS = RegExPatterns()
 class DialogParser:
 
     __slots__ = (
-        "_quotes", "_dialog", "_alternate", "_enabled",
-        "_narrator", "_breakD", "_breakQ", "_mode",
+        "_alternate", "_breakD", "_breakQ", "_dialog", "_enabled", "_mode",
+        "_narrator", "_quotes",
     )
 
     def __init__(self) -> None:

novelwriter/tools/dictionaries.py

@@ -28,18 +28,18 @@ import logging
 from pathlib import Path
 from zipfile import ZipFile
 
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QCloseEvent, QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QCloseEvent, QTextCursor
+from PyQt6.QtWidgets import (
     QApplication, QDialogButtonBox, QFileDialog, QFrame, QHBoxLayout, QLabel,
     QLineEdit, QPlainTextEdit, QPushButton, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import cssCol, formatFileFilter, formatInt, getFileSize, openExternalPath
+from novelwriter.common import formatFileFilter, formatInt, getFileSize, openExternalPath
 from novelwriter.error import formatException
 from novelwriter.extensions.modified import NIconToolButton, NNonBlockingDialog
-from novelwriter.types import QtDialogClose
+from novelwriter.types import QtDialogClose, QtHexArgb
 
 logger = logging.getLogger(__name__)
 
@@ -57,12 +57,9 @@ class GuiDictionaries(NNonBlockingDialog):
         self._currDicts = set()
 
         iSz = SHARED.theme.baseIconSize
-        iPx = CONFIG.pxInt(4)
-        mPx = CONFIG.pxInt(8)
-        sPx = CONFIG.pxInt(16)
 
-        self.setMinimumWidth(CONFIG.pxInt(500))
-        self.setMinimumHeight(CONFIG.pxInt(300))
+        self.setMinimumWidth(500)
+        self.setMinimumHeight(300)
 
         # Hunspell Dictionaries
         loUrl = "https://extensions.libreoffice.org"
@@ -78,13 +75,13 @@ class GuiDictionaries(NNonBlockingDialog):
         self.huBrowse = NIconToolButton(self, iSz, "browse")
         self.huBrowse.clicked.connect(self._doBrowseHunspell)
         self.huImport = QPushButton(self.tr("Add Dictionary"), self)
-        self.huImport.setIcon(SHARED.theme.getIcon("add"))
+        self.huImport.setIcon(SHARED.theme.getIcon("add", "green"))
         self.huImport.clicked.connect(self._doImportHunspell)
 
         self.huPathBox = QHBoxLayout()
         self.huPathBox.addWidget(self.huInput)
         self.huPathBox.addWidget(self.huBrowse)
-        self.huPathBox.setSpacing(iPx)
+        self.huPathBox.setSpacing(4)
         self.huAddBox = QHBoxLayout()
         self.huAddBox.addStretch(1)
         self.huAddBox.addWidget(self.huImport)
@@ -99,12 +96,11 @@ class GuiDictionaries(NNonBlockingDialog):
         self.inBox = QHBoxLayout()
         self.inBox.addWidget(self.inPath)
         self.inBox.addWidget(self.inBrowse)
-        self.inBox.setSpacing(iPx)
+        self.inBox.setSpacing(4)
 
         # Info Box
         self.infoBox = QPlainTextEdit(self)
         self.infoBox.setReadOnly(True)
-        self.infoBox.setFixedHeight(4*SHARED.theme.fontPixelSize)
         self.infoBox.setFrameStyle(QFrame.Shape.NoFrame)
 
         # Buttons
@@ -112,21 +108,16 @@ class GuiDictionaries(NNonBlockingDialog):
         self.buttonBox.rejected.connect(self.reject)
 
         # Assemble
-        self.innerBox = QVBoxLayout()
-        self.innerBox.addWidget(self.huInfo)
-        self.innerBox.addLayout(self.huPathBox)
-        self.innerBox.addLayout(self.huAddBox)
-        self.innerBox.addSpacing(mPx)
-        self.innerBox.addWidget(self.inInfo)
-        self.innerBox.addLayout(self.inBox)
-        self.innerBox.addWidget(self.infoBox)
-        self.innerBox.setSpacing(iPx)
-
         self.outerBox = QVBoxLayout()
-        self.outerBox.addLayout(self.innerBox, 0)
-        self.outerBox.addStretch(1)
+        self.outerBox.addWidget(self.huInfo, 0)
+        self.outerBox.addLayout(self.huPathBox, 0)
+        self.outerBox.addLayout(self.huAddBox, 0)
+        self.outerBox.addSpacing(8)
+        self.outerBox.addWidget(self.inInfo, 0)
+        self.outerBox.addLayout(self.inBox, 0)
+        self.outerBox.addWidget(self.infoBox, 1)
+        self.outerBox.addSpacing(8)
         self.outerBox.addWidget(self.buttonBox, 0)
-        self.outerBox.setSpacing(sPx)
 
         self.setLayout(self.outerBox)
 
@@ -251,8 +242,8 @@ class GuiDictionaries(NNonBlockingDialog):
         cursor.movePosition(QTextCursor.MoveOperation.End)
         if cursor.position() > 0:
             cursor.insertText("\n")
-        textCol = cssCol(SHARED.theme.errorText if err else self.palette().text().color())
-        cursor.insertHtml(f"<font style='color: {textCol}'>{text}</font>")
+        textCol = SHARED.theme.errorText if err else self.palette().text().color()
+        cursor.insertHtml(f"<font style='color: {textCol.name(QtHexArgb)}'>{text}</font>")
         cursor.movePosition(QTextCursor.MoveOperation.End)
         cursor.deleteChar()
         self.infoBox.setTextCursor(cursor)

novelwriter/tools/lipsum.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 import logging
 import random
 
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import (
     QDialogButtonBox, QGridLayout, QHBoxLayout, QLabel, QSpinBox, QVBoxLayout,
     QWidget
 )
@@ -52,18 +52,15 @@ class GuiLipsum(NDialog):
 
         self._lipsumText = ""
 
-        vSp = CONFIG.pxInt(4)
-        nPx = CONFIG.pxInt(64)
-
         self.innerBox = QHBoxLayout()
-        self.innerBox.setSpacing(CONFIG.pxInt(16))
+        self.innerBox.setSpacing(16)
 
         # Icon
         self.docIcon = QLabel(self)
-        self.docIcon.setPixmap(SHARED.theme.getPixmap("proj_document", (nPx, nPx)))
+        self.docIcon.setPixmap(SHARED.theme.getPixmap("text", (64, 64), "blue"))
 
         self.leftBox = QVBoxLayout()
-        self.leftBox.setSpacing(vSp)
+        self.leftBox.setSpacing(4)
         self.leftBox.addWidget(self.docIcon)
         self.leftBox.addStretch(1)
         self.innerBox.addLayout(self.leftBox)
@@ -87,7 +84,7 @@ class GuiLipsum(NDialog):
         self.formBox.addWidget(self.paraCount, 1, 1, 1, 1, QtAlignRight)
         self.formBox.addWidget(self.randLabel, 2, 0, 1, 1, QtAlignLeft)
         self.formBox.addWidget(self.randSwitch, 2, 1, 1, 1, QtAlignRight)
-        self.formBox.setVerticalSpacing(vSp)
+        self.formBox.setVerticalSpacing(4)
         self.formBox.setRowStretch(3, 1)
         self.innerBox.addLayout(self.formBox)
 
@@ -96,17 +93,19 @@ class GuiLipsum(NDialog):
         self.buttonBox.rejected.connect(self.reject)
 
         self.btnClose = self.buttonBox.addButton(QtDialogClose)
-        self.btnClose.setAutoDefault(False)
+        if self.btnClose:
+            self.btnClose.setAutoDefault(False)
 
         self.btnInsert = self.buttonBox.addButton(self.tr("Insert"), QtRoleAction)
-        self.btnInsert.clicked.connect(self._doInsert)
-        self.btnInsert.setAutoDefault(False)
+        if self.btnInsert:
+            self.btnInsert.clicked.connect(self._doInsert)
+            self.btnInsert.setAutoDefault(False)
 
         # Assemble
         self.outerBox = QVBoxLayout()
         self.outerBox.addLayout(self.innerBox)
         self.outerBox.addWidget(self.buttonBox)
-        self.outerBox.setSpacing(CONFIG.pxInt(16))
+        self.outerBox.setSpacing(16)
         self.setLayout(self.outerBox)
 
         logger.debug("Ready: GuiLipsum")
@@ -125,10 +124,10 @@ class GuiLipsum(NDialog):
     @classmethod
     def getLipsum(cls, parent: QWidget) -> str:
         """Pop the dialog and return the lipsum text."""
-        cls = GuiLipsum(parent)
-        cls.exec()
-        text = cls.lipsumText
-        cls.softDelete()
+        dialog = cls(parent)
+        dialog.exec()
+        text = dialog.lipsumText
+        dialog.softDelete()
         return text
 
     ##