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

novelwriter/gui/dochighlight.py

@@ -29,8 +29,8 @@ import re
 
 from time import time
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import (
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import (
     QBrush, QColor, QFont, QSyntaxHighlighter, QTextBlockUserData,
     QTextCharFormat, QTextDocument
 )
@@ -38,8 +38,8 @@ from PyQt5.QtGui import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import checkInt
 from novelwriter.constants import nwStyles, nwUnicode
-from novelwriter.core.index import processComment
 from novelwriter.enum import nwComment
+from novelwriter.text.comments import processComment
 from novelwriter.text.patterns import REGEX_PATTERNS, DialogParser
 
 logger = logging.getLogger(__name__)
@@ -58,8 +58,8 @@ BLOCK_TITLE = 4
 class GuiDocHighlighter(QSyntaxHighlighter):
 
     __slots__ = (
-        "_tHandle", "_isNovel", "_isInactive", "_spellCheck", "_spellErr",
-        "_hStyles", "_minRules", "_txtRules", "_cmnRules", "_dialogParser",
+        "_cmnRules", "_dialogParser", "_hStyles", "_isInactive", "_isNovel",
+        "_minRules", "_spellCheck", "_spellErr", "_tHandle", "_txtRules",
     )
 
     def __init__(self, document: QTextDocument) -> None:
@@ -91,44 +91,45 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         rules and building the RegExes.
         """
         logger.debug("Setting up highlighting rules")
+        syntax = SHARED.theme.syntaxTheme
 
-        colEmph = SHARED.theme.colEmph if CONFIG.highlightEmph else None
-        colBreak = QColor(SHARED.theme.colEmph)
+        colEmph = syntax.emph if CONFIG.highlightEmph else None
+        colBreak = QColor(syntax.emph)
         colBreak.setAlpha(64)
 
         # Create Character Formats
-        self._addCharFormat("text",      SHARED.theme.colText)
-        self._addCharFormat("header1",   SHARED.theme.colHead, "b", nwStyles.H_SIZES[1])
-        self._addCharFormat("header2",   SHARED.theme.colHead, "b", nwStyles.H_SIZES[2])
-        self._addCharFormat("header3",   SHARED.theme.colHead, "b", nwStyles.H_SIZES[3])
-        self._addCharFormat("header4",   SHARED.theme.colHead, "b", nwStyles.H_SIZES[4])
-        self._addCharFormat("head1h",    SHARED.theme.colHeadH, "b", nwStyles.H_SIZES[1])
-        self._addCharFormat("head2h",    SHARED.theme.colHeadH, "b", nwStyles.H_SIZES[2])
-        self._addCharFormat("head3h",    SHARED.theme.colHeadH, "b", nwStyles.H_SIZES[3])
-        self._addCharFormat("head4h",    SHARED.theme.colHeadH, "b", nwStyles.H_SIZES[4])
+        self._addCharFormat("text",      syntax.text)
+        self._addCharFormat("header1",   syntax.head, "b", nwStyles.H_SIZES[1])
+        self._addCharFormat("header2",   syntax.head, "b", nwStyles.H_SIZES[2])
+        self._addCharFormat("header3",   syntax.head, "b", nwStyles.H_SIZES[3])
+        self._addCharFormat("header4",   syntax.head, "b", nwStyles.H_SIZES[4])
+        self._addCharFormat("head1h",    syntax.headH, "b", nwStyles.H_SIZES[1])
+        self._addCharFormat("head2h",    syntax.headH, "b", nwStyles.H_SIZES[2])
+        self._addCharFormat("head3h",    syntax.headH, "b", nwStyles.H_SIZES[3])
+        self._addCharFormat("head4h",    syntax.headH, "b", nwStyles.H_SIZES[4])
         self._addCharFormat("bold",      colEmph, "b")
         self._addCharFormat("italic",    colEmph, "i")
-        self._addCharFormat("strike",    SHARED.theme.colHidden, "s")
-        self._addCharFormat("mspaces",   SHARED.theme.colError, "err")
+        self._addCharFormat("strike",    syntax.hidden, "s")
+        self._addCharFormat("mspaces",   syntax.error, "err")
         self._addCharFormat("nobreak",   colBreak, "bg")
-        self._addCharFormat("altdialog", SHARED.theme.colDialA)
-        self._addCharFormat("dialog",    SHARED.theme.colDialN)
-        self._addCharFormat("replace",   SHARED.theme.colRepTag)
-        self._addCharFormat("hidden",    SHARED.theme.colHidden)
-        self._addCharFormat("markup",    SHARED.theme.colHidden)
-        self._addCharFormat("link",      SHARED.theme.colLink, "u")
-        self._addCharFormat("note",      SHARED.theme.colNote)
-        self._addCharFormat("code",      SHARED.theme.colCode)
-        self._addCharFormat("keyword",   SHARED.theme.colKey)
-        self._addCharFormat("tag",       SHARED.theme.colTag, "u")
-        self._addCharFormat("modifier",  SHARED.theme.colMod)
-        self._addCharFormat("value",     SHARED.theme.colVal)
-        self._addCharFormat("optional",  SHARED.theme.colOpt)
+        self._addCharFormat("altdialog", syntax.dialA)
+        self._addCharFormat("dialog",    syntax.dialN)
+        self._addCharFormat("replace",   syntax.repTag)
+        self._addCharFormat("hidden",    syntax.hidden)
+        self._addCharFormat("markup",    syntax.hidden)
+        self._addCharFormat("link",      syntax.link, "u")
+        self._addCharFormat("note",      syntax.note)
+        self._addCharFormat("code",      syntax.code)
+        self._addCharFormat("keyword",   syntax.key)
+        self._addCharFormat("tag",       syntax.tag, "u")
+        self._addCharFormat("modifier",  syntax.mod)
+        self._addCharFormat("value",     syntax.val)
+        self._addCharFormat("optional",  syntax.opt)
         self._addCharFormat("invalid",   None, "err")
 
         # Cache Spell Error Format
         self._spellErr = QTextCharFormat()
-        self._spellErr.setUnderlineColor(SHARED.theme.colSpell)
+        self._spellErr.setUnderlineColor(syntax.spell)
         self._spellErr.setUnderlineStyle(QTextCharFormat.UnderlineStyle.SpellCheckUnderline)
 
         self._txtRules.clear()
@@ -271,14 +272,14 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         """Loop through all blocks and re-highlight those of a given
         content type.
         """
-        qDoc = self.document()
-        nBlocks = qDoc.blockCount()
-        tStart = time()
-        for i in range(nBlocks):
-            block = qDoc.findBlockByNumber(i)
-            if block.userState() & cType > 0:
-                self.rehighlightBlock(block)
-        logger.debug("Document highlighted in %.3f ms" % (1000*(time() - tStart)))
+        if document := self.document():
+            nBlocks = document.blockCount()
+            tStart = time()
+            for i in range(nBlocks):
+                block = document.findBlockByNumber(i)
+                if block.userState() & cType > 0:
+                    self.rehighlightBlock(block)
+            logger.debug("Document highlighted in %.3f ms" % (1000*(time() - tStart)))
         return
 
     ##
@@ -392,7 +393,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         else:  # Text Paragraph
             self.setCurrentBlockState(BLOCK_TEXT)
             hRules = self._txtRules if self._isNovel else self._minRules
-            if self._dialogParser.enabled:
+            if self._isNovel and self._dialogParser.enabled:
                 for pos, end in self._dialogParser(text):
                     length = end - pos
                     self.setFormat(pos, length, self._hStyles["dialog"])
@@ -450,7 +451,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
             if "s" in styles:
                 charFormat.setFontStrikeOut(True)
             if "err" in styles:
-                charFormat.setUnderlineColor(SHARED.theme.colError)
+                charFormat.setUnderlineColor(SHARED.theme.syntaxTheme.error)
                 charFormat.setUnderlineStyle(QTextCharFormat.UnderlineStyle.SpellCheckUnderline)
             if "bg" in styles and color is not None:
                 charFormat.setBackground(QBrush(color, Qt.BrushStyle.SolidPattern))
@@ -465,14 +466,14 @@ class GuiDocHighlighter(QSyntaxHighlighter):
 
 class TextBlockData(QTextBlockUserData):
 
-    __slots__ = ("_text", "_offset", "_metaData", "_spellErrors")
+    __slots__ = ("_metaData", "_offset", "_spellErrors", "_text")
 
     def __init__(self) -> None:
         super().__init__()
         self._text = ""
         self._offset = 0
         self._metaData: list[tuple[int, int, str, str]] = []
-        self._spellErrors: list[tuple[int, int,]] = []
+        self._spellErrors: list[tuple[int, int]] = []
         return
 
     @property
@@ -504,7 +505,7 @@ class TextBlockData(QTextBlockUserData):
                     text = f"{text[:s]}{pad}{text[e:]}"
                     self._metaData.append((s, e, res.group(0), "url"))
 
-        self._text = text
+        self._text = text.replace("\u02bc", "'")
         self._offset = offset
 
         return

novelwriter/gui/docviewer.py

@@ -30,22 +30,22 @@ import logging
 
 from enum import Enum
 
-from PyQt5.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import (
+from PyQt6.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import (
     QCursor, QDesktopServices, QDragEnterEvent, QDragMoveEvent, QDropEvent,
     QMouseEvent, QPalette, QResizeEvent, QTextCursor
 )
-from PyQt5.QtWidgets import (
-    QAction, QApplication, QFrame, QHBoxLayout, QMenu, QTextBrowser,
-    QToolButton, QWidget
+from PyQt6.QtWidgets import (
+    QApplication, QFrame, QHBoxLayout, QMenu, QTextBrowser, QToolButton,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import decodeMimeHandles, qtLambda
+from novelwriter.common import decodeMimeHandles, qtAddAction, qtLambda
 from novelwriter.constants import nwConst, nwStyles, nwUnicode
-from novelwriter.enum import nwChange, nwDocAction, nwDocMode, nwItemType
+from novelwriter.enum import nwChange, nwComment, nwDocAction, nwDocMode, nwItemType
 from novelwriter.error import logException
-from novelwriter.extensions.configlayout import NColourLabel
+from novelwriter.extensions.configlayout import NColorLabel
 from novelwriter.extensions.eventfilters import WheelEventFilter
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.formats.shared import TextDocumentTheme
@@ -79,7 +79,7 @@ class GuiDocViewer(QTextBrowser):
         self._docTheme = TextDocumentTheme()
 
         # Settings
-        self.setMinimumWidth(CONFIG.pxInt(300))
+        self.setMinimumWidth(300)
         self.setAutoFillBackground(True)
         self.setOpenLinks(False)
         self.setOpenExternalLinks(False)
@@ -124,8 +124,7 @@ class GuiDocViewer(QTextBrowser):
     @property
     def scrollPosition(self) -> int:
         """Return the scrollbar position."""
-        vBar = self.verticalScrollBar()
-        if vBar.isVisible():
+        if (vBar := self.verticalScrollBar()) and vBar.isVisible():
             return vBar.value()
         return 0
 
@@ -155,36 +154,40 @@ class GuiDocViewer(QTextBrowser):
         self.docFooter.updateFont()
 
         # Set the widget colours to match syntax theme
-        mainPalette = self.palette()
-        mainPalette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
-        mainPalette.setColor(QPalette.ColorRole.Base, SHARED.theme.colBack)
-        mainPalette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
-        self.setPalette(mainPalette)
-
-        docPalette = self.viewport().palette()
-        docPalette.setColor(QPalette.ColorRole.Base, SHARED.theme.colBack)
-        docPalette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
-        self.viewport().setPalette(docPalette)
-        self.docHeader.matchColours()
-        self.docFooter.matchColours()
+        syntax = SHARED.theme.syntaxTheme
+
+        palette = self.palette()
+        palette.setColor(QPalette.ColorRole.Window, syntax.back)
+        palette.setColor(QPalette.ColorRole.Base, syntax.back)
+        palette.setColor(QPalette.ColorRole.Text, syntax.text)
+        self.setPalette(palette)
+
+        if viewport := self.viewport():
+            palette = viewport.palette()
+            palette.setColor(QPalette.ColorRole.Base, syntax.back)
+            palette.setColor(QPalette.ColorRole.Text, syntax.text)
+            viewport.setPalette(palette)
+            self.docHeader.matchColors()
+            self.docFooter.matchColors()
 
         # Update theme colours
-        self._docTheme.text      = SHARED.theme.colText
-        self._docTheme.highlight = SHARED.theme.colMark
-        self._docTheme.head      = SHARED.theme.colHead
-        self._docTheme.link      = SHARED.theme.colLink
-        self._docTheme.comment   = SHARED.theme.colHidden
-        self._docTheme.note      = SHARED.theme.colNote
-        self._docTheme.code      = SHARED.theme.colCode
-        self._docTheme.modifier  = SHARED.theme.colMod
-        self._docTheme.keyword   = SHARED.theme.colKey
-        self._docTheme.tag       = SHARED.theme.colTag
-        self._docTheme.optional  = SHARED.theme.colOpt
-        self._docTheme.dialog    = SHARED.theme.colDialN
-        self._docTheme.altdialog = SHARED.theme.colDialA
+        self._docTheme.text      = syntax.text
+        self._docTheme.highlight = syntax.mark
+        self._docTheme.head      = syntax.head
+        self._docTheme.link      = syntax.link
+        self._docTheme.comment   = syntax.hidden
+        self._docTheme.note      = syntax.note
+        self._docTheme.code      = syntax.code
+        self._docTheme.modifier  = syntax.mod
+        self._docTheme.keyword   = syntax.key
+        self._docTheme.tag       = syntax.tag
+        self._docTheme.optional  = syntax.opt
+        self._docTheme.dialog    = syntax.dialN
+        self._docTheme.altdialog = syntax.dialA
 
         # Set default text margins
-        self.document().setDocumentMargin(0)
+        if document := self.document():
+            document.setDocumentMargin(0)
 
         # Scroll bars
         if CONFIG.hideVScroll:
@@ -198,7 +201,7 @@ class GuiDocViewer(QTextBrowser):
             self.setHorizontalScrollBarPolicy(QtScrollAsNeeded)
 
         # Refresh the tab stops
-        self.setTabStopDistance(CONFIG.getTabWidth())
+        self.setTabStopDistance(CONFIG.tabWidth)
 
         # If we have a document open, we should reload it in case the font changed
         self.reloadText()
@@ -215,7 +218,9 @@ class GuiDocViewer(QTextBrowser):
         logger.debug("Generating preview for item '%s'", tHandle)
         QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
 
-        sPos = self.verticalScrollBar().value()
+        vBar = self.verticalScrollBar()
+        sPos = vBar.value() if vBar else 0
+
         qDoc = ToQTextDocument(SHARED.project)
         qDoc.setJustify(CONFIG.doJustify)
         qDoc.setDialogHighlight(True)
@@ -223,8 +228,9 @@ class GuiDocViewer(QTextBrowser):
         qDoc.setTheme(self._docTheme)
         qDoc.initDocument()
         qDoc.setKeywords(True)
-        qDoc.setComments(CONFIG.viewComments)
-        qDoc.setSynopsis(CONFIG.viewSynopsis)
+        qDoc.setCommentType(nwComment.PLAIN, CONFIG.viewComments)
+        qDoc.setCommentType(nwComment.SYNOPSIS, CONFIG.viewSynopsis)
+        qDoc.setCommentType(nwComment.SHORT, CONFIG.viewSynopsis)
 
         # Be extra careful here to prevent crashes when first opening a
         # project as a crash here leaves no way of recovering.
@@ -248,11 +254,11 @@ class GuiDocViewer(QTextBrowser):
 
         self.setDocumentTitle(tHandle)
         self.setDocument(qDoc.document)
-        self.setTabStopDistance(CONFIG.getTabWidth())
+        self.setTabStopDistance(CONFIG.tabWidth)
 
-        if self._docHandle == tHandle:
+        if self._docHandle == tHandle and vBar:
             # This is a refresh, so we set the scrollbar back to where it was
-            self.verticalScrollBar().setValue(sPos)
+            vBar.setValue(sPos)
 
         self._docHandle = tHandle
         SHARED.project.data.setLastHandle(tHandle, "viewer")
@@ -306,13 +312,13 @@ class GuiDocViewer(QTextBrowser):
         """Automatically adjust the margins so the text is centred."""
         wW = self.width()
         wH = self.height()
-        cM = CONFIG.getTextMargin()
+        cM = CONFIG.textMargin
 
         vBar = self.verticalScrollBar()
-        sW = vBar.width() if vBar.isVisible() else 0
+        sW = vBar.width() if vBar and vBar.isVisible() else 0
 
         hBar = self.horizontalScrollBar()
-        sH = hBar.height() if hBar.isVisible() else 0
+        sH = hBar.height() if hBar and hBar.isVisible() else 0
 
         tM = cM
         if CONFIG.textWidth > 0:
@@ -337,8 +343,7 @@ class GuiDocViewer(QTextBrowser):
 
     def setScrollPosition(self, pos: int) -> None:
         """Set the scrollbar position."""
-        vBar = self.verticalScrollBar()
-        if vBar.isVisible():
+        if (vBar := self.verticalScrollBar()) and vBar.isVisible():
             vBar.setValue(pos)
         return
 
@@ -400,30 +405,27 @@ class GuiDocViewer(QTextBrowser):
         ctxMenu = QMenu(self)
 
         if userSelection:
-            mnuCopy = QAction(self.tr("Copy"), ctxMenu)
-            mnuCopy.triggered.connect(qtLambda(self.docAction, nwDocAction.COPY))
-            ctxMenu.addAction(mnuCopy)
-
+            action = qtAddAction(ctxMenu, self.tr("Copy"))
+            action.triggered.connect(qtLambda(self.docAction, nwDocAction.COPY))
             ctxMenu.addSeparator()
 
-        mnuSelAll = QAction(self.tr("Select All"), ctxMenu)
-        mnuSelAll.triggered.connect(qtLambda(self.docAction, nwDocAction.SEL_ALL))
-        ctxMenu.addAction(mnuSelAll)
+        action = qtAddAction(ctxMenu, self.tr("Select All"))
+        action.triggered.connect(qtLambda(self.docAction, nwDocAction.SEL_ALL))
 
-        mnuSelWord = QAction(self.tr("Select Word"), ctxMenu)
-        mnuSelWord.triggered.connect(qtLambda(
+        action = qtAddAction(ctxMenu, self.tr("Select Word"))
+        action.triggered.connect(qtLambda(
             self._makePosSelection, QTextCursor.SelectionType.WordUnderCursor, point
         ))
-        ctxMenu.addAction(mnuSelWord)
 
-        mnuSelPara = QAction(self.tr("Select Paragraph"), ctxMenu)
-        mnuSelPara.triggered.connect(qtLambda(
+        action = qtAddAction(ctxMenu, self.tr("Select Paragraph"))
+        action.triggered.connect(qtLambda(
             self._makePosSelection, QTextCursor.SelectionType.BlockUnderCursor, point
         ))
-        ctxMenu.addAction(mnuSelPara)
 
         # Open the context menu
-        ctxMenu.exec(self.viewport().mapToGlobal(point))
+        if viewport := self.viewport():
+            ctxMenu.exec(viewport.mapToGlobal(point))
+
         ctxMenu.setParent(None)
 
         return
@@ -450,7 +452,7 @@ class GuiDocViewer(QTextBrowser):
 
     def dragEnterEvent(self, event: QDragEnterEvent) -> None:
         """Overload drag enter event to handle dragged items."""
-        if event.mimeData().hasFormat(nwConst.MIME_HANDLE):
+        if (data := event.mimeData()) and data.hasFormat(nwConst.MIME_HANDLE):
             event.acceptProposedAction()
         else:
             super().dragEnterEvent(event)
@@ -458,7 +460,7 @@ class GuiDocViewer(QTextBrowser):
 
     def dragMoveEvent(self, event: QDragMoveEvent) -> None:
         """Overload drag move event to handle dragged items."""
-        if event.mimeData().hasFormat(nwConst.MIME_HANDLE):
+        if (data := event.mimeData()) and data.hasFormat(nwConst.MIME_HANDLE):
             event.acceptProposedAction()
         else:
             super().dragMoveEvent(event)
@@ -466,8 +468,8 @@ class GuiDocViewer(QTextBrowser):
 
     def dropEvent(self, event: QDropEvent) -> None:
         """Overload drop event to handle dragged items."""
-        if event.mimeData().hasFormat(nwConst.MIME_HANDLE):
-            if handles := decodeMimeHandles(event.mimeData()):
+        if (data := event.mimeData()) and data.hasFormat(nwConst.MIME_HANDLE):
+            if handles := decodeMimeHandles(data):
                 if SHARED.project.tree.checkType(handles[0], nwItemType.FILE):
                     self.openDocumentRequest.emit(handles[0], nwDocMode.VIEW, "", True)
         else:
@@ -609,12 +611,9 @@ class GuiDocViewHistory:
         for loop, it is skipped entirely if log level isn't DEBUG.
         """
         if CONFIG.isDebug:  # pragma: no cover
-            for i, (h, p) in enumerate(zip(self._navHistory, self._posHistory)):
-                logger.debug(
-                    "History %02d: %s %13s [x:%d]" % (
-                        i + 1, ">" if i == self._currPos else " ", h, p
-                    )
-                )
+            for i, (h, p) in enumerate(zip(self._navHistory, self._posHistory, strict=False)):
+                a = ">" if i == self._currPos else " "
+                logger.debug(f"History {i + 1:02d}: {a} {h:13s} [x:{p}]")
         return
 
 
@@ -638,13 +637,12 @@ class GuiDocViewHeader(QWidget):
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
-        mPx = CONFIG.pxInt(4)
 
         # Main Widget Settings
         self.setAutoFillBackground(True)
 
         # Title Label
-        self.itemTitle = NColourLabel("", self, faded=SHARED.theme.fadedText)
+        self.itemTitle = NColorLabel("", self, faded=SHARED.theme.fadedText)
         self.itemTitle.setMargin(0)
         self.itemTitle.setContentsMargins(0, 0, 0, 0)
         self.itemTitle.setAutoFillBackground(True)
@@ -690,9 +688,9 @@ class GuiDocViewHeader(QWidget):
         self.outerBox.addWidget(self.outlineButton, 0)
         self.outerBox.addWidget(self.backButton, 0)
         self.outerBox.addWidget(self.forwardButton, 0)
-        self.outerBox.addSpacing(mPx)
+        self.outerBox.addSpacing(4)
         self.outerBox.addWidget(self.itemTitle, 1)
-        self.outerBox.addSpacing(mPx)
+        self.outerBox.addSpacing(4)
         self.outerBox.addWidget(self.editButton, 0)
         self.outerBox.addWidget(self.refreshButton, 0)
         self.outerBox.addWidget(self.closeButton, 0)
@@ -703,8 +701,8 @@ class GuiDocViewHeader(QWidget):
         # Fix Margins and Size
         # This is needed for high DPI systems. See issue #499.
         self.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setContentsMargins(mPx, mPx, mPx, mPx)
-        self.setMinimumHeight(iPx + 2*mPx)
+        self.outerBox.setContentsMargins(4, 4, 4, 4)
+        self.setMinimumHeight(iPx + 8)
 
         self.updateFont()
         self.updateTheme()
@@ -745,7 +743,7 @@ class GuiDocViewHeader(QWidget):
                     minLevel = min(minLevel, level)
             for title, text, level in entries[:30]:
                 indent = "    "*(level - minLevel)
-                action = self.outlineMenu.addAction(f"{indent}{text}")
+                action = qtAddAction(self.outlineMenu, f"{indent}{text}")
                 action.triggered.connect(
                     lambda _, title=title: self.docViewer.navigateTo(f"#{tHandle}:{title}")
                 )
@@ -760,12 +758,12 @@ class GuiDocViewHeader(QWidget):
 
     def updateTheme(self) -> None:
         """Update theme elements."""
-        self.outlineButton.setThemeIcon("list")
-        self.backButton.setThemeIcon("backward")
-        self.forwardButton.setThemeIcon("forward")
-        self.editButton.setThemeIcon("edit")
-        self.refreshButton.setThemeIcon("refresh")
-        self.closeButton.setThemeIcon("close")
+        self.outlineButton.setThemeIcon("list", "blue")
+        self.backButton.setThemeIcon("chevron_left", "blue")
+        self.forwardButton.setThemeIcon("chevron_right", "blue")
+        self.editButton.setThemeIcon("edit", "green")
+        self.refreshButton.setThemeIcon("refresh", "green")
+        self.closeButton.setThemeIcon("close", "red")
 
         buttonStyle = SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON)
         self.outlineButton.setStyleSheet(buttonStyle)
@@ -775,18 +773,19 @@ class GuiDocViewHeader(QWidget):
         self.refreshButton.setStyleSheet(buttonStyle)
         self.closeButton.setStyleSheet(buttonStyle)
 
-        self.matchColours()
+        self.matchColors()
 
         return
 
-    def matchColours(self) -> None:
+    def matchColors(self) -> None:
         """Update the colours of the widget to match those of the syntax
         theme rather than the main GUI.
         """
-        palette = QPalette()
-        palette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
-        palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText)
-        palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
+        syntax = SHARED.theme.syntaxTheme
+        palette = self.palette()
+        palette.setColor(QPalette.ColorRole.Window, syntax.back)
+        palette.setColor(QPalette.ColorRole.WindowText, syntax.text)
+        palette.setColor(QPalette.ColorRole.Text, syntax.text)
         self.setPalette(palette)
         self.itemTitle.setTextColors(
             color=palette.windowText().color(), faded=SHARED.theme.fadedText
@@ -882,8 +881,6 @@ class GuiDocViewFooter(QWidget):
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
-        hSp = CONFIG.pxInt(4)
-        mPx = CONFIG.pxInt(4)
 
         # Main Widget Settings
         self.setContentsMargins(0, 0, 0, 0)
@@ -920,14 +917,14 @@ class GuiDocViewFooter(QWidget):
         self.outerBox.addStretch(1)
         self.outerBox.addWidget(self.showComments, 0)
         self.outerBox.addWidget(self.showSynopsis, 0)
-        self.outerBox.setSpacing(hSp)
+        self.outerBox.setSpacing(4)
         self.setLayout(self.outerBox)
 
         # Fix Margins and Size
         # This is needed for high DPI systems. See issue #499.
         self.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setContentsMargins(mPx, mPx, mPx, mPx)
-        self.setMinimumHeight(iPx + 2*mPx)
+        self.outerBox.setContentsMargins(4, 4, 4, 4)
+        self.setMinimumHeight(iPx + 8)
 
         self.updateFont()
         self.updateTheme()
@@ -951,7 +948,7 @@ class GuiDocViewFooter(QWidget):
         """Update theme elements."""
         # Icons
         fPx = int(0.9*SHARED.theme.fontPixelSize)
-        bulletIcon = SHARED.theme.getToggleIcon("bullet", (fPx, fPx))
+        bulletIcon = SHARED.theme.getToggleIcon("bullet", (fPx, fPx), "blue")
 
         self.showHide.setThemeIcon("panel")
         self.showComments.setIcon(bulletIcon)
@@ -962,18 +959,19 @@ class GuiDocViewFooter(QWidget):
         self.showComments.setStyleSheet(buttonStyle)
         self.showSynopsis.setStyleSheet(buttonStyle)
 
-        self.matchColours()
+        self.matchColors()
 
         return
 
-    def matchColours(self) -> None:
+    def matchColors(self) -> None:
         """Update the colours of the widget to match those of the syntax
         theme rather than the main GUI.
         """
-        palette = QPalette()
-        palette.setColor(QPalette.ColorRole.Window, SHARED.theme.colBack)
-        palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText)
-        palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
+        syntax = SHARED.theme.syntaxTheme
+        palette = self.palette()
+        palette.setColor(QPalette.ColorRole.Window, syntax.back)
+        palette.setColor(QPalette.ColorRole.WindowText, syntax.text)
+        palette.setColor(QPalette.ColorRole.Text, syntax.text)
         self.setPalette(palette)
         return