novelWriter 2.3rc1__py3-none-any.whl → 2.4b1__py3-none-any.whl

novelwriter/gui/dochighlight.py

@@ -45,16 +45,16 @@ logger = logging.getLogger(__name__)
 SPELLRX = QRegularExpression(r"\b[^\s\-\+\/–—\[\]:]+\b")
 SPELLRX.setPatternOptions(QRegularExpression.UseUnicodePropertiesOption)
 
+BLOCK_NONE  = 0
+BLOCK_TEXT  = 1
+BLOCK_META  = 2
+BLOCK_TITLE = 4
+
 
 class GuiDocHighlighter(QSyntaxHighlighter):
 
     __slots__ = ("_tItem", "_tHandle", "_spellCheck", "_spellErr", "_hRules", "_hStyles")
 
-    BLOCK_NONE  = 0
-    BLOCK_TEXT  = 1
-    BLOCK_META  = 2
-    BLOCK_TITLE = 4
-
     def __init__(self, document: QTextDocument) -> None:
         super().__init__(document)
 
@@ -90,10 +90,10 @@ class GuiDocHighlighter(QSyntaxHighlighter):
             "header2":   self._makeFormat(SHARED.theme.colHead, "bold", 1.6),
             "header3":   self._makeFormat(SHARED.theme.colHead, "bold", 1.4),
             "header4":   self._makeFormat(SHARED.theme.colHead, "bold", 1.2),
-            "header1h":  self._makeFormat(SHARED.theme.colHeadH, "bold", 1.8),
-            "header2h":  self._makeFormat(SHARED.theme.colHeadH, "bold", 1.6),
-            "header3h":  self._makeFormat(SHARED.theme.colHeadH, "bold", 1.4),
-            "header4h":  self._makeFormat(SHARED.theme.colHeadH, "bold", 1.2),
+            "head1h":    self._makeFormat(SHARED.theme.colHeadH, "bold", 1.8),
+            "head2h":    self._makeFormat(SHARED.theme.colHeadH, "bold", 1.6),
+            "head3h":    self._makeFormat(SHARED.theme.colHeadH, "bold", 1.4),
+            "head4h":    self._makeFormat(SHARED.theme.colHeadH, "bold", 1.2),
             "bold":      self._makeFormat(colEmph, "bold"),
             "italic":    self._makeFormat(colEmph, "italic"),
             "strike":    self._makeFormat(SHARED.theme.colHidden, "strike"),
@@ -272,12 +272,12 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         is significantly faster than running the regex checks used for
         text paragraphs.
         """
-        self.setCurrentBlockState(self.BLOCK_NONE)
+        self.setCurrentBlockState(BLOCK_NONE)
         if self._tHandle is None or not text:
             return
 
         if text.startswith("@"):  # Keywords and commands
-            self.setCurrentBlockState(self.BLOCK_META)
+            self.setCurrentBlockState(BLOCK_META)
             index = SHARED.project.index
             isValid, bits, pos = index.scanThis(text)
             isGood = index.checkThese(bits, self._tHandle)
@@ -300,35 +300,39 @@ class GuiDocHighlighter(QSyntaxHighlighter):
             # so we force a return here
             return
 
-        elif text.startswith(("# ", "#! ", "## ", "##! ", "### ", "#### ")):
-            self.setCurrentBlockState(self.BLOCK_TITLE)
+        elif text.startswith(("# ", "#! ", "## ", "##! ", "### ", "###! ", "#### ")):
+            self.setCurrentBlockState(BLOCK_TITLE)
 
-            if text.startswith("# "):  # Header 1
-                self.setFormat(0, 1, self._hStyles["header1h"])
+            if text.startswith("# "):  # Heading 1
+                self.setFormat(0, 1, self._hStyles["head1h"])
                 self.setFormat(1, len(text), self._hStyles["header1"])
 
-            elif text.startswith("## "):  # Header 2
-                self.setFormat(0, 2, self._hStyles["header2h"])
+            elif text.startswith("## "):  # Heading 2
+                self.setFormat(0, 2, self._hStyles["head2h"])
                 self.setFormat(2, len(text), self._hStyles["header2"])
 
-            elif text.startswith("### "):  # Header 3
-                self.setFormat(0, 3, self._hStyles["header3h"])
+            elif text.startswith("### "):  # Heading 3
+                self.setFormat(0, 3, self._hStyles["head3h"])
                 self.setFormat(3, len(text), self._hStyles["header3"])
 
-            elif text.startswith("#### "):  # Header 4
-                self.setFormat(0, 4, self._hStyles["header4h"])
+            elif text.startswith("#### "):  # Heading 4
+                self.setFormat(0, 4, self._hStyles["head4h"])
                 self.setFormat(4, len(text), self._hStyles["header4"])
 
             elif text.startswith("#! "):  # Title
-                self.setFormat(0, 2, self._hStyles["header1h"])
+                self.setFormat(0, 2, self._hStyles["head1h"])
                 self.setFormat(2, len(text), self._hStyles["header1"])
 
             elif text.startswith("##! "):  # Unnumbered
-                self.setFormat(0, 3, self._hStyles["header2h"])
+                self.setFormat(0, 3, self._hStyles["head2h"])
                 self.setFormat(3, len(text), self._hStyles["header2"])
 
+            elif text.startswith("###! "):  # Hard Scene
+                self.setFormat(0, 4, self._hStyles["head3h"])
+                self.setFormat(4, len(text), self._hStyles["header3"])
+
         elif text.startswith("%"):  # Comments
-            self.setCurrentBlockState(self.BLOCK_TEXT)
+            self.setCurrentBlockState(BLOCK_TEXT)
             cStyle, _, cPos = processComment(text)
             if cStyle == nwComment.PLAIN:
                 self.setFormat(0, len(text), self._hStyles["hidden"])
@@ -353,7 +357,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
                     return
 
             # Regular Text
-            self.setCurrentBlockState(self.BLOCK_TEXT)
+            self.setCurrentBlockState(BLOCK_TEXT)
             for rX, xFmt in self.rxRules:
                 rxItt = rX.globalMatch(text, 0)
                 while rxItt.hasNext():

novelwriter/gui/docviewer.py

@@ -29,7 +29,6 @@ from __future__ import annotations
 import logging
 
 from enum import Enum
-from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QPoint, QSize, Qt, QUrl
 from PyQt5.QtGui import (
@@ -42,14 +41,13 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
+from novelwriter.constants import nwHeaders, nwUnicode
+from novelwriter.core.tohtml import ToHtml
 from novelwriter.enum import nwItemType, nwDocAction, nwDocMode
 from novelwriter.error import logException
-from novelwriter.constants import nwUnicode
-from novelwriter.core.tohtml import ToHtml
 from novelwriter.extensions.eventfilters import WheelEventFilter
-
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
+from novelwriter.extensions.modified import NIconToolButton
+from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON
 
 logger = logging.getLogger(__name__)
 
@@ -58,17 +56,16 @@ class GuiDocViewer(QTextBrowser):
 
     documentLoaded = pyqtSignal(str)
     loadDocumentTagRequest = pyqtSignal(str, Enum)
+    closeDocumentRequest = pyqtSignal()
+    reloadDocumentRequest = pyqtSignal()
     togglePanelVisibility = pyqtSignal()
     requestProjectItemSelected = pyqtSignal(str, bool)
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiDocViewer")
 
-        # Class Variables
-        self.mainGui = mainGui
-
         # Internal Variables
         self._docHandle = None
 
@@ -128,7 +125,7 @@ class GuiDocViewer(QTextBrowser):
         self.clear()
         self.setSearchPaths([""])
         self._docHandle = None
-        self.docHeader.setTitleFromHandle(self._docHandle)
+        self.docHeader.clearHeader()
         return
 
     def updateTheme(self) -> None:
@@ -184,8 +181,7 @@ class GuiDocViewer(QTextBrowser):
         self.setTabStopDistance(CONFIG.getTabWidth())
 
         # If we have a document open, we should reload it in case the font changed
-        if self._docHandle is not None:
-            self.reloadText()
+        self.reloadText()
 
         return
 
@@ -201,8 +197,11 @@ class GuiDocViewer(QTextBrowser):
 
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(SHARED.project)
-        aDoc.setPreview(CONFIG.viewComments, CONFIG.viewSynopsis)
-        aDoc.setLinkHeaders(True)
+        aDoc.setPreview(True)
+        aDoc.setKeywords(True)
+        aDoc.setComments(CONFIG.viewComments)
+        aDoc.setSynopsis(CONFIG.viewSynopsis)
+        aDoc.setLinkHeadings(True)
 
         # Be extra careful here to prevent crashes when first opening a
         # project as a crash here leaves no way of recovering.
@@ -239,7 +238,11 @@ class GuiDocViewer(QTextBrowser):
 
         self._docHandle = tHandle
         SHARED.project.data.setLastHandle(tHandle, "viewer")
-        self.docHeader.setTitleFromHandle(self._docHandle)
+        self.docHeader.setHandle(tHandle)
+        self.docHeader.setOutline({
+            sTitle: (hItem.title, nwHeaders.H_LEVEL.get(hItem.level, 0))
+            for sTitle, hItem in SHARED.project.index.iterItemHeadings(tHandle)
+        })
         self.updateDocMargins()
 
         # Since we change the content while it may still be rendering, we mark
@@ -281,13 +284,6 @@ class GuiDocViewer(QTextBrowser):
             return False
         return True
 
-    def navigateTo(self, tAnchor: str) -> None:
-        """Go to a specific #link in the document."""
-        if isinstance(tAnchor, str) and tAnchor.startswith("#"):
-            logger.debug("Moving to anchor '%s'", tAnchor)
-            self.setSource(QUrl(tAnchor))
-        return
-
     def clearNavHistory(self) -> None:
         """Clear the navigation history."""
         self.docHistory.clear()
@@ -340,11 +336,19 @@ class GuiDocViewer(QTextBrowser):
     @pyqtSlot(str)
     def updateDocInfo(self, tHandle: str) -> None:
         """Update the header title bar if needed."""
-        if tHandle == self._docHandle:
-            self.docHeader.setTitleFromHandle(self._docHandle)
+        if tHandle and tHandle == self._docHandle:
+            self.docHeader.setHandle(tHandle)
             self.updateDocMargins()
         return
 
+    @pyqtSlot(str)
+    def navigateTo(self, anchor: str) -> None:
+        """Go to a specific #link in the document."""
+        if isinstance(anchor, str) and anchor.startswith("#"):
+            logger.debug("Moving to anchor '%s'", anchor)
+            self.setSource(QUrl(anchor))
+        return
+
     ##
     #  Private Slots
     ##
@@ -466,48 +470,30 @@ class GuiDocViewer(QTextBrowser):
         colText = SHARED.theme.colText
         colHead = SHARED.theme.colHead
         colVals = SHARED.theme.colVal
-        colEmph = SHARED.theme.colEmph
+        colMark = SHARED.theme.colMark
         colKeys = SHARED.theme.colKey
         colHide = SHARED.theme.colHidden
         colMods = SHARED.theme.colMod
         colOpts = SHARED.theme.colOpt
         styleSheet = (
-            "body {{"
-            "  color: rgb({tColR}, {tColG}, {tColB});"
-            "}}\n"
-            "h1, h2, h3, h4 {{"
-            "  color: rgb({hColR}, {hColG}, {hColB});"
-            "}}\n"
-            "a {{"
-            "  color: rgb({aColR}, {aColG}, {aColB});"
-            "}}\n"
-            "mark {{"
-            "  color: rgb({eColR}, {eColG}, {eColB});"
-            "}}\n"
-            ".tags {{"
-            "  color: rgb({kColR}, {kColG}, {kColB});"
-            "}}\n"
-            ".optional {{"
-            "  color: rgb({oColR}, {oColG}, {oColB});"
-            "}}\n"
-            ".comment {{"
-            "  color: rgb({cColR}, {cColG}, {cColB});"
-            "}}\n"
-            ".synopsis {{"
-            "  color: rgb({mColR}, {mColG}, {mColB});"
-            "}}\n"
-            ".title {{"
-            "  text-align: center;"
-            "}}\n"
+            "body {{color: rgb({rT}, {gT}, {bT});}}\n"
+            "h1, h2, h3, h4 {{color: rgb({rH}, {gH}, {bH});}}\n"
+            "a {{color: rgb({rA}, {gA}, {bA});}}\n"
+            "mark {{background-color: rgba({rE}, {gE}, {bE}, {aE});}}\n"
+            ".tags {{color: rgb({rK}, {gK}, {bK});}}\n"
+            ".optional {{color: rgb({rO}, {gO}, {bO});}}\n"
+            ".comment {{color: rgb({rC}, {gC}, {bC});}}\n"
+            ".synopsis {{color: rgb({rM}, {gM}, {bM});}}\n"
+            ".title {{text-align: center;}}\n"
         ).format(
-            tColR=colText.red(), tColG=colText.green(), tColB=colText.blue(),
-            hColR=colHead.red(), hColG=colHead.green(), hColB=colHead.blue(),
-            aColR=colVals.red(), aColG=colVals.green(), aColB=colVals.blue(),
-            eColR=colEmph.red(), eColG=colEmph.green(), eColB=colEmph.blue(),
-            kColR=colKeys.red(), kColG=colKeys.green(), kColB=colKeys.blue(),
-            cColR=colHide.red(), cColG=colHide.green(), cColB=colHide.blue(),
-            mColR=colMods.red(), mColG=colMods.green(), mColB=colMods.blue(),
-            oColR=colOpts.red(), oColG=colOpts.green(), oColB=colOpts.blue(),
+            rT=colText.red(), gT=colText.green(), bT=colText.blue(),
+            rH=colHead.red(), gH=colHead.green(), bH=colHead.blue(),
+            rA=colVals.red(), gA=colVals.green(), bA=colVals.blue(),
+            rE=colMark.red(), gE=colMark.green(), bE=colMark.blue(), aE=colMark.alpha(),
+            rK=colKeys.red(), gK=colKeys.green(), bK=colKeys.blue(),
+            rC=colHide.red(), gC=colHide.green(), bC=colHide.blue(),
+            rM=colMods.red(), gM=colMods.green(), bM=colMods.blue(),
+            rO=colOpts.red(), gO=colOpts.green(), bO=colOpts.blue(),
         )
         self.document().setDefaultStyleSheet(styleSheet)
 
@@ -644,84 +630,80 @@ class GuiDocViewHeader(QWidget):
         logger.debug("Create: GuiDocViewHeader")
 
         self.docViewer = docViewer
-        self.mainGui   = docViewer.mainGui
 
         # Internal Variables
         self._docHandle = None
+        self._docOutline: dict[str, tuple[str, int]] = {}
 
-        fPx = int(0.9*SHARED.theme.fontPixelSize)
-        hSp = CONFIG.pxInt(6)
+        iPx = SHARED.theme.baseIconSize
+        mPx = CONFIG.pxInt(4)
 
         # Main Widget Settings
         self.setAutoFillBackground(True)
 
         # Title Label
-        self.docTitle = QLabel()
-        self.docTitle.setText("")
-        self.docTitle.setIndent(0)
-        self.docTitle.setMargin(0)
-        self.docTitle.setContentsMargins(0, 0, 0, 0)
-        self.docTitle.setAutoFillBackground(True)
-        self.docTitle.setAlignment(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignTop)
-        self.docTitle.setFixedHeight(fPx)
-
-        lblFont = self.docTitle.font()
+        self.itemTitle = QLabel()
+        self.itemTitle.setText("")
+        self.itemTitle.setIndent(0)
+        self.itemTitle.setMargin(0)
+        self.itemTitle.setContentsMargins(0, 0, 0, 0)
+        self.itemTitle.setAutoFillBackground(True)
+        self.itemTitle.setAlignment(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignTop)
+        self.itemTitle.setFixedHeight(iPx)
+
+        lblFont = self.itemTitle.font()
         lblFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-        self.docTitle.setFont(lblFont)
+        self.itemTitle.setFont(lblFont)
+
+        # Other Widgets
+        self.outlineMenu = QMenu(self)
 
         # Buttons
-        self.backButton = QToolButton(self)
-        self.backButton.setContentsMargins(0, 0, 0, 0)
-        self.backButton.setIconSize(QSize(fPx, fPx))
-        self.backButton.setFixedSize(fPx, fPx)
-        self.backButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.outlineButton = NIconToolButton(self, iPx)
+        self.outlineButton.setVisible(False)
+        self.outlineButton.setToolTip(self.tr("Outline"))
+        self.outlineButton.setMenu(self.outlineMenu)
+
+        self.backButton = NIconToolButton(self, iPx)
         self.backButton.setVisible(False)
         self.backButton.setToolTip(self.tr("Go Backward"))
         self.backButton.clicked.connect(self.docViewer.navBackward)
 
-        self.forwardButton = QToolButton(self)
-        self.forwardButton.setContentsMargins(0, 0, 0, 0)
-        self.forwardButton.setIconSize(QSize(fPx, fPx))
-        self.forwardButton.setFixedSize(fPx, fPx)
-        self.forwardButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.forwardButton = NIconToolButton(self, iPx)
         self.forwardButton.setVisible(False)
         self.forwardButton.setToolTip(self.tr("Go Forward"))
         self.forwardButton.clicked.connect(self.docViewer.navForward)
 
-        self.refreshButton = QToolButton(self)
-        self.refreshButton.setContentsMargins(0, 0, 0, 0)
-        self.refreshButton.setIconSize(QSize(fPx, fPx))
-        self.refreshButton.setFixedSize(fPx, fPx)
-        self.refreshButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.refreshButton = NIconToolButton(self, iPx)
         self.refreshButton.setVisible(False)
         self.refreshButton.setToolTip(self.tr("Reload"))
         self.refreshButton.clicked.connect(self._refreshDocument)
 
-        self.closeButton = QToolButton(self)
-        self.closeButton.setContentsMargins(0, 0, 0, 0)
-        self.closeButton.setIconSize(QSize(fPx, fPx))
-        self.closeButton.setFixedSize(fPx, fPx)
-        self.closeButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.closeButton = NIconToolButton(self, iPx)
         self.closeButton.setVisible(False)
         self.closeButton.setToolTip(self.tr("Close"))
         self.closeButton.clicked.connect(self._closeDocument)
 
         # Assemble Layout
         self.outerBox = QHBoxLayout()
-        self.outerBox.setSpacing(hSp)
+        self.outerBox.addWidget(self.outlineButton, 0)
         self.outerBox.addWidget(self.backButton, 0)
         self.outerBox.addWidget(self.forwardButton, 0)
-        self.outerBox.addWidget(self.docTitle, 1)
+        self.outerBox.addSpacing(mPx)
+        self.outerBox.addWidget(self.itemTitle, 1)
+        self.outerBox.addSpacing(mPx)
+        self.outerBox.addSpacing(iPx)
         self.outerBox.addWidget(self.refreshButton, 0)
         self.outerBox.addWidget(self.closeButton, 0)
+        self.outerBox.setSpacing(0)
+
         self.setLayout(self.outerBox)
 
         # Fix Margins and Size
         # This is needed for high DPI systems. See issue #499.
-        cM = CONFIG.pxInt(8)
         self.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setContentsMargins(cM, cM, cM, cM)
-        self.setMinimumHeight(fPx + 2*cM)
+        self.outerBox.setContentsMargins(mPx, mPx, mPx, mPx)
+        self.setMinimumHeight(iPx + 2*mPx)
 
         # Fix the Colours
         self.updateTheme()
@@ -734,19 +716,50 @@ class GuiDocViewHeader(QWidget):
     #  Methods
     ##
 
+    def clearHeader(self) -> None:
+        """Clear the header."""
+        self._docHandle = None
+        self._docOutline = {}
+
+        self.itemTitle.setText("")
+        self.outlineMenu.clear()
+        self.outlineButton.setVisible(False)
+        self.backButton.setVisible(False)
+        self.forwardButton.setVisible(False)
+        self.closeButton.setVisible(False)
+        self.refreshButton.setVisible(False)
+        return
+
+    def setOutline(self, data: dict[str, tuple[str, int]]) -> None:
+        """Set the document outline dataset."""
+        tHandle = self._docHandle
+        if data != self._docOutline and tHandle:
+            self.outlineMenu.clear()
+            entries = []
+            minLevel = 5
+            for title, (text, level) in data.items():
+                if title != "T0000":
+                    entries.append((title, text, level))
+                    minLevel = min(minLevel, level)
+            for title, text, level in entries[:30]:
+                indent = "    "*(level - minLevel)
+                action = self.outlineMenu.addAction(f"{indent}{text}")
+                action.triggered.connect(
+                    lambda _, title=title: self.docViewer.navigateTo(f"#{tHandle}:{title}")
+                )
+            self._docOutline = data
+        return
+
     def updateTheme(self) -> None:
         """Update theme elements."""
+        self.outlineButton.setIcon(SHARED.theme.getIcon("list"))
         self.backButton.setIcon(SHARED.theme.getIcon("backward"))
         self.forwardButton.setIcon(SHARED.theme.getIcon("forward"))
         self.refreshButton.setIcon(SHARED.theme.getIcon("refresh"))
         self.closeButton.setIcon(SHARED.theme.getIcon("close"))
 
-        colText = SHARED.theme.colText
-        buttonStyle = (
-            "QToolButton {{border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({0}, {1}, {2}, 0.2);}}"
-        ).format(colText.red(), colText.green(), colText.blue())
-
+        buttonStyle = SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON)
+        self.outlineButton.setStyleSheet(buttonStyle)
         self.backButton.setStyleSheet(buttonStyle)
         self.forwardButton.setStyleSheet(buttonStyle)
         self.refreshButton.setStyleSheet(buttonStyle)
@@ -765,38 +778,25 @@ class GuiDocViewHeader(QWidget):
         palette.setColor(QPalette.ColorRole.WindowText, SHARED.theme.colText)
         palette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
         self.setPalette(palette)
-        self.docTitle.setPalette(palette)
+        self.itemTitle.setPalette(palette)
         return
 
-    def setTitleFromHandle(self, tHandle: str | None) -> None:
+    def setHandle(self, tHandle: str) -> None:
         """Sets the document title from the handle, or alternatively,
         set the whole document path.
         """
         self._docHandle = tHandle
-        if tHandle is None:
-            self.docTitle.setText("")
-            self.backButton.setVisible(False)
-            self.forwardButton.setVisible(False)
-            self.closeButton.setVisible(False)
-            self.refreshButton.setVisible(False)
-            return
-
-        pTree = SHARED.project.tree
+
         if CONFIG.showFullPath:
-            tTitle = []
-            tTree = pTree.getItemPath(tHandle)
-            for aHandle in reversed(tTree):
-                nwItem = pTree[aHandle]
-                if nwItem is not None:
-                    tTitle.append(nwItem.itemName)
-            sSep = "  %s  " % nwUnicode.U_RSAQUO
-            self.docTitle.setText(sSep.join(tTitle))
+            self.itemTitle.setText(f"  {nwUnicode.U_RSAQUO}  ".join(reversed(
+                [name for name in SHARED.project.tree.getItemPath(tHandle, asName=True)]
+            )))
         else:
-            if nwItem := pTree[tHandle]:
-                self.docTitle.setText(nwItem.itemName)
+            self.itemTitle.setText(i.itemName if (i := SHARED.project.tree[tHandle]) else "")
 
         self.backButton.setVisible(True)
         self.forwardButton.setVisible(True)
+        self.outlineButton.setVisible(True)
         self.closeButton.setVisible(True)
         self.refreshButton.setVisible(True)
 
@@ -815,15 +815,14 @@ class GuiDocViewHeader(QWidget):
     @pyqtSlot()
     def _closeDocument(self) -> None:
         """Trigger the close editor/viewer on the main window."""
-        self.mainGui.closeDocViewer()
+        self.clearHeader()
+        self.docViewer.closeDocumentRequest.emit()
         return
 
     @pyqtSlot()
     def _refreshDocument(self) -> None:
         """Reload the content of the document."""
-        if self.docViewer.docHandle == self.mainGui.docEditor.docHandle:
-            self.mainGui.saveDocument()
-        self.docViewer.reloadText()
+        self.docViewer.reloadDocumentRequest.emit()
         return
 
     ##
@@ -854,22 +853,20 @@ class GuiDocViewFooter(QWidget):
         logger.debug("Create: GuiDocViewFooter")
 
         self.docViewer = docViewer
-        self.mainGui   = docViewer.mainGui
 
         # Internal Variables
         self._docHandle = None
 
-        fPx = int(0.9*SHARED.theme.fontPixelSize)
+        iPx = SHARED.theme.baseIconSize
         hSp = CONFIG.pxInt(4)
+        mPx = CONFIG.pxInt(4)
 
         # Main Widget Settings
         self.setContentsMargins(0, 0, 0, 0)
         self.setAutoFillBackground(True)
 
         # Show/Hide Details
-        self.showHide = QToolButton(self)
-        self.showHide.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
-        self.showHide.setIconSize(QSize(fPx, fPx))
+        self.showHide = NIconToolButton(self, iPx)
         self.showHide.clicked.connect(lambda: self.docViewer.togglePanelVisibility.emit())
         self.showHide.setToolTip(self.tr("Show/Hide Viewer Panel"))
 
@@ -879,7 +876,7 @@ class GuiDocViewFooter(QWidget):
         self.showComments.setCheckable(True)
         self.showComments.setChecked(CONFIG.viewComments)
         self.showComments.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.showComments.setIconSize(QSize(fPx, fPx))
+        self.showComments.setIconSize(QSize(iPx, iPx))
         self.showComments.toggled.connect(self._doToggleComments)
         self.showComments.setToolTip(self.tr("Show Comments"))
 
@@ -889,7 +886,7 @@ class GuiDocViewFooter(QWidget):
         self.showSynopsis.setCheckable(True)
         self.showSynopsis.setChecked(CONFIG.viewSynopsis)
         self.showSynopsis.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.showSynopsis.setIconSize(QSize(fPx, fPx))
+        self.showSynopsis.setIconSize(QSize(iPx, iPx))
         self.showSynopsis.toggled.connect(self._doToggleSynopsis)
         self.showSynopsis.setToolTip(self.tr("Show Synopsis Comments"))
 
@@ -909,10 +906,9 @@ class GuiDocViewFooter(QWidget):
 
         # Fix Margins and Size
         # This is needed for high DPI systems. See issue #499.
-        cM = CONFIG.pxInt(8)
         self.setContentsMargins(0, 0, 0, 0)
-        self.outerBox.setContentsMargins(cM, cM, cM, cM)
-        self.setMinimumHeight(fPx + 2*cM)
+        self.outerBox.setContentsMargins(mPx, mPx, mPx, mPx)
+        self.setMinimumHeight(iPx + 2*mPx)
 
         # Fix the Colours
         self.updateTheme()
@@ -935,12 +931,7 @@ class GuiDocViewFooter(QWidget):
         self.showComments.setIcon(bulletIcon)
         self.showSynopsis.setIcon(bulletIcon)
 
-        colText = SHARED.theme.colText
-        buttonStyle = (
-            "QToolButton {{border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({0}, {1}, {2}, 0.2);}}"
-        ).format(colText.red(), colText.green(), colText.blue())
-
+        buttonStyle = SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON)
         self.showHide.setStyleSheet(buttonStyle)
         self.showComments.setStyleSheet(buttonStyle)
         self.showSynopsis.setStyleSheet(buttonStyle)

novelwriter/gui/docviewerpanel.py

@@ -34,10 +34,11 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.enum import nwDocMode, nwItemClass
 from novelwriter.common import checkInt
 from novelwriter.constants import nwHeaders, nwLabels, nwLists, trConst
 from novelwriter.core.index import IndexHeading, IndexItem
+from novelwriter.enum import nwDocMode, nwItemClass
+from novelwriter.gui.theme import STYLES_FLAT_TABS, STYLES_MIN_TOOLBUTTON
 
 logger = logging.getLogger(__name__)
 
@@ -99,35 +100,14 @@ class GuiDocViewerPanel(QWidget):
 
     def updateTheme(self, updateTabs: bool = True) -> None:
         """Update theme elements."""
-        qPalette = self.palette()
-        mPx = CONFIG.pxInt(2)
-        vPx = CONFIG.pxInt(4)
-        hPx = CONFIG.pxInt(8)
-        hCol = qPalette.highlight().color()
-        fCol = qPalette.text().color()
-
-        buttonStyle = (
-            "QToolButton {{padding: {0}px; margin: 0 0 {1}px 0; border: none; "
-            "background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({2}, {3}, {4}, 0.2);}} "
-            "QToolButton::menu-indicator {{image: none;}} "
-        ).format(mPx, mPx, fCol.red(), fCol.green(), fCol.blue())
         self.optsButton.setIcon(SHARED.theme.getIcon("menu"))
-        self.optsButton.setStyleSheet(buttonStyle)
-
-        styleSheet = (
-            "QTabWidget::pane {{border: 0;}} "
-            "QTabWidget QTabBar::tab {{border: 0; padding: {0}px {1}px;}} "
-            "QTabWidget QTabBar::tab:selected {{color: rgb({2}, {3}, {4});}} "
-        ).format(vPx, hPx, hCol.red(), hCol.green(), hCol.blue())
-        self.mainTabs.setStyleSheet(styleSheet)
+        self.optsButton.setStyleSheet(SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON))
+        self.mainTabs.setStyleSheet(SHARED.theme.getStyleSheet(STYLES_FLAT_TABS))
         self.updateHandle(self._lastHandle)
-
         if updateTabs:
             self.tabBackRefs.updateTheme()
             for tab in self.kwTabs.values():
                 tab.updateTheme()
-
         return
 
     def openProjectTasks(self) -> None: