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

novelwriter/gui/search.py

@@ -27,22 +27,21 @@ import logging
 
 from time import time
 
-from PyQt5.QtCore import QSize, Qt, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import QCursor, QKeyEvent, QPalette
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QCursor, QKeyEvent
 from PyQt5.QtWidgets import (
-    QHBoxLayout, QHeaderView, QLabel, QLineEdit, QToolBar, QTreeWidget,
-    QTreeWidgetItem, QVBoxLayout, QWidget, qApp
+    QApplication, QFrame, QHBoxLayout, QHeaderView, QLabel, QLineEdit,
+    QToolBar, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import checkInt
+from novelwriter.common import checkInt, cssCol
 from novelwriter.core.coretools import DocSearch
 from novelwriter.core.item import NWItem
+from novelwriter.types import QtAlignMiddle, QtAlignRight, QtUserRole
 
 logger = logging.getLogger(__name__)
 
-CACHE_TIMEOUT = 120.0  # 2 minutes
-
 
 class GuiProjectSearch(QWidget):
 
@@ -50,8 +49,8 @@ class GuiProjectSearch(QWidget):
     C_RESULT = 0
     C_COUNT  = 1
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
-    D_RESULT = Qt.ItemDataRole.UserRole + 1
+    D_HANDLE = QtUserRole
+    D_RESULT = QtUserRole + 1
 
     selectedItemChanged = pyqtSignal(str)
     openDocumentSelectRequest = pyqtSignal(str, int, int, bool)
@@ -61,22 +60,25 @@ class GuiProjectSearch(QWidget):
 
         logger.debug("Create: GuiProjectSearch")
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(2)
+        tPx = CONFIG.pxInt(4)
 
         self._time = time()
         self._search = DocSearch()
         self._blocked = False
+        self._map: dict[str, tuple[int, float]] = {}
 
         # Header
-        self.viewLabel = QLabel(self.tr("Project Search"))
+        self.viewLabel = QLabel(self.tr("Project Search"), self)
         self.viewLabel.setFont(SHARED.theme.guiFontB)
-        self.viewLabel.setContentsMargins(mPx, mPx, 0, mPx)
+        self.viewLabel.setContentsMargins(mPx, tPx, 0, mPx)
 
         # Options
         self.searchOpt = QToolBar(self)
         self.searchOpt.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
-        self.searchOpt.setIconSize(QSize(iPx, iPx))
+        self.searchOpt.setIconSize(iSz)
         self.searchOpt.setContentsMargins(0, 0, 0, 0)
 
         self.toggleCase = self.searchOpt.addAction(self.tr("Case Sensitive"))
@@ -96,7 +98,7 @@ class GuiProjectSearch(QWidget):
 
         # Search Box
         self.searchText = QLineEdit(self)
-        self.searchText.setPlaceholderText(self.tr("Search text ..."))
+        self.searchText.setPlaceholderText(self.tr("Search"))
         self.searchText.setClearButtonEnabled(True)
 
         self.searchAction = self.searchText.addAction(
@@ -108,8 +110,11 @@ class GuiProjectSearch(QWidget):
         self.searchResult = QTreeWidget(self)
         self.searchResult.setHeaderHidden(True)
         self.searchResult.setColumnCount(2)
-        self.searchResult.setIconSize(QSize(iPx, iPx))
+        self.searchResult.setIconSize(iSz)
         self.searchResult.setIndentation(iPx)
+        self.searchResult.setFrameStyle(QFrame.Shape.NoFrame)
+        self.searchResult.setUniformRowHeights(True)
+        self.searchResult.setAllColumnsShowFocus(True)
         self.searchResult.itemDoubleClicked.connect(self._searchResultDoubleClicked)
         self.searchResult.itemSelectionChanged.connect(self._searchResultSelected)
 
@@ -121,11 +126,16 @@ class GuiProjectSearch(QWidget):
         # Assemble
         self.headerBox = QHBoxLayout()
         self.headerBox.addWidget(self.viewLabel, 1)
-        self.headerBox.addWidget(self.searchOpt, 0)
+        self.headerBox.addWidget(self.searchOpt, 0, QtAlignMiddle)
         self.headerBox.setContentsMargins(0, 0, 0, 0)
+        self.headerBox.setSpacing(0)
+
+        self.headerWidget = QWidget(self)
+        self.headerWidget.setLayout(self.headerBox)
+        self.headerWidget.setContentsMargins(0, 0, 0, 0)
 
         self.outerBox = QVBoxLayout()
-        self.outerBox.addLayout(self.headerBox, 0)
+        self.outerBox.addWidget(self.headerWidget, 0)
         self.outerBox.addWidget(self.searchText, 0)
         self.outerBox.addWidget(self.searchResult, 1)
         self.outerBox.setContentsMargins(0, 0, 0, 0)
@@ -144,9 +154,21 @@ class GuiProjectSearch(QWidget):
 
     def updateTheme(self) -> None:
         """Update theme elements."""
+        bPx = CONFIG.pxInt(1)
+        mPx = CONFIG.pxInt(2)
+
         qPalette = self.palette()
-        qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base())
-        self.setPalette(qPalette)
+        colBase = cssCol(qPalette.base().color())
+        colFocus = cssCol(qPalette.highlight().color())
+
+        self.headerWidget.setStyleSheet(f"background: {colBase};")
+        self.headerWidget.setAutoFillBackground(True)
+
+        self.setStyleSheet(
+            "QToolBar {padding: 0; background: none;} "
+            f"QLineEdit {{border: {bPx}px solid {colBase}; padding: {mPx}px;}} "
+            f"QLineEdit:focus {{border: {bPx}px solid {colFocus};}} "
+        )
 
         self.searchAction.setIcon(SHARED.theme.getIcon("search"))
         self.toggleCase.setIcon(SHARED.theme.getIcon("search_case"))
@@ -170,14 +192,18 @@ class GuiProjectSearch(QWidget):
             )
         return
 
-    def beginSearch(self) -> None:
+    def beginSearch(self, text: str = "") -> None:
         """Focus the search box and select its text, if any."""
         self.searchText.setFocus()
         self.searchText.selectAll()
+        if text:
+            self.searchText.setText(text.partition("\n")[0])
+            self.searchText.selectAll()
         return
 
     def closeProjectTasks(self) -> None:
         """Run close project tasks."""
+        self._map = {}
         self.searchText.clear()
         self.searchResult.clear()
         return
@@ -209,6 +235,20 @@ class GuiProjectSearch(QWidget):
             super().keyPressEvent(event)
         return
 
+    ##
+    #  Public Slots
+    ##
+
+    @pyqtSlot(str, float)
+    def textChanged(self, tHandle: str, timeStamp: float) -> None:
+        """Update search result for a specific document."""
+        if (entry := self._map.get(tHandle)) and timeStamp > entry[1]:
+            start = time()
+            results, capped = self._search.searchText(SHARED.mainGui.docEditor.getText())
+            self._displayResultSet(SHARED.project.tree[tHandle], results, capped)
+            logger.debug("Updated search for '%s' in %.3f ms", tHandle, 1000*(time() - start))
+        return
+
     ##
     #  Private Slots
     ##
@@ -217,19 +257,21 @@ class GuiProjectSearch(QWidget):
     def _processSearch(self) -> None:
         """Perform a search."""
         if not self._blocked:
-            qApp.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
+            QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
             start = time()
+            SHARED.mainGui.saveDocument()
             self._blocked = True
+            self._map = {}
             self.searchResult.clear()
             if text := self.searchText.text():
                 self._search.setUserRegEx(self.toggleRegEx.isChecked())
                 self._search.setCaseSensitive(self.toggleCase.isChecked())
                 self._search.setWholeWords(self.toggleWord.isChecked())
                 for item, results, capped in self._search.iterSearch(SHARED.project, text):
-                    self._appendResultSet(item, results, capped)
+                    self._displayResultSet(item, results, capped)
             logger.debug("Search took %.3f ms", 1000*(time() - start))
             self._time = time()
-            qApp.restoreOverrideCursor()
+            QApplication.restoreOverrideCursor()
         self._blocked = False
         return
 
@@ -274,11 +316,11 @@ class GuiProjectSearch(QWidget):
     #  Internal Functions
     ##
 
-    def _appendResultSet(
-        self, nwItem: NWItem, results: list[tuple[int, int, str]], capped: bool
+    def _displayResultSet(
+        self, nwItem: NWItem | None, results: list[tuple[int, int, str]], capped: bool
     ) -> None:
         """Populate the result tree."""
-        if results:
+        if results and nwItem:
             tHandle = nwItem.itemHandle
             docIcon = SHARED.theme.getItemIcon(
                 nwItem.itemType, nwItem.itemClass,
@@ -291,9 +333,13 @@ class GuiProjectSearch(QWidget):
             tItem.setIcon(self.C_NAME, docIcon)
             tItem.setData(self.C_NAME, self.D_HANDLE, tHandle)
             tItem.setText(self.C_COUNT, f"({len(results):n}{ext})")
-            tItem.setTextAlignment(self.C_COUNT, Qt.AlignmentFlag.AlignRight)
+            tItem.setTextAlignment(self.C_COUNT, QtAlignRight)
             tItem.setForeground(self.C_COUNT, self.palette().highlight())
-            self.searchResult.addTopLevelItem(tItem)
+
+            index = self._map.get(tHandle, (self.searchResult.topLevelItemCount(), 0.0))[0]
+            self.searchResult.takeTopLevelItem(index)
+            self.searchResult.insertTopLevelItem(index, tItem)
+            self._map[tHandle] = (index, time())
 
             rItems = []
             for start, length, context in results:
@@ -309,7 +355,7 @@ class GuiProjectSearch(QWidget):
             for i in range(tItem.childCount()):
                 self.searchResult.setFirstColumnSpanned(i, parent, True)
 
-            qApp.processEvents()
+            QApplication.processEvents()
 
         return
 

novelwriter/gui/sidebar.py

@@ -28,7 +28,7 @@ import logging
 from typing import TYPE_CHECKING
 
 from PyQt5.QtGui import QPalette
-from PyQt5.QtCore import QEvent, QPoint, pyqtSignal
+from PyQt5.QtCore import QEvent, QPoint, QSize, pyqtSignal
 from PyQt5.QtWidgets import QMenu, QVBoxLayout, QWidget
 
 from novelwriter import CONFIG, SHARED
@@ -54,41 +54,43 @@ class GuiSideBar(QWidget):
 
         self.mainGui = mainGui
 
-        iPx = CONFIG.pxInt(24)
+        iPx = int(1.2*SHARED.theme.baseButtonHeight)
+        iSz = QSize(iPx, iPx)
+
         self.setContentsMargins(0, 0, 0, 0)
         self.installEventFilter(StatusTipFilter(mainGui))
 
         # Buttons
-        self.tbProject = NIconToolButton(self, iPx)
+        self.tbProject = NIconToolButton(self, iSz)
         self.tbProject.setToolTip("{0} [Ctrl+T]".format(self.tr("Project Tree View")))
         self.tbProject.clicked.connect(lambda: self.requestViewChange.emit(nwView.PROJECT))
 
-        self.tbNovel = NIconToolButton(self, iPx)
+        self.tbNovel = NIconToolButton(self, iSz)
         self.tbNovel.setToolTip("{0} [Ctrl+T]".format(self.tr("Novel Tree View")))
         self.tbNovel.clicked.connect(lambda: self.requestViewChange.emit(nwView.NOVEL))
 
-        self.tbSearch = NIconToolButton(self, iPx)
-        self.tbSearch.setToolTip("{0} [Ctrl+Shift+F]".format(self.tr("Search Project")))
+        self.tbSearch = NIconToolButton(self, iSz)
+        self.tbSearch.setToolTip("{0} [Ctrl+Shift+F]".format(self.tr("Project Search")))
         self.tbSearch.clicked.connect(lambda: self.requestViewChange.emit(nwView.SEARCH))
 
-        self.tbOutline = NIconToolButton(self, iPx)
+        self.tbOutline = NIconToolButton(self, iSz)
         self.tbOutline.setToolTip("{0} [Ctrl+Shift+T]".format(self.tr("Novel Outline View")))
         self.tbOutline.clicked.connect(lambda: self.requestViewChange.emit(nwView.OUTLINE))
 
-        self.tbBuild = NIconToolButton(self, iPx)
+        self.tbBuild = NIconToolButton(self, iSz)
         self.tbBuild.setToolTip("{0} [F5]".format(self.tr("Build Manuscript")))
         self.tbBuild.clicked.connect(self.mainGui.showBuildManuscriptDialog)
 
-        self.tbDetails = NIconToolButton(self, iPx)
+        self.tbDetails = NIconToolButton(self, iSz)
         self.tbDetails.setToolTip("{0} [Shift+F6]".format(self.tr("Novel Details")))
         self.tbDetails.clicked.connect(self.mainGui.showNovelDetailsDialog)
 
-        self.tbStats = NIconToolButton(self, iPx)
+        self.tbStats = NIconToolButton(self, iSz)
         self.tbStats.setToolTip("{0} [F6]".format(self.tr("Writing Statistics")))
         self.tbStats.clicked.connect(self.mainGui.showWritingStatsDialog)
 
         # Settings Menu
-        self.tbSettings = NIconToolButton(self, iPx)
+        self.tbSettings = NIconToolButton(self, iSz)
         self.tbSettings.setToolTip(self.tr("Settings"))
 
         self.mSettings = _PopRightMenu(self.tbSettings)
@@ -123,35 +125,29 @@ class GuiSideBar(QWidget):
     def updateTheme(self) -> None:
         """Initialise GUI elements that depend on specific settings."""
         qPalette = self.palette()
-        qPalette.setBrush(QPalette.Window, qPalette.base())
+        qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base())
         self.setPalette(qPalette)
 
         buttonStyle = SHARED.theme.getStyleSheet(STYLES_BIG_TOOLBUTTON)
 
-        self.tbProject.setIcon(SHARED.theme.getIcon("view_editor"))
         self.tbProject.setStyleSheet(buttonStyle)
-
-        self.tbNovel.setIcon(SHARED.theme.getIcon("view_novel"))
         self.tbNovel.setStyleSheet(buttonStyle)
-
-        self.tbSearch.setIcon(SHARED.theme.getIcon("view_search"))
         self.tbSearch.setStyleSheet(buttonStyle)
-
-        self.tbOutline.setIcon(SHARED.theme.getIcon("view_outline"))
         self.tbOutline.setStyleSheet(buttonStyle)
-
-        self.tbBuild.setIcon(SHARED.theme.getIcon("view_build"))
         self.tbBuild.setStyleSheet(buttonStyle)
-
-        self.tbDetails.setIcon(SHARED.theme.getIcon("proj_details"))
         self.tbDetails.setStyleSheet(buttonStyle)
-
-        self.tbStats.setIcon(SHARED.theme.getIcon("proj_stats"))
         self.tbStats.setStyleSheet(buttonStyle)
-
-        self.tbSettings.setIcon(SHARED.theme.getIcon("settings"))
         self.tbSettings.setStyleSheet(buttonStyle)
 
+        self.tbProject.setThemeIcon("view_editor")
+        self.tbNovel.setThemeIcon("view_novel")
+        self.tbSearch.setThemeIcon("view_search")
+        self.tbOutline.setThemeIcon("view_outline")
+        self.tbBuild.setThemeIcon("view_build")
+        self.tbDetails.setThemeIcon("proj_details")
+        self.tbStats.setThemeIcon("proj_stats")
+        self.tbSettings.setThemeIcon("settings")
+
         return
 
 # END Class GuiSideBar
@@ -161,7 +157,7 @@ class _PopRightMenu(QMenu):
 
     def event(self, event: QEvent) -> bool:
         """Overload the show event and move the menu popup location."""
-        if event.type() == QEvent.Show:
+        if event.type() == QEvent.Type.Show:
             if isinstance(parent := self.parent(), QWidget):
                 offset = QPoint(parent.width(), parent.height() - self.height())
                 self.move(parent.mapToGlobal(offset))

novelwriter/gui/statusbar.py

@@ -25,12 +25,12 @@ from __future__ import annotations
 
 import logging
 
+from datetime import datetime
 from time import time
 from typing import TYPE_CHECKING, Literal
-from datetime import datetime
 
 from PyQt5.QtCore import pyqtSlot, QLocale
-from PyQt5.QtWidgets import qApp, QStatusBar, QLabel
+from PyQt5.QtWidgets import QApplication, QStatusBar, QLabel
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime
@@ -58,7 +58,7 @@ class GuiMainStatus(QStatusBar):
         colSaved = SHARED.theme.statSaved
         colUnsaved = SHARED.theme.statUnsaved
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
 
         # Permanent Widgets
         # =================
@@ -66,8 +66,8 @@ class GuiMainStatus(QStatusBar):
         xM = CONFIG.pxInt(8)
 
         # The Spell Checker Language
-        self.langIcon = QLabel("")
-        self.langText = QLabel(self.tr("None"))
+        self.langIcon = QLabel("", self)
+        self.langText = QLabel(self.tr("None"), self)
         self.langIcon.setContentsMargins(0, 0, 0, 0)
         self.langText.setContentsMargins(0, 0, xM, 0)
         self.addPermanentWidget(self.langIcon)
@@ -75,7 +75,7 @@ class GuiMainStatus(QStatusBar):
 
         # The Editor Status
         self.docIcon = StatusLED(colNone, colSaved, colUnsaved, iPx, iPx, self)
-        self.docText = QLabel(self.tr("Editor"))
+        self.docText = QLabel(self.tr("Editor"), self)
         self.docIcon.setContentsMargins(0, 0, 0, 0)
         self.docText.setContentsMargins(0, 0, xM, 0)
         self.addPermanentWidget(self.docIcon)
@@ -83,15 +83,15 @@ class GuiMainStatus(QStatusBar):
 
         # The Project Status
         self.projIcon = StatusLED(colNone, colSaved, colUnsaved, iPx, iPx, self)
-        self.projText = QLabel(self.tr("Project"))
+        self.projText = QLabel(self.tr("Project"), self)
         self.projIcon.setContentsMargins(0, 0, 0, 0)
         self.projText.setContentsMargins(0, 0, xM, 0)
         self.addPermanentWidget(self.projIcon)
         self.addPermanentWidget(self.projText)
 
         # The Project and Session Stats
-        self.statsIcon = QLabel()
-        self.statsText = QLabel("")
+        self.statsIcon = QLabel(self)
+        self.statsText = QLabel("", self)
         self.statsIcon.setContentsMargins(0, 0, 0, 0)
         self.statsText.setContentsMargins(0, 0, xM, 0)
         self.addPermanentWidget(self.statsIcon)
@@ -99,8 +99,8 @@ class GuiMainStatus(QStatusBar):
 
         # The Session Clock
         # Set the minimum width so the label doesn't rescale every second
-        self.timeIcon = QLabel()
-        self.timeText = QLabel("")
+        self.timeIcon = QLabel(self)
+        self.timeText = QLabel("", self)
         self.timeText.setToolTip(self.tr("Session Time"))
         self.timeText.setMinimumWidth(SHARED.theme.getTextWidth("00:00:00:"))
         self.timeIcon.setContentsMargins(0, 0, 0, 0)
@@ -130,7 +130,7 @@ class GuiMainStatus(QStatusBar):
 
     def updateTheme(self) -> None:
         """Update theme elements."""
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
         self.langIcon.setPixmap(SHARED.theme.getPixmap("status_lang", (iPx, iPx)))
         self.statsIcon.setPixmap(SHARED.theme.getPixmap("status_stats", (iPx, iPx)))
         self.timePixmap = SHARED.theme.getPixmap("status_time", (iPx, iPx))
@@ -198,7 +198,7 @@ class GuiMainStatus(QStatusBar):
     def setStatusMessage(self, message: str) -> None:
         """Set the status bar message to display."""
         self.showMessage(message, nwConst.STATUS_MSG_TIMEOUT)
-        qApp.processEvents()
+        QApplication.processEvents()
         return
 
     @pyqtSlot(str, str)
@@ -240,7 +240,7 @@ class GuiMainStatus(QStatusBar):
         import tracemalloc
         from collections import Counter
 
-        widgets = qApp.allWidgets()
+        widgets = QApplication.allWidgets()
         if not self._debugInfo:
             if tracemalloc.is_tracing():
                 self._traceMallocRef = "Total"

novelwriter/gui/theme.py

@@ -29,17 +29,17 @@ import logging
 from math import ceil
 from pathlib import Path
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import qApp
+from PyQt5.QtCore import QSize, Qt
 from PyQt5.QtGui import (
     QPalette, QColor, QIcon, QFont, QFontMetrics, QFontDatabase, QPixmap
 )
+from PyQt5.QtWidgets import QApplication
 
 from novelwriter import CONFIG
+from novelwriter.common import NWConfigParser, cssCol, minmax
+from novelwriter.constants import nwLabels
 from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
 from novelwriter.error import logException
-from novelwriter.common import NWConfigParser, minmax
-from novelwriter.constants import nwLabels
 
 logger = logging.getLogger(__name__)
 
@@ -144,33 +144,42 @@ class GuiTheme:
         self.getHeaderDecorationNarrow = self.iconCache.getHeaderDecorationNarrow
 
         # Extract Other Info
-        self.guiDPI = qApp.primaryScreen().logicalDotsPerInchX()
-        self.guiScale = qApp.primaryScreen().logicalDotsPerInchX()/96.0
+        self.guiDPI = QApplication.primaryScreen().logicalDotsPerInchX()
+        self.guiScale = QApplication.primaryScreen().logicalDotsPerInchX()/96.0
         CONFIG.guiScale = self.guiScale
         logger.debug("GUI DPI: %.1f", self.guiDPI)
         logger.debug("GUI Scale: %.2f", self.guiScale)
 
         # Fonts
-        self.guiFont = qApp.font()
-        self.guiFontB = qApp.font()
+        self.guiFont = QApplication.font()
+        self.guiFontB = QApplication.font()
         self.guiFontB.setBold(True)
 
         qMetric = QFontMetrics(self.guiFont)
+        fHeight = qMetric.height()
+        fAscent = qMetric.ascent()
         self.fontPointSize = self.guiFont.pointSizeF()
-        self.fontPixelSize = int(round(qMetric.height()))
-        self.baseIconSize = int(round(qMetric.ascent()))
+        self.fontPixelSize = int(round(fHeight))
+        self.baseIconHeight = int(round(fAscent))
+        self.baseButtonHeight = int(round(1.35*fAscent))
         self.textNHeight = qMetric.boundingRect("N").height()
         self.textNWidth = qMetric.boundingRect("N").width()
 
+        self.baseIconSize = QSize(self.baseIconHeight, self.baseIconHeight)
+        self.buttonIconSize = QSize(int(0.9*self.baseIconHeight), int(0.9*self.baseIconHeight))
+
         # Monospace Font
         self.guiFontFixed = QFont()
         self.guiFontFixed.setPointSizeF(0.95*self.fontPointSize)
-        self.guiFontFixed.setFamily(QFontDatabase.systemFont(QFontDatabase.FixedFont).family())
+        self.guiFontFixed.setFamily(
+            QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont).family()
+        )
 
         logger.debug("GUI Font Family: %s", self.guiFont.family())
         logger.debug("GUI Font Point Size: %.2f", self.fontPointSize)
         logger.debug("GUI Font Pixel Size: %d", self.fontPixelSize)
-        logger.debug("GUI Base Icon Size: %d", self.baseIconSize)
+        logger.debug("GUI Base Icon Height: %d", self.baseIconHeight)
+        logger.debug("GUI Base Button Height: %d", self.baseButtonHeight)
         logger.debug("Text 'N' Height: %d", self.textNHeight)
         logger.debug("Text 'N' Width: %d", self.textNWidth)
 
@@ -248,7 +257,7 @@ class GuiTheme:
             self._setPalette(parser, sec, "link",            QPalette.ColorRole.Link)
             self._setPalette(parser, sec, "linkvisited",     QPalette.ColorRole.LinkVisited)
         else:
-            self._guiPalette = qApp.style().standardPalette()
+            self._guiPalette = QApplication.style().standardPalette()
 
         # GUI
         sec = "GUI"
@@ -277,7 +286,7 @@ class GuiTheme:
         self.iconCache.loadTheme(self.themeIcons or defaultIcons)
 
         # Apply Styles
-        qApp.setPalette(self._guiPalette)
+        QApplication.setPalette(self._guiPalette)
 
         # Reset stylesheets so that they are regenerated
         self._buildStyleSheets(self._guiPalette)
@@ -394,14 +403,14 @@ class GuiTheme:
                 font.setFamily("Arial")
                 font.setPointSize(10)
             else:
-                font = fontDB.systemFont(QFontDatabase.GeneralFont)
+                font = fontDB.systemFont(QFontDatabase.SystemFont.GeneralFont)
             CONFIG.guiFont = font.family()
             CONFIG.guiFontSize = font.pointSize()
         else:
             font.setFamily(CONFIG.guiFont)
             font.setPointSize(CONFIG.guiFontSize)
 
-        qApp.setFont(font)
+        QApplication.setFont(font)
 
         return
 
@@ -440,24 +449,24 @@ class GuiTheme:
 
         # Flat Tab Widget and Tab Bar:
         self._styleSheets[STYLES_FLAT_TABS] = (
-            "QTabWidget::pane {{border: 0;}} "
-            "QTabWidget QTabBar::tab {{border: 0; padding: {0}px {1}px;}} "
-            "QTabWidget QTabBar::tab:selected {{color: rgb({2}, {3}, {4});}} "
-        ).format(bPx, dPx, hCol.red(), hCol.green(), hCol.blue())
+            "QTabWidget::pane {border: 0;} "
+            f"QTabWidget QTabBar::tab {{border: 0; padding: {bPx}px {dPx}px;}} "
+            f"QTabWidget QTabBar::tab:selected {{color: {cssCol(hCol)};}} "
+        )
 
         # Minimal Tool Button
         self._styleSheets[STYLES_MIN_TOOLBUTTON] = (
-            "QToolButton {{padding: {0}px; margin: 0; border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({1}, {2}, {3}, 0.2);}} "
-            "QToolButton::menu-indicator {{image: none;}} "
-        ).format(aPx, tCol.red(), tCol.green(), tCol.blue())
+            f"QToolButton {{padding: {aPx}px; margin: 0; border: none; background: transparent;}} "
+            f"QToolButton:hover {{border: none; background: {cssCol(tCol, 48)};}} "
+            "QToolButton::menu-indicator {image: none;} "
+        )
 
         # Big Tool Button
         self._styleSheets[STYLES_BIG_TOOLBUTTON] = (
-            "QToolButton {{padding: {0}px; margin: 0; border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({1}, {2}, {3}, 0.2);}} "
-            "QToolButton::menu-indicator {{image: none;}} "
-        ).format(cPx, tCol.red(), tCol.green(), tCol.blue())
+            f"QToolButton {{padding: {cPx}px; margin: 0; border: none; background: transparent;}} "
+            f"QToolButton:hover {{border: none; background: {cssCol(tCol, 48)};}} "
+            "QToolButton::menu-indicator {image: none;} "
+        )
 
         return
 
@@ -544,6 +553,9 @@ class GuiIcons:
         self._confName = "icons.conf"
         self._iconPath = CONFIG.assetPath("icons")
 
+        # None Icon
+        self._noIcon = QIcon(str(self._iconPath / "none.svg"))
+
         # Icon Theme Meta
         self.themeName        = ""
         self.themeDescription = ""
@@ -674,13 +686,13 @@ class GuiIcons:
     def getToggleIcon(self, name: str, size: tuple[int, int]) -> QIcon:
         """Return a toggle icon from the icon buffer. or load it."""
         if name in self.TOGGLE_ICON_KEYS:
-            pOne  = self.getPixmap(self.TOGGLE_ICON_KEYS[name][0], size)
+            pOne = self.getPixmap(self.TOGGLE_ICON_KEYS[name][0], size)
             pTwo = self.getPixmap(self.TOGGLE_ICON_KEYS[name][1], size)
             icon = QIcon()
             icon.addPixmap(pOne, QIcon.Mode.Normal, QIcon.State.On)
             icon.addPixmap(pTwo, QIcon.Mode.Normal, QIcon.State.Off)
             return icon
-        return QIcon()
+        return self._noIcon
 
     def getPixmap(self, name: str, size: tuple[int, int]) -> QPixmap:
         """Return an icon from the icon buffer as a QPixmap. If it
@@ -712,14 +724,14 @@ class GuiIcons:
             elif tLayout == nwItemLayout.NOTE:
                 iconName = "proj_note"
         if iconName is None:
-            return QIcon()
+            return self._noIcon
 
         return self.getIcon(iconName)
 
     def getHeaderDecoration(self, hLevel: int) -> QPixmap:
         """Get the decoration for a specific heading level."""
         if not self._headerDec:
-            iPx = self.mainTheme.baseIconSize
+            iPx = self.mainTheme.baseIconHeight
             self._headerDec = [
                 self.loadDecoration("deco_doc_h0", h=iPx),
                 self.loadDecoration("deco_doc_h1", h=iPx),
@@ -732,7 +744,7 @@ class GuiIcons:
     def getHeaderDecorationNarrow(self, hLevel: int) -> QPixmap:
         """Get the narrow decoration for a specific heading level."""
         if not self._headerDecNarrow:
-            iPx = self.mainTheme.baseIconSize
+            iPx = self.mainTheme.baseIconHeight
             self._headerDecNarrow = [
                 self.loadDecoration("deco_doc_h0_n", h=iPx),
                 self.loadDecoration("deco_doc_h1_n", h=iPx),
@@ -753,7 +765,7 @@ class GuiIcons:
         """
         if name not in self.ICON_KEYS:
             logger.error("Requested unknown icon name '%s'", name)
-            return QIcon()
+            return self._noIcon
 
         # If we just want the app icons, return right away
         if name == "novelwriter":
@@ -769,7 +781,7 @@ class GuiIcons:
         # If we didn't find one, give up and return an empty icon
         logger.warning("Did not load an icon for '%s'", name)
 
-        return QIcon()
+        return self._noIcon
 
 # END Class GuiIcons