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

novelwriter/tools/noveldetails.py

@@ -26,24 +26,28 @@ from __future__ import annotations
 import logging
 import math
 
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtWidgets import (
+from typing import TYPE_CHECKING
+
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import (
     QAbstractItemView, QDialogButtonBox, QFormLayout, QGridLayout, QHBoxLayout,
     QLabel, QSpinBox, QStackedWidget, QTreeWidget, QTreeWidgetItem,
     QVBoxLayout, QWidget
 )
 
-from novelwriter import CONFIG, SHARED
+from novelwriter import SHARED
 from novelwriter.common import formatTime, numberToRoman
 from novelwriter.constants import nwUnicode
-from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollablePage
+from novelwriter.extensions.configlayout import NColorLabel, NFixedPage, NScrollablePage
 from novelwriter.extensions.modified import NNonBlockingDialog
 from novelwriter.extensions.novelselector import NovelSelector
 from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.types import QtAlignRight, QtDecoration, QtDialogClose
 
+if TYPE_CHECKING:
+    from PyQt6.QtGui import QCloseEvent
+
 logger = logging.getLogger(__name__)
 
 
@@ -60,16 +64,16 @@ class GuiNovelDetails(NNonBlockingDialog):
         self.setWindowTitle(self.tr("Novel Details"))
 
         options = SHARED.project.options
-        self.setMinimumSize(CONFIG.pxInt(500), CONFIG.pxInt(400))
+        self.setMinimumSize(500, 400)
         self.resize(
-            CONFIG.pxInt(options.getInt("GuiNovelDetails", "winWidth", CONFIG.pxInt(650))),
-            CONFIG.pxInt(options.getInt("GuiNovelDetails", "winHeight", CONFIG.pxInt(500)))
+            options.getInt("GuiNovelDetails", "winWidth", 650),
+            options.getInt("GuiNovelDetails", "winHeight", 500),
         )
 
         # Title
-        self.titleLabel = NColourLabel(
+        self.titleLabel = NColorLabel(
             self.tr("Novel Details"), self, color=SHARED.theme.helpText,
-            scale=NColourLabel.HEADER_SCALE, indent=CONFIG.pxInt(4)
+            scale=NColorLabel.HEADER_SCALE, indent=4,
         )
 
         # Novel Selector
@@ -114,7 +118,7 @@ class GuiNovelDetails(NNonBlockingDialog):
         self.outerBox.addLayout(self.topBox)
         self.outerBox.addLayout(self.mainBox)
         self.outerBox.addWidget(self.buttonBox)
-        self.outerBox.setSpacing(CONFIG.pxInt(8))
+        self.outerBox.setSpacing(8)
 
         self.setLayout(self.outerBox)
         self.setSizeGripEnabled(True)
@@ -137,9 +141,10 @@ class GuiNovelDetails(NNonBlockingDialog):
 
     def updateValues(self) -> None:
         """Load the dialogs initial values."""
-        self.overviewPage.updateProjectData()
-        self.overviewPage.novelValueChanged(self.novelSelector.handle)
-        self.contentsPage.novelValueChanged(self.novelSelector.handle)
+        if handle := self.novelSelector.handle:
+            self.overviewPage.updateProjectData()
+            self.overviewPage.novelValueChanged(handle)
+            self.contentsPage.novelValueChanged(handle)
         return
 
     ##
@@ -172,18 +177,13 @@ class GuiNovelDetails(NNonBlockingDialog):
 
     def _saveSettings(self) -> None:
         """Save the user GUI settings."""
-        winWidth  = CONFIG.rpxInt(self.width())
-        winHeight = CONFIG.rpxInt(self.height())
-        novelRoot = self.novelSelector.handle
-
         logger.debug("Saving State: GuiNovelDetails")
+        novelRoot = self.novelSelector.handle
         options = SHARED.project.options
-        options.setValue("GuiNovelDetails", "winWidth", winWidth)
-        options.setValue("GuiNovelDetails", "winHeight", winHeight)
+        options.setValue("GuiNovelDetails", "winWidth", self.width())
+        options.setValue("GuiNovelDetails", "winHeight", self.height())
         options.setValue("GuiNovelDetails", "novelRoot", novelRoot)
-
         self.contentsPage.saveSettings()
-
         return
 
 
@@ -192,15 +192,10 @@ class _OverviewPage(NScrollablePage):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        mPx = CONFIG.pxInt(8)
-        sPx = CONFIG.pxInt(16)
-        hPx = CONFIG.pxInt(24)
-        vPx = CONFIG.pxInt(4)
-
         # Project Info
-        self.projLabel = NColourLabel(
+        self.projLabel = NColorLabel(
             self.tr("Project"), self, color=SHARED.theme.helpText,
-            scale=NColourLabel.HEADER_SCALE
+            scale=NColorLabel.HEADER_SCALE
         )
 
         self.projName = QLabel("", self)
@@ -217,14 +212,14 @@ class _OverviewPage(NScrollablePage):
         self.projForm.addRow("<b>{0}</b>".format(self.tr("Word Count")), self.projWords)
         self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Novels")), self.projNovels)
         self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Notes")), self.projNotes)
-        self.projForm.setContentsMargins(mPx, 0, 0, 0)
-        self.projForm.setHorizontalSpacing(hPx)
-        self.projForm.setVerticalSpacing(vPx)
+        self.projForm.setContentsMargins(8, 0, 0, 0)
+        self.projForm.setHorizontalSpacing(24)
+        self.projForm.setVerticalSpacing(4)
 
         # Novel Info
-        self.novelLabel = NColourLabel(
+        self.novelLabel = NColorLabel(
             self.tr("Selected Novel"), self, color=SHARED.theme.helpText,
-            scale=NColourLabel.HEADER_SCALE
+            scale=NColorLabel.HEADER_SCALE
         )
 
         self.novelName = QLabel("", self)
@@ -237,9 +232,9 @@ class _OverviewPage(NScrollablePage):
         self.novelForm.addRow("<b>{0}</b>".format(self.tr("Word Count")), self.novelWords)
         self.novelForm.addRow("<b>{0}</b>".format(self.tr("Chapters")), self.novelChapters)
         self.novelForm.addRow("<b>{0}</b>".format(self.tr("Scenes")), self.novelScenes)
-        self.novelForm.setContentsMargins(mPx, 0, 0, 0)
-        self.novelForm.setHorizontalSpacing(hPx)
-        self.novelForm.setVerticalSpacing(vPx)
+        self.novelForm.setContentsMargins(8, 0, 0, 0)
+        self.novelForm.setHorizontalSpacing(24)
+        self.novelForm.setVerticalSpacing(4)
 
         # Assemble
         self.outerBox = QVBoxLayout()
@@ -247,7 +242,7 @@ class _OverviewPage(NScrollablePage):
         self.outerBox.addLayout(self.projForm)
         self.outerBox.addWidget(self.novelLabel)
         self.outerBox.addLayout(self.novelForm)
-        self.outerBox.setSpacing(sPx)
+        self.outerBox.setSpacing(16)
         self.outerBox.addStretch(1)
 
         self.setCentralLayout(self.outerBox)
@@ -309,14 +304,12 @@ class _ContentsPage(NFixedPage):
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
-        hPx = CONFIG.pxInt(12)
-        vPx = CONFIG.pxInt(4)
         options = SHARED.project.options
 
         # Title
-        self.contentLabel = NColourLabel(
+        self.contentLabel = NColorLabel(
             self.tr("Table of Contents"), self, color=SHARED.theme.helpText,
-            scale=NColourLabel.HEADER_SCALE
+            scale=NColorLabel.HEADER_SCALE
         )
 
         # Contents Tree
@@ -341,22 +334,22 @@ class _ContentsPage(NFixedPage):
             treeHeadItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
             treeHeadItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
-        treeHeader = self.tocTree.header()
-        treeHeader.setStretchLastSection(True)
-        treeHeader.setMinimumSectionSize(hPx)
+        if header := self.tocTree.header():
+            header.setStretchLastSection(True)
+            header.setMinimumSectionSize(12)
 
-        wCol0 = CONFIG.pxInt(options.getInt("GuiNovelDetails", "widthCol0", 200))
-        wCol1 = CONFIG.pxInt(options.getInt("GuiNovelDetails", "widthCol1", 60))
-        wCol2 = CONFIG.pxInt(options.getInt("GuiNovelDetails", "widthCol2", 60))
-        wCol3 = CONFIG.pxInt(options.getInt("GuiNovelDetails", "widthCol3", 60))
-        wCol4 = CONFIG.pxInt(options.getInt("GuiNovelDetails", "widthCol4", 90))
+        wCol0 = options.getInt("GuiNovelDetails", "widthCol0", 200)
+        wCol1 = options.getInt("GuiNovelDetails", "widthCol1", 60)
+        wCol2 = options.getInt("GuiNovelDetails", "widthCol2", 60)
+        wCol3 = options.getInt("GuiNovelDetails", "widthCol3", 60)
+        wCol4 = options.getInt("GuiNovelDetails", "widthCol4", 90)
 
         self.tocTree.setColumnWidth(0, wCol0)
         self.tocTree.setColumnWidth(1, wCol1)
         self.tocTree.setColumnWidth(2, wCol2)
         self.tocTree.setColumnWidth(3, wCol3)
         self.tocTree.setColumnWidth(4, wCol4)
-        self.tocTree.setColumnWidth(5, hPx)
+        self.tocTree.setColumnWidth(5, 12)
 
         # Options
         wordsPerPage = options.getInt("GuiNovelDetails", "wordsPerPage", 350)
@@ -394,8 +387,8 @@ class _ContentsPage(NFixedPage):
         self.optionsBox.addWidget(self.dblValue, 0, 4)
         self.optionsBox.addWidget(self.poLabel,  1, 0)
         self.optionsBox.addWidget(self.poValue,  1, 1)
-        self.optionsBox.setHorizontalSpacing(hPx)
-        self.optionsBox.setVerticalSpacing(vPx)
+        self.optionsBox.setHorizontalSpacing(12)
+        self.optionsBox.setVerticalSpacing(4)
         self.optionsBox.setColumnStretch(2, 1)
 
         # Assemble
@@ -410,18 +403,12 @@ class _ContentsPage(NFixedPage):
 
     def saveSettings(self) -> None:
         """Save the user GUI settings."""
-        widthCol0 = CONFIG.rpxInt(self.tocTree.columnWidth(0))
-        widthCol1 = CONFIG.rpxInt(self.tocTree.columnWidth(1))
-        widthCol2 = CONFIG.rpxInt(self.tocTree.columnWidth(2))
-        widthCol3 = CONFIG.rpxInt(self.tocTree.columnWidth(3))
-        widthCol4 = CONFIG.rpxInt(self.tocTree.columnWidth(4))
-
         options = SHARED.project.options
-        options.setValue("GuiNovelDetails", "widthCol0",    widthCol0)
-        options.setValue("GuiNovelDetails", "widthCol1",    widthCol1)
-        options.setValue("GuiNovelDetails", "widthCol2",    widthCol2)
-        options.setValue("GuiNovelDetails", "widthCol3",    widthCol3)
-        options.setValue("GuiNovelDetails", "widthCol4",    widthCol4)
+        options.setValue("GuiNovelDetails", "widthCol0",    self.tocTree.columnWidth(0))
+        options.setValue("GuiNovelDetails", "widthCol1",    self.tocTree.columnWidth(1))
+        options.setValue("GuiNovelDetails", "widthCol2",    self.tocTree.columnWidth(2))
+        options.setValue("GuiNovelDetails", "widthCol3",    self.tocTree.columnWidth(3))
+        options.setValue("GuiNovelDetails", "widthCol4",    self.tocTree.columnWidth(4))
         options.setValue("GuiNovelDetails", "wordsPerPage", self.wpValue.value())
         options.setValue("GuiNovelDetails", "countFrom",    self.poValue.value())
         options.setValue("GuiNovelDetails", "clearDouble",  self.dblValue.isChecked())

novelwriter/tools/welcome.py

@@ -28,20 +28,19 @@ import logging
 from datetime import datetime
 from pathlib import Path
 
-from PyQt5.QtCore import (
-    QAbstractListModel, QEvent, QModelIndex, QObject, QPoint, QSize, Qt,
-    pyqtSignal, pyqtSlot
+from PyQt6.QtCore import (
+    QAbstractListModel, QModelIndex, QObject, QPoint, QSize, Qt, pyqtSignal,
+    pyqtSlot
 )
-from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPainter, QPaintEvent, QPen
-from PyQt5.QtWidgets import (
-    QAction, QApplication, QFileDialog, QFormLayout, QHBoxLayout, QLabel,
-    QLineEdit, QListView, QMenu, QPushButton, QScrollArea, QShortcut,
-    QStackedWidget, QStyledItemDelegate, QStyleOptionViewItem, QVBoxLayout,
-    QWidget
+from PyQt6.QtGui import QAction, QCloseEvent, QColor, QFont, QPainter, QPaintEvent, QPen, QShortcut
+from PyQt6.QtWidgets import (
+    QApplication, QFileDialog, QFormLayout, QHBoxLayout, QLabel, QLineEdit,
+    QListView, QMenu, QPushButton, QScrollArea, QStackedWidget,
+    QStyledItemDelegate, QStyleOptionViewItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.common import cssCol, formatInt, makeFileNameSafe
+from novelwriter.common import formatInt, makeFileNameSafe, qtAddAction, qtLambda
 from novelwriter.constants import nwFiles
 from novelwriter.core.coretools import ProjectBuilder
 from novelwriter.enum import nwItemClass
@@ -49,7 +48,7 @@ from novelwriter.extensions.configlayout import NWrappedWidgetBox
 from novelwriter.extensions.modified import NDialog, NIconToolButton, NSpinBox
 from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.versioninfo import VersionInfoWidget
-from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtScrollAsNeeded, QtSelected
+from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtHexArgb, QtScrollAsNeeded, QtSelected
 
 logger = logging.getLogger(__name__)
 
@@ -67,29 +66,21 @@ class GuiWelcome(NDialog):
         self.setObjectName("GuiWelcome")
 
         self.setWindowTitle(self.tr("Welcome"))
-        self.setMinimumWidth(CONFIG.pxInt(650))
-        self.setMinimumHeight(CONFIG.pxInt(450))
-
-        hA = CONFIG.pxInt(8)
-        hB = CONFIG.pxInt(16)
-        hC = CONFIG.pxInt(24)
-        hD = CONFIG.pxInt(36)
-        hE = CONFIG.pxInt(48)
-        hF = CONFIG.pxInt(128)
-        btnIconSize = SHARED.theme.buttonIconSize
-
-        self._hPx = CONFIG.pxInt(600)
+        self.setMinimumWidth(650)
+        self.setMinimumHeight(450)
         self.resize(*CONFIG.welcomeWinSize)
 
+        btnIconSize = SHARED.theme.buttonIconSize
+
         # Elements
         # ========
 
-        self.bgImage = SHARED.theme.loadDecoration("welcome")
-        self.nwImage = SHARED.theme.loadDecoration("nw-text", h=hD)
-        self.bgColor = QColor(255, 255, 255) if SHARED.theme.isLightTheme else QColor(54, 54, 54)
+        self.bgImage = SHARED.theme.getDecoration("welcome")
+        self.nwImage = SHARED.theme.getDecoration("nw-text", h=36)
+        self.bgColor = QColor(54, 54, 54) if SHARED.theme.isDarkTheme else QColor(255, 255, 255)
 
         self.nwLogo = QLabel(self)
-        self.nwLogo.setPixmap(SHARED.theme.getPixmap("novelwriter", (hF, hF)))
+        self.nwLogo.setPixmap(SHARED.theme.getPixmap("novelwriter", (128, 128)))
 
         self.nwLabel = QLabel(self)
         self.nwLabel.setPixmap(self.nwImage)
@@ -110,32 +101,32 @@ class GuiWelcome(NDialog):
         # =======
 
         self.btnList = QPushButton(self.tr("List"), self)
-        self.btnList.setIcon(SHARED.theme.getIcon("list"))
+        self.btnList.setIcon(SHARED.theme.getIcon("list", "blue"))
         self.btnList.setIconSize(btnIconSize)
         self.btnList.clicked.connect(self._showOpenProjectPage)
 
         self.btnNew = QPushButton(self.tr("New"), self)
-        self.btnNew.setIcon(SHARED.theme.getIcon("add"))
+        self.btnNew.setIcon(SHARED.theme.getIcon("add", "green"))
         self.btnNew.setIconSize(btnIconSize)
         self.btnNew.clicked.connect(self._showNewProjectPage)
 
         self.btnBrowse = QPushButton(self.tr("Browse"), self)
-        self.btnBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.btnBrowse.setIcon(SHARED.theme.getIcon("browse", "yellow"))
         self.btnBrowse.setIconSize(btnIconSize)
         self.btnBrowse.clicked.connect(self._browseForProject)
 
         self.btnCancel = QPushButton(self.tr("Cancel"), self)
-        self.btnCancel.setIcon(SHARED.theme.getIcon("cross"))
+        self.btnCancel.setIcon(SHARED.theme.getIcon("cancel", "red"))
         self.btnCancel.setIconSize(btnIconSize)
-        self.btnCancel.clicked.connect(self.close)
+        self.btnCancel.clicked.connect(qtLambda(self.close))
 
         self.btnCreate = QPushButton(self.tr("Create"), self)
-        self.btnCreate.setIcon(SHARED.theme.getIcon("star"))
+        self.btnCreate.setIcon(SHARED.theme.getIcon("star", "yellow"))
         self.btnCreate.setIconSize(btnIconSize)
         self.btnCreate.clicked.connect(self.tabNew.createNewProject)
 
         self.btnOpen = QPushButton(self.tr("Open"), self)
-        self.btnOpen.setIcon(SHARED.theme.getIcon("open"))
+        self.btnOpen.setIcon(SHARED.theme.getIcon("open", "blue"))
         self.btnOpen.setIconSize(btnIconSize)
         self.btnOpen.clicked.connect(self._openSelectedItem)
 
@@ -153,18 +144,18 @@ class GuiWelcome(NDialog):
         # ========
 
         self.innerBox = QVBoxLayout()
-        self.innerBox.addSpacing(hB)
+        self.innerBox.addSpacing(16)
         self.innerBox.addWidget(self.nwLabel)
         self.innerBox.addWidget(self.nwInfo)
-        self.innerBox.addSpacing(hA)
+        self.innerBox.addSpacing(8)
         self.innerBox.addWidget(self.mainStack)
-        self.innerBox.addSpacing(hB)
+        self.innerBox.addSpacing(16)
         self.innerBox.addLayout(self.btnBox)
 
         self.outerBox = QHBoxLayout()
         self.outerBox.addWidget(self.nwLogo, 3, QtAlignRightTop)
         self.outerBox.addLayout(self.innerBox, 9)
-        self.outerBox.setContentsMargins(hF, hE, hC, hE)
+        self.outerBox.setContentsMargins(128, 48, 24, 48)
 
         self.setLayout(self.outerBox)
         self.setSizeGripEnabled(True)
@@ -184,7 +175,7 @@ class GuiWelcome(NDialog):
     def paintEvent(self, event: QPaintEvent) -> None:
         """Overload the paint event to draw the background image."""
         hWin = self.height()
-        hPix = min(hWin, self._hPx)
+        hPix = min(hWin, 600)
         tMode = Qt.TransformationMode.SmoothTransformation
         painter = QPainter(self)
         painter.fillRect(self.rect(), self.bgColor)
@@ -289,7 +280,7 @@ class _OpenProjectPage(QWidget):
 
         # Info / Tool
         self.aMissing = QAction(self)
-        self.aMissing.setIcon(SHARED.theme.getIcon("alert_warn"))
+        self.aMissing.setIcon(SHARED.theme.getIcon("alert_warn", "orange"))
         self.aMissing.setToolTip(self.tr("The project path is not reachable."))
 
         self.selectedPath = QLineEdit(self)
@@ -310,11 +301,12 @@ class _OpenProjectPage(QWidget):
 
         self._selectFirstItem()
 
-        mPx = CONFIG.pxInt(4)
-        baseCol = cssCol(self.palette().base().color(), PANEL_ALPHA)
+        base = self.palette().base().color()
+        base.setAlpha(PANEL_ALPHA)
+        baseCol = base.name(QtHexArgb)
         self.setStyleSheet(
             f"QListView {{border: none; background: {baseCol};}} "
-            f"QLineEdit {{border: none; background: {baseCol}; padding: {mPx}px;}} "
+            f"QLineEdit {{border: none; background: {baseCol}; padding: 4px;}} "
         )
 
         return
@@ -371,9 +363,9 @@ class _OpenProjectPage(QWidget):
         """Open the custom context menu."""
         ctxMenu = QMenu(self)
         ctxMenu.setObjectName("ContextMenu")  # Used for testing
-        action = ctxMenu.addAction(self.tr("Open Project"))
+        action = qtAddAction(ctxMenu, self.tr("Open Project"))
         action.triggered.connect(self.openSelectedItem)
-        action = ctxMenu.addAction(self.tr("Remove Project"))
+        action = qtAddAction(ctxMenu, self.tr("Remove Project"))
         action.triggered.connect(self._deleteSelectedItem)
         ctxMenu.exec(self.mapToGlobal(pos))
         ctxMenu.setParent(None)
@@ -393,7 +385,7 @@ class _OpenProjectPage(QWidget):
 
 class _ProjectListItem(QStyledItemDelegate):
 
-    __slots__ = ("_pPx", "_hPx", "_tFont", "_dFont", "_dPen", "_icon")
+    __slots__ = ("_dFont", "_dPen", "_hPx", "_icon", "_pPx", "_tFont")
 
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
@@ -401,11 +393,10 @@ class _ProjectListItem(QStyledItemDelegate):
         fPx = SHARED.theme.fontPixelSize
         fPt = SHARED.theme.fontPointSize
         tPx = round(1.2 * fPx)
-        mPx = CONFIG.pxInt(4)
         iPx = tPx + fPx
 
-        self._pPx = (mPx//2, 3*mPx//2, iPx + mPx, mPx, mPx + tPx)  # Painter coordinates
-        self._hPx = 2*mPx + tPx + fPx  # Fixed height
+        self._pPx = (iPx + 4, tPx + 4)  # Painter coordinates
+        self._hPx = 8 + tPx + fPx  # Fixed height
 
         self._tFont = QApplication.font()
         self._tFont.setPointSizeF(1.2*fPt)
@@ -424,7 +415,7 @@ class _ProjectListItem(QStyledItemDelegate):
         rect = opt.rect
         title, _, details = index.data()
         tFlag = Qt.TextFlag.TextSingleLine
-        ix, iy, x, y1, y2 = self._pPx
+        x, y = self._pPx
 
         painter.save()
         if opt.state & QtSelected == QtSelected:
@@ -432,12 +423,12 @@ class _ProjectListItem(QStyledItemDelegate):
             painter.fillRect(rect, QApplication.palette().highlight())
             painter.setOpacity(1.0)
 
-        painter.drawPixmap(ix, rect.top() + iy, self._icon)
+        painter.drawPixmap(2, rect.top() + 6, self._icon)
         painter.setFont(self._tFont)
-        painter.drawText(rect.adjusted(x, y1, 0, 0), tFlag, title)
+        painter.drawText(rect.adjusted(x, 4, 0, 0), tFlag, title)
         painter.setFont(self._dFont)
         painter.setPen(self._dPen)
-        painter.drawText(rect.adjusted(x, y2, 0, 0), tFlag, details)
+        painter.drawText(rect.adjusted(x, y, 0, 0), tFlag, details)
         painter.restore()
 
         return
@@ -518,7 +509,9 @@ class _NewProjectPage(QWidget):
         # Styles
         # ======
 
-        baseCol = cssCol(self.palette().base().color(), PANEL_ALPHA)
+        base = self.palette().base().color()
+        base.setAlpha(PANEL_ALPHA)
+        baseCol = base.name(QtHexArgb)
         self.setStyleSheet(
             f"QScrollArea {{border: none; background: {baseCol};}} "
             f"_NewProjectForm {{border: none; background: {baseCol};}} "
@@ -558,7 +551,6 @@ class _NewProjectForm(QWidget):
 
         iPx = SHARED.theme.baseIconHeight
         iSz = SHARED.theme.baseIconSize
-        sPx = CONFIG.pxInt(16)
 
         # Project Settings
         # ================
@@ -589,20 +581,20 @@ class _NewProjectForm(QWidget):
         self.projFill = QLineEdit(self)
         self.projFill.setReadOnly(True)
 
-        self.browseFill = NIconToolButton(self, iSz, "add_document")
+        self.browseFill = NIconToolButton(self, iSz, "document_add", "blue")
 
-        self.fillMenu = _PopLeftDirectionMenu(self.browseFill)
+        self.fillMenu = QMenu(self.browseFill)
 
-        self.fillBlank = self.fillMenu.addAction(self.tr("Create a fresh project"))
+        self.fillBlank = qtAddAction(self.fillMenu, self.tr("Create a fresh project"))
         self.fillBlank.setIcon(SHARED.theme.getIcon("document"))
         self.fillBlank.triggered.connect(self._setFillBlank)
 
-        self.fillSample = self.fillMenu.addAction(self.tr("Create an example project"))
-        self.fillSample.setIcon(SHARED.theme.getIcon("add_document"))
+        self.fillSample = qtAddAction(self.fillMenu, self.tr("Create an example project"))
+        self.fillSample.setIcon(SHARED.theme.getIcon("document_add", "blue"))
         self.fillSample.triggered.connect(self._setFillSample)
 
-        self.fillCopy = self.fillMenu.addAction(self.tr("Copy an existing project"))
-        self.fillCopy.setIcon(SHARED.theme.getIcon("browse"))
+        self.fillCopy = qtAddAction(self.fillMenu, self.tr("Copy an existing project"))
+        self.fillCopy.setIcon(SHARED.theme.getIcon("project_copy", "green"))
         self.fillCopy.triggered.connect(self._setFillCopy)
 
         self.browseFill.setMenu(self.fillMenu)
@@ -676,7 +668,7 @@ class _NewProjectForm(QWidget):
         self.extraBox = QVBoxLayout()
         self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Chapters and Scenes")), self))
         self.extraBox.addLayout(self.novelForm)
-        self.extraBox.addSpacing(sPx)
+        self.extraBox.addSpacing(16)
         self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Project Notes")), self))
         self.extraBox.addLayout(self.notesForm)
         self.extraBox.setContentsMargins(0, 0, 0, 0)
@@ -688,7 +680,7 @@ class _NewProjectForm(QWidget):
         self.formBox = QVBoxLayout()
         self.formBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Create New Project")), self))
         self.formBox.addLayout(self.projectForm)
-        self.formBox.addSpacing(sPx)
+        self.formBox.addSpacing(16)
         self.formBox.addWidget(self.extraWidget)
         self.formBox.addStretch(1)
 
@@ -803,14 +795,3 @@ class _NewProjectForm(QWidget):
         self.extraWidget.setVisible(self._fillMode == self.FILL_BLANK)
 
         return
-
-
-class _PopLeftDirectionMenu(QMenu):
-
-    def event(self, event: QEvent) -> bool:
-        """Overload the show event and move the menu popup location."""
-        if event.type() == QEvent.Type.Show:
-            if isinstance(parent := self.parent(), QWidget):
-                offset = QPoint(parent.width() - self.width(), parent.height())
-                self.move(parent.mapToGlobal(offset))
-        return super(_PopLeftDirectionMenu, self).event(event)