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

novelwriter/gui/noveltree.py

@@ -31,8 +31,8 @@ from enum import Enum
 from time import time
 from typing import TYPE_CHECKING
 
+from PyQt5.QtCore import QModelIndex, QPoint, Qt, pyqtSlot, pyqtSignal
 from PyQt5.QtGui import QFocusEvent, QFont, QMouseEvent, QPalette, QResizeEvent
-from PyQt5.QtCore import QModelIndex, QPoint, Qt, QSize, pyqtSlot, pyqtSignal
 from PyQt5.QtWidgets import (
     QAbstractItemView, QActionGroup, QFrame, QHBoxLayout, QHeaderView,
     QInputDialog, QMenu, QSizePolicy, QToolTip, QTreeWidget, QTreeWidgetItem,
@@ -47,6 +47,7 @@ from novelwriter.enum import nwDocMode, nwItemClass, nwOutline
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.extensions.novelselector import NovelSelector
 from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON
+from novelwriter.types import QtAlignRight, QtDecoration, QtMouseLeft, QtMouseMiddle, QtUserRole
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -200,7 +201,7 @@ class GuiNovelToolBar(QWidget):
         self.novelView = novelView
         self.mainGui   = novelView.mainGui
 
-        iPx = SHARED.theme.baseIconSize
+        iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(2)
 
         self.setContentsMargins(0, 0, 0, 0)
@@ -217,12 +218,12 @@ class GuiNovelToolBar(QWidget):
         self.novelValue.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         self.novelValue.novelSelectionChanged.connect(self.setCurrentRoot)
 
-        self.tbNovel = NIconToolButton(self, iPx)
+        self.tbNovel = NIconToolButton(self, iSz)
         self.tbNovel.setToolTip(self.tr("Novel Root"))
         self.tbNovel.clicked.connect(self.novelValue.showPopup)
 
         # Refresh Button
-        self.tbRefresh = NIconToolButton(self, iPx)
+        self.tbRefresh = NIconToolButton(self, iSz)
         self.tbRefresh.setToolTip(self.tr("Refresh"))
         self.tbRefresh.clicked.connect(self._refreshNovelTree)
 
@@ -241,7 +242,7 @@ class GuiNovelToolBar(QWidget):
         self.aLastColSize = self.mLastCol.addAction(self.tr("Column Size"))
         self.aLastColSize.triggered.connect(self._selectLastColumnSize)
 
-        self.tbMore = NIconToolButton(self, iPx)
+        self.tbMore = NIconToolButton(self, iSz)
         self.tbMore.setToolTip(self.tr("More Options"))
         self.tbMore.setMenu(self.mMore)
 
@@ -269,9 +270,9 @@ class GuiNovelToolBar(QWidget):
     def updateTheme(self) -> None:
         """Update theme elements."""
         # Icons
-        self.tbNovel.setIcon(SHARED.theme.getIcon("cls_novel"))
-        self.tbRefresh.setIcon(SHARED.theme.getIcon("refresh"))
-        self.tbMore.setIcon(SHARED.theme.getIcon("menu"))
+        self.tbNovel.setThemeIcon("cls_novel")
+        self.tbRefresh.setThemeIcon("refresh")
+        self.tbMore.setThemeIcon("menu")
 
         qPalette = self.palette()
         qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base())
@@ -363,10 +364,10 @@ class GuiNovelTree(QTreeWidget):
     C_EXTRA = 2
     C_MORE  = 3
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
-    D_TITLE  = Qt.ItemDataRole.UserRole + 1
-    D_KEY    = Qt.ItemDataRole.UserRole + 2
-    D_EXTRA  = Qt.ItemDataRole.UserRole + 3
+    D_HANDLE = QtUserRole
+    D_TITLE  = QtUserRole + 1
+    D_KEY    = QtUserRole + 2
+    D_EXTRA  = QtUserRole + 3
 
     def __init__(self, novelView: GuiNovelView) -> None:
         super().__init__(parent=novelView)
@@ -391,10 +392,11 @@ class GuiNovelTree(QTreeWidget):
         # Build GUI
         # =========
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         cMg = CONFIG.pxInt(6)
 
-        self.setIconSize(QSize(iPx, iPx))
+        self.setIconSize(iSz)
         self.setFrameStyle(QFrame.Shape.NoFrame)
         self.setUniformRowHeights(True)
         self.setAllColumnsShowFocus(True)
@@ -455,7 +457,7 @@ class GuiNovelTree(QTreeWidget):
 
     def updateTheme(self) -> None:
         """Update theme elements."""
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
         self._pMore = SHARED.theme.loadDecoration("deco_doc_more", h=iPx)
         return
 
@@ -581,12 +583,12 @@ class GuiNovelTree(QTreeWidget):
         """
         super().mousePressEvent(event)
 
-        if event.button() == Qt.MouseButton.LeftButton:
+        if event.button() == QtMouseLeft:
             selItem = self.indexAt(event.pos())
             if not selItem.isValid():
                 self.clearSelection()
 
-        elif event.button() == Qt.MouseButton.MiddleButton:
+        elif event.button() == QtMouseMiddle:
             selItem = self.itemAt(event.pos())
             if not isinstance(selItem, QTreeWidgetItem):
                 return
@@ -676,7 +678,7 @@ class GuiNovelTree(QTreeWidget):
             newItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
             newItem.setData(self.C_DATA, self.D_TITLE, sTitle)
             newItem.setData(self.C_DATA, self.D_KEY, tKey)
-            newItem.setTextAlignment(self.C_WORDS, Qt.AlignmentFlag.AlignRight)
+            newItem.setTextAlignment(self.C_WORDS, QtAlignRight)
 
             self._updateTreeItemValues(newItem, novIdx, tHandle, sTitle)
             self._treeMap[tKey] = newItem
@@ -695,11 +697,11 @@ class GuiNovelTree(QTreeWidget):
         iLevel = nwHeaders.H_LEVEL.get(idxItem.level, 0)
         hDec = SHARED.theme.getHeaderDecoration(iLevel)
 
-        trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+        trItem.setData(self.C_TITLE, QtDecoration, hDec)
         trItem.setText(self.C_TITLE, idxItem.title)
         trItem.setFont(self.C_TITLE, self._hFonts[iLevel])
         trItem.setText(self.C_WORDS, f"{idxItem.wordCount:n}")
-        trItem.setData(self.C_MORE, Qt.ItemDataRole.DecorationRole, self._pMore)
+        trItem.setData(self.C_MORE, QtDecoration, self._pMore)
 
         # Custom column
         mW = int(self._lastColSize * self.viewport().width())

novelwriter/gui/outline.py

@@ -33,7 +33,7 @@ import logging
 from time import time
 from enum import Enum
 
-from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QSize, QT_TRANSLATE_NOOP
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QT_TRANSLATE_NOOP
 from PyQt5.QtWidgets import (
     QAbstractItemView, QAction, QFileDialog, QFrame, QGridLayout, QGroupBox,
     QHBoxLayout, QLabel, QMenu, QScrollArea, QSizePolicy, QSplitter, QToolBar,
@@ -48,6 +48,9 @@ from novelwriter.error import logException
 from novelwriter.common import checkInt, formatFileFilter, makeFileNameSafe
 from novelwriter.constants import nwHeaders, trConst, nwKeyWords, nwLabels
 from novelwriter.extensions.novelselector import NovelSelector
+from novelwriter.types import (
+    QtAlignLeftTop, QtAlignRight, QtAlignRightTop, QtDecoration, QtUserRole
+)
 
 
 logger = logging.getLogger(__name__)
@@ -67,7 +70,7 @@ class GuiOutlineView(QWidget):
         self.outlineBar = GuiOutlineToolBar(self)
         self.outlineBar.setEnabled(False)
 
-        self.splitOutline = QSplitter(Qt.Vertical)
+        self.splitOutline = QSplitter(Qt.Orientation.Vertical, self)
         self.splitOutline.addWidget(self.outlineTree)
         self.splitOutline.addWidget(self.outlineData)
         self.splitOutline.setOpaqueResize(False)
@@ -206,18 +209,18 @@ class GuiOutlineToolBar(QToolBar):
 
         logger.debug("Create: GuiOutlineToolBar")
 
-        iPx = CONFIG.pxInt(22)
+        iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(12)
 
         self.setMovable(False)
-        self.setIconSize(QSize(iPx, iPx))
+        self.setIconSize(iSz)
         self.setContentsMargins(0, 0, 0, 0)
 
         stretch = QWidget(self)
         stretch.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
 
         # Novel Selector
-        self.novelLabel = QLabel(self.tr("Outline of"))
+        self.novelLabel = QLabel(self.tr("Outline of"), self)
         self.novelLabel.setContentsMargins(0, 0, mPx, 0)
 
         self.novelValue = NovelSelector(self)
@@ -353,8 +356,8 @@ class GuiOutlineTree(QTreeWidget):
         nwOutline.SYNOP:  False,
     }
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
-    D_TITLE  = Qt.ItemDataRole.UserRole + 1
+    D_HANDLE = QtUserRole
+    D_TITLE  = QtUserRole + 1
 
     hiddenStateChanged = pyqtSignal()
     activeItemChanged = pyqtSignal(str, str)
@@ -375,8 +378,7 @@ class GuiOutlineTree(QTreeWidget):
         self.itemDoubleClicked.connect(self._treeDoubleClick)
         self.itemSelectionChanged.connect(self._itemSelected)
 
-        iPx = SHARED.theme.baseIconSize
-        self.setIconSize(QSize(iPx, iPx))
+        self.setIconSize(SHARED.theme.baseIconSize)
         self.setIndentation(0)
 
         self.treeHead = self.header()
@@ -675,11 +677,11 @@ class GuiOutlineTree(QTreeWidget):
             headItem = self.headerItem()
             if isinstance(headItem, QTreeWidgetItem):
                 headItem.setTextAlignment(
-                    self._colIdx[nwOutline.CCOUNT], Qt.AlignmentFlag.AlignRight)
+                    self._colIdx[nwOutline.CCOUNT], QtAlignRight)
                 headItem.setTextAlignment(
-                    self._colIdx[nwOutline.WCOUNT], Qt.AlignmentFlag.AlignRight)
+                    self._colIdx[nwOutline.WCOUNT], QtAlignRight)
                 headItem.setTextAlignment(
-                    self._colIdx[nwOutline.PCOUNT], Qt.AlignmentFlag.AlignRight)
+                    self._colIdx[nwOutline.PCOUNT], QtAlignRight)
 
         novStruct = SHARED.project.index.novelStructure(rootHandle=rootHandle, activeOnly=True)
         for _, tHandle, sTitle, novIdx in novStruct:
@@ -692,7 +694,7 @@ class GuiOutlineTree(QTreeWidget):
             trItem = QTreeWidgetItem()
             hDec = SHARED.theme.getHeaderDecoration(iLevel)
 
-            trItem.setData(self._colIdx[nwOutline.TITLE], Qt.ItemDataRole.DecorationRole, hDec)
+            trItem.setData(self._colIdx[nwOutline.TITLE], QtDecoration, hDec)
             trItem.setText(self._colIdx[nwOutline.TITLE], novIdx.title)
             trItem.setData(self._colIdx[nwOutline.TITLE], self.D_HANDLE, tHandle)
             trItem.setData(self._colIdx[nwOutline.TITLE], self.D_TITLE, sTitle)
@@ -705,9 +707,9 @@ class GuiOutlineTree(QTreeWidget):
             trItem.setText(self._colIdx[nwOutline.CCOUNT], f"{novIdx.charCount:n}")
             trItem.setText(self._colIdx[nwOutline.WCOUNT], f"{novIdx.wordCount:n}")
             trItem.setText(self._colIdx[nwOutline.PCOUNT], f"{novIdx.paraCount:n}")
-            trItem.setTextAlignment(self._colIdx[nwOutline.CCOUNT], Qt.AlignmentFlag.AlignRight)
-            trItem.setTextAlignment(self._colIdx[nwOutline.WCOUNT], Qt.AlignmentFlag.AlignRight)
-            trItem.setTextAlignment(self._colIdx[nwOutline.PCOUNT], Qt.AlignmentFlag.AlignRight)
+            trItem.setTextAlignment(self._colIdx[nwOutline.CCOUNT], QtAlignRight)
+            trItem.setTextAlignment(self._colIdx[nwOutline.WCOUNT], QtAlignRight)
+            trItem.setTextAlignment(self._colIdx[nwOutline.PCOUNT], QtAlignRight)
 
             refs = SHARED.project.index.getReferences(tHandle, sTitle)
             trItem.setText(self._colIdx[nwOutline.POV],    ", ".join(refs[nwKeyWords.POV_KEY]))
@@ -801,12 +803,12 @@ class GuiOutlineDetails(QScrollArea):
         bFont = SHARED.theme.guiFontB
 
         # Details Area
-        self.titleLabel = QLabel(self.tr("Title"))
-        self.fileLabel  = QLabel(self.tr("Document"))
-        self.itemLabel  = QLabel(self.tr("Status"))
-        self.titleValue = QLabel("")
-        self.fileValue  = QLabel("")
-        self.itemValue  = QLabel("")
+        self.titleLabel = QLabel(self.tr("Title"), self)
+        self.fileLabel  = QLabel(self.tr("Document"), self)
+        self.itemLabel  = QLabel(self.tr("Status"), self)
+        self.titleValue = QLabel("", self)
+        self.fileValue  = QLabel("", self)
+        self.itemValue  = QLabel("", self)
 
         self.titleLabel.setFont(bFont)
         self.fileLabel.setFont(bFont)
@@ -820,12 +822,12 @@ class GuiOutlineDetails(QScrollArea):
         self.itemValue.setMaximumWidth(maxTitle)
 
         # Stats Area
-        self.cCLabel = QLabel(self.tr("Characters"))
-        self.wCLabel = QLabel(self.tr("Words"))
-        self.pCLabel = QLabel(self.tr("Paragraphs"))
-        self.cCValue = QLabel("")
-        self.wCValue = QLabel("")
-        self.pCValue = QLabel("")
+        self.cCLabel = QLabel(self.tr("Characters"), self)
+        self.wCLabel = QLabel(self.tr("Words"), self)
+        self.pCLabel = QLabel(self.tr("Paragraphs"), self)
+        self.cCValue = QLabel("", self)
+        self.wCValue = QLabel("", self)
+        self.pCValue = QLabel("", self)
 
         self.cCLabel.setFont(bFont)
         self.wCLabel.setFont(bFont)
@@ -834,31 +836,31 @@ class GuiOutlineDetails(QScrollArea):
         self.cCValue.setMinimumWidth(wCount)
         self.wCValue.setMinimumWidth(wCount)
         self.pCValue.setMinimumWidth(wCount)
-        self.cCValue.setAlignment(Qt.AlignRight)
-        self.wCValue.setAlignment(Qt.AlignRight)
-        self.pCValue.setAlignment(Qt.AlignRight)
+        self.cCValue.setAlignment(QtAlignRight)
+        self.wCValue.setAlignment(QtAlignRight)
+        self.pCValue.setAlignment(QtAlignRight)
 
         # Synopsis
-        self.synopLabel = QLabel(self.tr("Synopsis"))
+        self.synopLabel = QLabel(self.tr("Synopsis"), self)
         self.synopLabel.setFont(bFont)
 
-        self.synopValue = QLabel("")
+        self.synopValue = QLabel("", self)
         self.synopValue.setWordWrap(True)
-        self.synopValue.setAlignment(Qt.AlignTop | Qt.AlignLeft)
+        self.synopValue.setAlignment(QtAlignLeftTop)
 
         self.synopLWrap = QHBoxLayout()
         self.synopLWrap.addWidget(self.synopValue, 1)
 
         # Tags
-        self.povKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.POV_KEY]))
-        self.focKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.FOCUS_KEY]))
-        self.chrKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.CHAR_KEY]))
-        self.pltKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.PLOT_KEY]))
-        self.timKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.TIME_KEY]))
-        self.wldKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.WORLD_KEY]))
-        self.objKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.OBJECT_KEY]))
-        self.entKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.ENTITY_KEY]))
-        self.cstKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.CUSTOM_KEY]))
+        self.povKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.POV_KEY]), self)
+        self.focKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.FOCUS_KEY]), self)
+        self.chrKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.CHAR_KEY]), self)
+        self.pltKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.PLOT_KEY]), self)
+        self.timKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.TIME_KEY]), self)
+        self.wldKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.WORLD_KEY]), self)
+        self.objKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.OBJECT_KEY]), self)
+        self.entKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.ENTITY_KEY]), self)
+        self.cstKeyLabel = QLabel(trConst(nwLabels.KEY_NAME[nwKeyWords.CUSTOM_KEY]), self)
 
         self.povKeyLabel.setFont(bFont)
         self.focKeyLabel.setFont(bFont)
@@ -880,15 +882,15 @@ class GuiOutlineDetails(QScrollArea):
         self.entKeyLWrap = QHBoxLayout()
         self.cstKeyLWrap = QHBoxLayout()
 
-        self.povKeyValue = QLabel("")
-        self.focKeyValue = QLabel("")
-        self.chrKeyValue = QLabel("")
-        self.pltKeyValue = QLabel("")
-        self.timKeyValue = QLabel("")
-        self.wldKeyValue = QLabel("")
-        self.objKeyValue = QLabel("")
-        self.entKeyValue = QLabel("")
-        self.cstKeyValue = QLabel("")
+        self.povKeyValue = QLabel("", self)
+        self.focKeyValue = QLabel("", self)
+        self.chrKeyValue = QLabel("", self)
+        self.pltKeyValue = QLabel("", self)
+        self.timKeyValue = QLabel("", self)
+        self.wldKeyValue = QLabel("", self)
+        self.objKeyValue = QLabel("", self)
+        self.entKeyValue = QLabel("", self)
+        self.cstKeyValue = QLabel("", self)
 
         self.povKeyValue.setWordWrap(True)
         self.focKeyValue.setWordWrap(True)
@@ -925,23 +927,20 @@ class GuiOutlineDetails(QScrollArea):
         self.mainForm = QGridLayout()
         self.mainGroup.setLayout(self.mainForm)
 
-        topLeft = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft
-        topRight = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignRight
-
-        self.mainForm.addWidget(self.titleLabel,  0, 0, 1, 1, topLeft)
-        self.mainForm.addWidget(self.titleValue,  0, 1, 1, 1, topLeft)
-        self.mainForm.addWidget(self.cCLabel,     0, 2, 1, 1, topLeft)
-        self.mainForm.addWidget(self.cCValue,     0, 3, 1, 1, topRight)
-        self.mainForm.addWidget(self.fileLabel,   1, 0, 1, 1, topLeft)
-        self.mainForm.addWidget(self.fileValue,   1, 1, 1, 1, topLeft)
-        self.mainForm.addWidget(self.wCLabel,     1, 2, 1, 1, topLeft)
-        self.mainForm.addWidget(self.wCValue,     1, 3, 1, 1, topRight)
-        self.mainForm.addWidget(self.itemLabel,   2, 0, 1, 1, topLeft)
-        self.mainForm.addWidget(self.itemValue,   2, 1, 1, 1, topLeft)
-        self.mainForm.addWidget(self.pCLabel,     2, 2, 1, 1, topLeft)
-        self.mainForm.addWidget(self.pCValue,     2, 3, 1, 1, topRight)
-        self.mainForm.addWidget(self.synopLabel,  3, 0, 1, 4, topLeft)
-        self.mainForm.addLayout(self.synopLWrap,  4, 0, 1, 4, topLeft)
+        self.mainForm.addWidget(self.titleLabel,  0, 0, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.titleValue,  0, 1, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.cCLabel,     0, 2, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.cCValue,     0, 3, 1, 1, QtAlignRightTop)
+        self.mainForm.addWidget(self.fileLabel,   1, 0, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.fileValue,   1, 1, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.wCLabel,     1, 2, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.wCValue,     1, 3, 1, 1, QtAlignRightTop)
+        self.mainForm.addWidget(self.itemLabel,   2, 0, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.itemValue,   2, 1, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.pCLabel,     2, 2, 1, 1, QtAlignLeftTop)
+        self.mainForm.addWidget(self.pCValue,     2, 3, 1, 1, QtAlignRightTop)
+        self.mainForm.addWidget(self.synopLabel,  3, 0, 1, 4, QtAlignLeftTop)
+        self.mainForm.addLayout(self.synopLWrap,  4, 0, 1, 4, QtAlignLeftTop)
 
         self.mainForm.setColumnStretch(1, 1)
         self.mainForm.setRowStretch(4, 1)
@@ -953,24 +952,24 @@ class GuiOutlineDetails(QScrollArea):
         self.tagsForm = QGridLayout()
         self.tagsGroup.setLayout(self.tagsForm)
 
-        self.tagsForm.addWidget(self.povKeyLabel, 0, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.povKeyLWrap, 0, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.focKeyLabel, 1, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.focKeyLWrap, 1, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.chrKeyLabel, 2, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.chrKeyLWrap, 2, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.pltKeyLabel, 3, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.pltKeyLWrap, 3, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.timKeyLabel, 4, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.timKeyLWrap, 4, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.wldKeyLabel, 5, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.wldKeyLWrap, 5, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.objKeyLabel, 6, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.objKeyLWrap, 6, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.entKeyLabel, 7, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.entKeyLWrap, 7, 1, 1, 1, topLeft)
-        self.tagsForm.addWidget(self.cstKeyLabel, 8, 0, 1, 1, topLeft)
-        self.tagsForm.addLayout(self.cstKeyLWrap, 8, 1, 1, 1, topLeft)
+        self.tagsForm.addWidget(self.povKeyLabel, 0, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.povKeyLWrap, 0, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.focKeyLabel, 1, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.focKeyLWrap, 1, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.chrKeyLabel, 2, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.chrKeyLWrap, 2, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.pltKeyLabel, 3, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.pltKeyLWrap, 3, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.timKeyLabel, 4, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.timKeyLWrap, 4, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.wldKeyLabel, 5, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.wldKeyLWrap, 5, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.objKeyLabel, 6, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.objKeyLWrap, 6, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.entKeyLabel, 7, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.entKeyLWrap, 7, 1, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addWidget(self.cstKeyLabel, 8, 0, 1, 1, QtAlignLeftTop)
+        self.tagsForm.addLayout(self.cstKeyLWrap, 8, 1, 1, 1, QtAlignLeftTop)
 
         self.tagsForm.setColumnStretch(1, 1)
         self.tagsForm.setRowStretch(8, 1)
@@ -978,7 +977,7 @@ class GuiOutlineDetails(QScrollArea):
         self.tagsForm.setVerticalSpacing(vSpace)
 
         # Assemble
-        self.outerWidget = QWidget()
+        self.outerWidget = QWidget(self)
         self.outerBox = QHBoxLayout()
         self.outerBox.addWidget(self.mainGroup, 0)
         self.outerBox.addWidget(self.tagsGroup, 1)

novelwriter/gui/projtree.py

@@ -32,10 +32,10 @@ from enum import Enum
 from time import time
 from typing import TYPE_CHECKING
 
+from PyQt5.QtCore import QPoint, QTimer, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import (
     QDragEnterEvent, QDragMoveEvent, QDropEvent, QIcon, QMouseEvent, QPalette
 )
-from PyQt5.QtCore import QPoint, QTimer, Qt, QSize, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QAction, QDialog, QFrame, QHBoxLayout, QHeaderView,
     QLabel, QMenu, QShortcut, QSizePolicy, QTreeWidget, QTreeWidgetItem,
@@ -54,6 +54,7 @@ from novelwriter.dialogs.projectsettings import GuiProjectSettings
 from novelwriter.enum import nwDocMode, nwItemType, nwItemClass, nwItemLayout
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON
+from novelwriter.types import QtAlignLeft, QtAlignRight, QtMouseLeft, QtMouseMiddle, QtUserRole
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -263,14 +264,14 @@ class GuiProjectToolBar(QWidget):
         self.projTree = projView.projTree
         self.mainGui  = projView.mainGui
 
-        iPx = SHARED.theme.baseIconSize
+        iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(2)
 
         self.setContentsMargins(0, 0, 0, 0)
         self.setAutoFillBackground(True)
 
         # Widget Label
-        self.viewLabel = QLabel(self.tr("Project Content"))
+        self.viewLabel = QLabel(self.tr("Project Content"), self)
         self.viewLabel.setFont(SHARED.theme.guiFontB)
         self.viewLabel.setContentsMargins(0, 0, 0, 0)
         self.viewLabel.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
@@ -278,17 +279,17 @@ class GuiProjectToolBar(QWidget):
         # Quick Links
         self.mQuick = QMenu(self)
 
-        self.tbQuick = NIconToolButton(self, iPx)
+        self.tbQuick = NIconToolButton(self, iSz)
         self.tbQuick.setToolTip("%s [Ctrl+L]" % self.tr("Quick Links"))
         self.tbQuick.setShortcut("Ctrl+L")
         self.tbQuick.setMenu(self.mQuick)
 
         # Move Buttons
-        self.tbMoveU = NIconToolButton(self, iPx)
+        self.tbMoveU = NIconToolButton(self, iSz)
         self.tbMoveU.setToolTip("%s [Ctrl+Up]" % self.tr("Move Up"))
         self.tbMoveU.clicked.connect(lambda: self.projTree.moveTreeItem(-1))
 
-        self.tbMoveD = NIconToolButton(self, iPx)
+        self.tbMoveD = NIconToolButton(self, iSz)
         self.tbMoveD.setToolTip("%s [Ctrl+Down]" % self.tr("Move Down"))
         self.tbMoveD.clicked.connect(lambda: self.projTree.moveTreeItem(1))
 
@@ -328,7 +329,7 @@ class GuiProjectToolBar(QWidget):
         self.mAddRoot = self.mAdd.addMenu(trConst(nwLabels.ITEM_DESCRIPTION["root"]))
         self._buildRootMenu()
 
-        self.tbAdd = NIconToolButton(self, iPx)
+        self.tbAdd = NIconToolButton(self, iSz)
         self.tbAdd.setToolTip("%s [Ctrl+N]" % self.tr("Add Item"))
         self.tbAdd.setShortcut("Ctrl+N")
         self.tbAdd.setMenu(self.mAdd)
@@ -345,7 +346,7 @@ class GuiProjectToolBar(QWidget):
         self.aEmptyTrash = self.mMore.addAction(self.tr("Empty Trash"))
         self.aEmptyTrash.triggered.connect(lambda: self.projTree.emptyTrash())
 
-        self.tbMore = NIconToolButton(self, iPx)
+        self.tbMore = NIconToolButton(self, iSz)
         self.tbMore.setToolTip(self.tr("More Options"))
         self.tbMore.setMenu(self.mMore)
 
@@ -384,16 +385,17 @@ class GuiProjectToolBar(QWidget):
         self.tbAdd.setStyleSheet(buttonStyle)
         self.tbMore.setStyleSheet(buttonStyle)
 
-        self.tbQuick.setIcon(SHARED.theme.getIcon("bookmark"))
-        self.tbMoveU.setIcon(SHARED.theme.getIcon("up"))
-        self.tbMoveD.setIcon(SHARED.theme.getIcon("down"))
+        self.tbQuick.setThemeIcon("bookmark")
+        self.tbMoveU.setThemeIcon("up")
+        self.tbMoveD.setThemeIcon("down")
+        self.tbAdd.setThemeIcon("add")
+        self.tbMore.setThemeIcon("menu")
+
         self.aAddEmpty.setIcon(SHARED.theme.getIcon("proj_document"))
         self.aAddChap.setIcon(SHARED.theme.getIcon("proj_chapter"))
         self.aAddScene.setIcon(SHARED.theme.getIcon("proj_scene"))
         self.aAddNote.setIcon(SHARED.theme.getIcon("proj_note"))
         self.aAddFolder.setIcon(SHARED.theme.getIcon("proj_folder"))
-        self.tbAdd.setIcon(SHARED.theme.getIcon("add"))
-        self.tbMore.setIcon(SHARED.theme.getIcon("menu"))
 
         self.buildQuickLinksMenu()
         self._buildRootMenu()
@@ -485,8 +487,8 @@ class GuiProjectTree(QTreeWidget):
     C_ACTIVE = 2
     C_STATUS = 3
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
-    D_WORDS  = Qt.ItemDataRole.UserRole + 1
+    D_HANDLE = QtUserRole
+    D_WORDS  = QtUserRole + 1
 
     itemRefreshed = pyqtSignal(str, NWItem, QIcon)
 
@@ -516,10 +518,10 @@ class GuiProjectTree(QTreeWidget):
         self.customContextMenuRequested.connect(self._openContextMenu)
 
         # Tree Settings
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
         cMg = CONFIG.pxInt(6)
 
-        self.setIconSize(QSize(iPx, iPx))
+        self.setIconSize(SHARED.theme.baseIconSize)
         self.setFrameStyle(QFrame.Shape.NoFrame)
         self.setUniformRowHeights(True)
         self.setAllColumnsShowFocus(True)
@@ -563,9 +565,9 @@ class GuiProjectTree(QTreeWidget):
         self.itemSelectionChanged.connect(self._treeSelectionChange)
 
         # Auto Scroll
-        self._scrollMargin = SHARED.theme.baseIconSize
+        self._scrollMargin = SHARED.theme.baseIconHeight
         self._scrollDirection = 0
-        self._scrollTimer = QTimer()
+        self._scrollTimer = QTimer(self)
         self._scrollTimer.timeout.connect(self._doAutoScroll)
         self._scrollTimer.setInterval(250)
 
@@ -1228,7 +1230,7 @@ class GuiProjectTree(QTreeWidget):
         else:
             ctxMenu.buildSingleSelectMenu(hasChild)
 
-        ctxMenu.exec_(self.viewport().mapToGlobal(clickPos))
+        ctxMenu.exec(self.viewport().mapToGlobal(clickPos))
         ctxMenu.deleteLater()
 
         return True
@@ -1254,11 +1256,11 @@ class GuiProjectTree(QTreeWidget):
         for viewing if the user middle-clicked.
         """
         super().mousePressEvent(event)
-        if event.button() == Qt.MouseButton.LeftButton:
+        if event.button() == QtMouseLeft:
             selItem = self.indexAt(event.pos())
             if not selItem.isValid():
                 self.clearSelection()
-        elif event.button() == Qt.MouseButton.MiddleButton:
+        elif event.button() == QtMouseMiddle:
             selItem = self.itemAt(event.pos())
             if selItem:
                 tHandle = selItem.data(self.C_DATA, self.D_HANDLE)
@@ -1266,7 +1268,7 @@ class GuiProjectTree(QTreeWidget):
                     self.projView.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, "", False)
         return
 
-    def startDrag(self, dropAction: Qt.DropActions) -> None:
+    def startDrag(self, dropAction: Qt.DropAction) -> None:
         """Capture the drag and drop handling to pop alerts."""
         super().startDrag(dropAction)
         if self._popAlert:
@@ -1408,7 +1410,7 @@ class GuiProjectTree(QTreeWidget):
             itemList.remove(tHandle)
 
         dlgMerge = GuiDocMerge(self.mainGui, tHandle, itemList)
-        dlgMerge.exec_()
+        dlgMerge.exec()
 
         if dlgMerge.result() == QDialog.DialogCode.Accepted:
 
@@ -1478,7 +1480,7 @@ class GuiProjectTree(QTreeWidget):
             return False
 
         dlgSplit = GuiDocSplit(self.mainGui, tHandle)
-        dlgSplit.exec_()
+        dlgSplit.exec()
 
         if dlgSplit.result() == QDialog.DialogCode.Accepted:
 
@@ -1585,10 +1587,10 @@ class GuiProjectTree(QTreeWidget):
         newItem.setText(self.C_ACTIVE, "")
         newItem.setText(self.C_STATUS, "")
 
-        newItem.setTextAlignment(self.C_NAME, Qt.AlignmentFlag.AlignLeft)
-        newItem.setTextAlignment(self.C_COUNT, Qt.AlignmentFlag.AlignRight)
-        newItem.setTextAlignment(self.C_ACTIVE, Qt.AlignmentFlag.AlignLeft)
-        newItem.setTextAlignment(self.C_STATUS, Qt.AlignmentFlag.AlignLeft)
+        newItem.setTextAlignment(self.C_NAME, QtAlignLeft)
+        newItem.setTextAlignment(self.C_COUNT, QtAlignRight)
+        newItem.setTextAlignment(self.C_ACTIVE, QtAlignLeft)
+        newItem.setTextAlignment(self.C_STATUS, QtAlignLeft)
 
         newItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
         newItem.setData(self.C_DATA, self.D_WORDS, 0)