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

novelwriter/gui/dochighlight.py

@@ -116,7 +116,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         # Cache Spell Error Format
         self._spellErr = QTextCharFormat()
         self._spellErr.setUnderlineColor(SHARED.theme.colSpell)
-        self._spellErr.setUnderlineStyle(QTextCharFormat.SpellCheckUnderline)
+        self._spellErr.setUnderlineStyle(QTextCharFormat.UnderlineStyle.SpellCheckUnderline)
 
         # Multiple or Trailing Spaces
         if CONFIG.showMultiSpaces:
@@ -402,16 +402,16 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         if style is not None:
             styles = style.split(",")
             if "bold" in styles:
-                charFormat.setFontWeight(QFont.Bold)
+                charFormat.setFontWeight(QFont.Weight.Bold)
             if "italic" in styles:
                 charFormat.setFontItalic(True)
             if "strike" in styles:
                 charFormat.setFontStrikeOut(True)
             if "errline" in styles:
                 charFormat.setUnderlineColor(SHARED.theme.colError)
-                charFormat.setUnderlineStyle(QTextCharFormat.SpellCheckUnderline)
+                charFormat.setUnderlineStyle(QTextCharFormat.UnderlineStyle.SpellCheckUnderline)
             if "background" in styles and color is not None:
-                charFormat.setBackground(QBrush(color, Qt.SolidPattern))
+                charFormat.setBackground(QBrush(color, Qt.BrushStyle.SolidPattern))
 
         if size is not None:
             charFormat.setFontPointSize(int(round(size*CONFIG.textSize)))

novelwriter/gui/docviewer.py

@@ -30,17 +30,18 @@ import logging
 
 from enum import Enum
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QPoint, QSize, Qt, QUrl
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QPoint, Qt, QUrl
 from PyQt5.QtGui import (
     QCursor, QFont, QMouseEvent, QPalette, QResizeEvent, QTextCursor,
     QTextOption
 )
 from PyQt5.QtWidgets import (
-    QAction, QFrame, QHBoxLayout, QLabel, QMenu, QTextBrowser, QToolButton,
-    QWidget, qApp
+    QAction, QApplication, QFrame, QHBoxLayout, QLabel, QMenu, QTextBrowser,
+    QToolButton, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
+from novelwriter.common import cssCol
 from novelwriter.constants import nwHeaders, nwUnicode
 from novelwriter.core.tohtml import ToHtml
 from novelwriter.enum import nwItemType, nwDocAction, nwDocMode
@@ -48,6 +49,9 @@ from novelwriter.error import logException
 from novelwriter.extensions.eventfilters import WheelEventFilter
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON
+from novelwriter.types import (
+    QtAlignCenterTop, QtAlignJustify, QtKeepAnchor, QtMouseLeft, QtMoveAnchor
+)
 
 logger = logging.getLogger(__name__)
 
@@ -163,7 +167,7 @@ class GuiDocViewer(QTextBrowser):
         self.document().setDocumentMargin(0)
         options = QTextOption()
         if CONFIG.doJustify:
-            options.setAlignment(Qt.AlignmentFlag.AlignJustify)
+            options.setAlignment(QtAlignJustify)
         self.document().setDefaultTextOption(options)
 
         # Scroll bars
@@ -193,7 +197,7 @@ class GuiDocViewer(QTextBrowser):
             return False
 
         logger.debug("Generating preview for item '%s'", tHandle)
-        qApp.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
+        QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
 
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(SHARED.project)
@@ -215,7 +219,7 @@ class GuiDocViewer(QTextBrowser):
             logger.error("Failed to generate preview for document with handle '%s'", tHandle)
             logException()
             self.setText(self.tr("An error occurred while generating the preview."))
-            qApp.restoreOverrideCursor()
+            QApplication.restoreOverrideCursor()
             return False
 
         # Refresh the tab stops
@@ -248,7 +252,7 @@ class GuiDocViewer(QTextBrowser):
         # Since we change the content while it may still be rendering, we mark
         # the document dirty again to make sure it's re-rendered properly.
         self.redrawText()
-        qApp.restoreOverrideCursor()
+        QApplication.restoreOverrideCursor()
         self.documentLoaded.emit(tHandle)
 
         return True
@@ -408,7 +412,7 @@ class GuiDocViewer(QTextBrowser):
         ctxMenu.addAction(mnuSelPara)
 
         # Open the context menu
-        ctxMenu.exec_(self.viewport().mapToGlobal(point))
+        ctxMenu.exec(self.viewport().mapToGlobal(point))
         ctxMenu.deleteLater()
 
         return
@@ -450,8 +454,8 @@ class GuiDocViewer(QTextBrowser):
             posE = cursor.selectionEnd()
             selTxt = cursor.selectedText()
             if selTxt.startswith(nwUnicode.U_PSEP):
-                cursor.setPosition(posS+1, QTextCursor.MoveMode.MoveAnchor)
-                cursor.setPosition(posE, QTextCursor.MoveMode.KeepAnchor)
+                cursor.setPosition(posS+1, QtMoveAnchor)
+                cursor.setPosition(posE, QtKeepAnchor)
 
         self.setTextCursor(cursor)
 
@@ -467,35 +471,25 @@ class GuiDocViewer(QTextBrowser):
         """Generate an appropriate style sheet for the document viewer,
         based on the current syntax highlighter theme.
         """
-        colText = SHARED.theme.colText
-        colHead = SHARED.theme.colHead
-        colVals = SHARED.theme.colVal
-        colMark = SHARED.theme.colMark
-        colKeys = SHARED.theme.colKey
-        colHide = SHARED.theme.colHidden
-        colMods = SHARED.theme.colMod
-        colOpts = SHARED.theme.colOpt
-        styleSheet = (
-            "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(
-            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(),
+        colText = cssCol(SHARED.theme.colText)
+        colHead = cssCol(SHARED.theme.colHead)
+        colVals = cssCol(SHARED.theme.colVal)
+        colMark = cssCol(SHARED.theme.colMark)
+        colKeys = cssCol(SHARED.theme.colKey)
+        colOpts = cssCol(SHARED.theme.colOpt)
+        colHide = cssCol(SHARED.theme.colHidden)
+        colMods = cssCol(SHARED.theme.colMod)
+        self.document().setDefaultStyleSheet(
+            f"body {{color: {colText};}}\n"
+            f"h1, h2, h3, h4 {{color: {colHead};}}\n"
+            f"a {{color: {colVals};}}\n"
+            f"mark {{background-color: {colMark};}}\n"
+            f".tags {{color: {colKeys};}}\n"
+            f".optional {{color: {colOpts};}}\n"
+            f".comment {{color: {colHide};}}\n"
+            f".synopsis {{color: {colMods};}}\n"
+            ".title {text-align: center;}\n"
         )
-        self.document().setDefaultStyleSheet(styleSheet)
 
         return
 
@@ -635,20 +629,21 @@ class GuiDocViewHeader(QWidget):
         self._docHandle = None
         self._docOutline: dict[str, tuple[str, int]] = {}
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(4)
 
         # Main Widget Settings
         self.setAutoFillBackground(True)
 
         # Title Label
-        self.itemTitle = QLabel()
+        self.itemTitle = QLabel(self)
         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.setAlignment(QtAlignCenterTop)
         self.itemTitle.setFixedHeight(iPx)
 
         lblFont = self.itemTitle.font()
@@ -659,27 +654,27 @@ class GuiDocViewHeader(QWidget):
         self.outlineMenu = QMenu(self)
 
         # Buttons
-        self.outlineButton = NIconToolButton(self, iPx)
+        self.outlineButton = NIconToolButton(self, iSz)
         self.outlineButton.setVisible(False)
         self.outlineButton.setToolTip(self.tr("Outline"))
         self.outlineButton.setMenu(self.outlineMenu)
 
-        self.backButton = NIconToolButton(self, iPx)
+        self.backButton = NIconToolButton(self, iSz)
         self.backButton.setVisible(False)
         self.backButton.setToolTip(self.tr("Go Backward"))
         self.backButton.clicked.connect(self.docViewer.navBackward)
 
-        self.forwardButton = NIconToolButton(self, iPx)
+        self.forwardButton = NIconToolButton(self, iSz)
         self.forwardButton.setVisible(False)
         self.forwardButton.setToolTip(self.tr("Go Forward"))
         self.forwardButton.clicked.connect(self.docViewer.navForward)
 
-        self.refreshButton = NIconToolButton(self, iPx)
+        self.refreshButton = NIconToolButton(self, iSz)
         self.refreshButton.setVisible(False)
         self.refreshButton.setToolTip(self.tr("Reload"))
         self.refreshButton.clicked.connect(self._refreshDocument)
 
-        self.closeButton = NIconToolButton(self, iPx)
+        self.closeButton = NIconToolButton(self, iSz)
         self.closeButton.setVisible(False)
         self.closeButton.setToolTip(self.tr("Close"))
         self.closeButton.clicked.connect(self._closeDocument)
@@ -752,11 +747,11 @@ class GuiDocViewHeader(QWidget):
 
     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"))
+        self.outlineButton.setThemeIcon("list")
+        self.backButton.setThemeIcon("backward")
+        self.forwardButton.setThemeIcon("forward")
+        self.refreshButton.setThemeIcon("refresh")
+        self.closeButton.setThemeIcon("close")
 
         buttonStyle = SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON)
         self.outlineButton.setStyleSheet(buttonStyle)
@@ -833,7 +828,7 @@ class GuiDocViewHeader(QWidget):
         """Capture a click on the title and ensure that the item is
         selected in the project tree.
         """
-        if event.button() == Qt.MouseButton.LeftButton:
+        if event.button() == QtMouseLeft:
             self.docViewer.requestProjectItemSelected.emit(self._docHandle, True)
         return
 
@@ -857,7 +852,8 @@ class GuiDocViewFooter(QWidget):
         # Internal Variables
         self._docHandle = None
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         hSp = CONFIG.pxInt(4)
         mPx = CONFIG.pxInt(4)
 
@@ -866,7 +862,7 @@ class GuiDocViewFooter(QWidget):
         self.setAutoFillBackground(True)
 
         # Show/Hide Details
-        self.showHide = NIconToolButton(self, iPx)
+        self.showHide = NIconToolButton(self, iSz)
         self.showHide.clicked.connect(lambda: self.docViewer.togglePanelVisibility.emit())
         self.showHide.setToolTip(self.tr("Show/Hide Viewer Panel"))
 
@@ -876,7 +872,7 @@ class GuiDocViewFooter(QWidget):
         self.showComments.setCheckable(True)
         self.showComments.setChecked(CONFIG.viewComments)
         self.showComments.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.showComments.setIconSize(QSize(iPx, iPx))
+        self.showComments.setIconSize(iSz)
         self.showComments.toggled.connect(self._doToggleComments)
         self.showComments.setToolTip(self.tr("Show Comments"))
 
@@ -886,7 +882,7 @@ class GuiDocViewFooter(QWidget):
         self.showSynopsis.setCheckable(True)
         self.showSynopsis.setChecked(CONFIG.viewSynopsis)
         self.showSynopsis.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.showSynopsis.setIconSize(QSize(iPx, iPx))
+        self.showSynopsis.setIconSize(iSz)
         self.showSynopsis.toggled.connect(self._doToggleSynopsis)
         self.showSynopsis.setToolTip(self.tr("Show Synopsis Comments"))
 
@@ -927,7 +923,7 @@ class GuiDocViewFooter(QWidget):
         fPx = int(0.9*SHARED.theme.fontPixelSize)
         bulletIcon = SHARED.theme.getToggleIcon("bullet", (fPx, fPx))
 
-        self.showHide.setIcon(SHARED.theme.getIcon("panel"))
+        self.showHide.setThemeIcon("panel")
         self.showComments.setIcon(bulletIcon)
         self.showSynopsis.setIcon(bulletIcon)
 

novelwriter/gui/docviewerpanel.py

@@ -27,7 +27,7 @@ import logging
 
 from enum import Enum
 
-from PyQt5.QtCore import QModelIndex, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtCore import QModelIndex, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QFrame, QHeaderView, QMenu, QTabWidget, QToolButton,
     QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
@@ -38,7 +38,9 @@ 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.extensions.modified import NIconToolButton
 from novelwriter.gui.theme import STYLES_FLAT_TABS, STYLES_MIN_TOOLBUTTON
+from novelwriter.types import QtDecoration, QtUserRole
 
 logger = logging.getLogger(__name__)
 
@@ -55,7 +57,7 @@ class GuiDocViewerPanel(QWidget):
 
         self._lastHandle = None
 
-        iPx = int(1.0*SHARED.theme.baseIconSize)
+        iSz = SHARED.theme.baseIconSize
 
         self.tabBackRefs = _ViewPanelBackRefs(self)
 
@@ -65,8 +67,7 @@ class GuiDocViewerPanel(QWidget):
         self.aInactive.setCheckable(True)
         self.aInactive.toggled.connect(self._toggleHideInactive)
 
-        self.optsButton = QToolButton(self)
-        self.optsButton.setIconSize(QSize(iPx, iPx))
+        self.optsButton = NIconToolButton(self, iSz)
         self.optsButton.setMenu(self.optsMenu)
         self.optsButton.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
@@ -100,7 +101,7 @@ class GuiDocViewerPanel(QWidget):
 
     def updateTheme(self, updateTabs: bool = True) -> None:
         """Update theme elements."""
-        self.optsButton.setIcon(SHARED.theme.getIcon("menu"))
+        self.optsButton.setThemeIcon("menu")
         self.optsButton.setStyleSheet(SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON))
         self.mainTabs.setStyleSheet(SHARED.theme.getStyleSheet(STYLES_FLAT_TABS))
         self.updateHandle(self._lastHandle)
@@ -232,7 +233,7 @@ class _ViewPanelBackRefs(QTreeWidget):
     C_VIEW  = 2
     C_TITLE = 3
 
-    D_HANDLE = Qt.ItemDataRole.UserRole
+    D_HANDLE = QtUserRole
 
     def __init__(self, parent: GuiDocViewerPanel) -> None:
         super().__init__(parent=parent)
@@ -240,13 +241,14 @@ class _ViewPanelBackRefs(QTreeWidget):
         self._parent = parent
         self._treeMap: dict[str, QTreeWidgetItem] = {}
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         cMg = CONFIG.pxInt(6)
 
         self.setHeaderLabels([self.tr("Document"), "", "", self.tr("First Heading")])
         self.setIndentation(0)
         self.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
-        self.setIconSize(QSize(iPx, iPx))
+        self.setIconSize(iSz)
         self.setFrameStyle(QFrame.Shape.NoFrame)
 
         # Set Header Sizes
@@ -348,7 +350,7 @@ class _ViewPanelBackRefs(QTreeWidget):
             trItem.setToolTip(self.C_DOC, nwItem.itemName)
             trItem.setIcon(self.C_EDIT, self._editIcon)
             trItem.setIcon(self.C_VIEW, self._viewIcon)
-            trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+            trItem.setData(self.C_TITLE, QtDecoration, hDec)
             trItem.setText(self.C_TITLE, hItem.title)
             trItem.setToolTip(self.C_TITLE, hItem.title)
             trItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
@@ -373,7 +375,7 @@ class _ViewPanelKeyWords(QTreeWidget):
     C_TITLE  = 5
     C_SHORT  = 6
 
-    D_TAG = Qt.ItemDataRole.UserRole
+    D_TAG = QtUserRole
 
     def __init__(self, parent: GuiDocViewerPanel, itemClass: nwItemClass) -> None:
         super().__init__(parent=parent)
@@ -382,7 +384,8 @@ class _ViewPanelKeyWords(QTreeWidget):
         self._class = itemClass
         self._treeMap: dict[str, QTreeWidgetItem] = {}
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         cMg = CONFIG.pxInt(6)
 
         self.setHeaderLabels([
@@ -390,7 +393,7 @@ class _ViewPanelKeyWords(QTreeWidget):
             self.tr("Heading"), self.tr("Short Description")
         ])
         self.setIndentation(0)
-        self.setIconSize(QSize(iPx, iPx))
+        self.setIconSize(iSz)
         self.setFrameStyle(QFrame.Shape.NoFrame)
         self.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
         self.setExpandsOnDoubleClick(False)
@@ -466,7 +469,7 @@ class _ViewPanelKeyWords(QTreeWidget):
         trItem.setIcon(self.C_DOC, docIcon)
         trItem.setText(self.C_DOC, nwItem.itemName)
         trItem.setToolTip(self.C_DOC, nwItem.itemName)
-        trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
+        trItem.setData(self.C_TITLE, QtDecoration, hDec)
         trItem.setText(self.C_TITLE, hItem.title)
         trItem.setToolTip(self.C_TITLE, hItem.title)
         trItem.setText(self.C_SHORT, hItem.synopsis)

novelwriter/gui/editordocument.py

@@ -25,14 +25,14 @@ from __future__ import annotations
 
 import logging
 
-from time import time
 from collections.abc import Iterable
+from time import time
 
 from PyQt5.QtGui import QTextBlock, QTextCursor, QTextDocument
 from PyQt5.QtCore import QObject, pyqtSlot
-from PyQt5.QtWidgets import QPlainTextDocumentLayout, qApp
-from novelwriter import SHARED
+from PyQt5.QtWidgets import QApplication, QPlainTextDocumentLayout
 
+from novelwriter import SHARED
 from novelwriter.gui.dochighlight import GuiDocHighlighter, TextBlockData
 
 logger = logging.getLogger(__name__)
@@ -86,7 +86,7 @@ class GuiTextDocument(QTextDocument):
         self.setUndoRedoEnabled(True)
         self.blockSignals(False)
         self._syntax.rehighlight()
-        qApp.processEvents()
+        QApplication.processEvents()
 
         tEnd = time()
 

novelwriter/gui/itemdetails.py

@@ -25,25 +25,22 @@ from __future__ import annotations
 
 import logging
 
-from typing import TYPE_CHECKING
-
-from PyQt5.QtGui import QFont
-from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QWidget, QGridLayout, QLabel
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.constants import trConst, nwLabels
-
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
+from novelwriter.types import (
+    QtAlignLeft, QtAlignLeftBase, QtAlignRight, QtAlignRightBase, QtAlignRightMiddle
+)
 
 logger = logging.getLogger(__name__)
 
 
 class GuiItemDetails(QWidget):
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiItemDetails")
 
@@ -56,89 +53,89 @@ class GuiItemDetails(QWidget):
         mPx = CONFIG.pxInt(6)
         fPt = SHARED.theme.fontPointSize
 
-        fntLabel = QFont()
+        fntLabel = self.font()
         fntLabel.setBold(True)
         fntLabel.setPointSizeF(0.9*fPt)
 
-        fntValue = QFont()
+        fntValue = self.font()
         fntValue.setPointSizeF(0.9*fPt)
 
         # Label
-        self.labelName = QLabel(self.tr("Label"))
+        self.labelName = QLabel(self.tr("Label"), self)
         self.labelName.setFont(fntLabel)
-        self.labelName.setAlignment(Qt.AlignLeft | Qt.AlignBaseline)
+        self.labelName.setAlignment(QtAlignLeftBase)
 
-        self.labelIcon = QLabel("")
-        self.labelIcon.setAlignment(Qt.AlignRight | Qt.AlignBaseline)
+        self.labelIcon = QLabel("", self)
+        self.labelIcon.setAlignment(QtAlignRightBase)
 
-        self.labelData = QLabel("")
+        self.labelData = QLabel("", self)
         self.labelData.setFont(fntValue)
-        self.labelData.setAlignment(Qt.AlignLeft | Qt.AlignBaseline)
+        self.labelData.setAlignment(QtAlignLeftBase)
         self.labelData.setWordWrap(True)
 
         # Status
-        self.statusName = QLabel(self.tr("Status"))
+        self.statusName = QLabel(self.tr("Status"), self)
         self.statusName.setFont(fntLabel)
-        self.statusName.setAlignment(Qt.AlignLeft)
+        self.statusName.setAlignment(QtAlignLeft)
 
-        self.statusIcon = QLabel("")
-        self.statusIcon.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
+        self.statusIcon = QLabel("", self)
+        self.statusIcon.setAlignment(QtAlignRightMiddle)
 
-        self.statusData = QLabel("")
+        self.statusData = QLabel("", self)
         self.statusData.setFont(fntValue)
-        self.statusData.setAlignment(Qt.AlignLeft)
+        self.statusData.setAlignment(QtAlignLeft)
 
         # Class
-        self.className = QLabel(self.tr("Class"))
+        self.className = QLabel(self.tr("Class"), self)
         self.className.setFont(fntLabel)
-        self.className.setAlignment(Qt.AlignLeft)
+        self.className.setAlignment(QtAlignLeft)
 
-        self.classIcon = QLabel("")
-        self.classIcon.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
+        self.classIcon = QLabel("", self)
+        self.classIcon.setAlignment(QtAlignRightMiddle)
 
-        self.classData = QLabel("")
+        self.classData = QLabel("", self)
         self.classData.setFont(fntValue)
-        self.classData.setAlignment(Qt.AlignLeft)
+        self.classData.setAlignment(QtAlignLeft)
 
         # Layout
-        self.usageName = QLabel(self.tr("Usage"))
+        self.usageName = QLabel(self.tr("Usage"), self)
         self.usageName.setFont(fntLabel)
-        self.usageName.setAlignment(Qt.AlignLeft)
+        self.usageName.setAlignment(QtAlignLeft)
 
-        self.usageIcon = QLabel("")
-        self.usageIcon.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
+        self.usageIcon = QLabel("", self)
+        self.usageIcon.setAlignment(QtAlignRightMiddle)
 
-        self.usageData = QLabel("")
+        self.usageData = QLabel("", self)
         self.usageData.setFont(fntValue)
-        self.usageData.setAlignment(Qt.AlignLeft)
+        self.usageData.setAlignment(QtAlignLeft)
         self.usageData.setWordWrap(True)
 
         # Character Count
-        self.cCountName = QLabel("  "+self.tr("Characters"))
+        self.cCountName = QLabel("  "+self.tr("Characters"), self)
         self.cCountName.setFont(fntLabel)
-        self.cCountName.setAlignment(Qt.AlignRight)
+        self.cCountName.setAlignment(QtAlignRight)
 
-        self.cCountData = QLabel("")
+        self.cCountData = QLabel("", self)
         self.cCountData.setFont(fntValue)
-        self.cCountData.setAlignment(Qt.AlignRight)
+        self.cCountData.setAlignment(QtAlignRight)
 
         # Word Count
-        self.wCountName = QLabel("  "+self.tr("Words"))
+        self.wCountName = QLabel("  "+self.tr("Words"), self)
         self.wCountName.setFont(fntLabel)
-        self.wCountName.setAlignment(Qt.AlignRight)
+        self.wCountName.setAlignment(QtAlignRight)
 
-        self.wCountData = QLabel("")
+        self.wCountData = QLabel("", self)
         self.wCountData.setFont(fntValue)
-        self.wCountData.setAlignment(Qt.AlignRight)
+        self.wCountData.setAlignment(QtAlignRight)
 
         # Paragraph Count
-        self.pCountName = QLabel("  "+self.tr("Paragraphs"))
+        self.pCountName = QLabel("  "+self.tr("Paragraphs"), self)
         self.pCountName.setFont(fntLabel)
-        self.pCountName.setAlignment(Qt.AlignRight)
+        self.pCountName.setAlignment(QtAlignRight)
 
-        self.pCountData = QLabel("")
+        self.pCountData = QLabel("", self)
         self.pCountData.setFont(fntValue)
-        self.pCountData.setAlignment(Qt.AlignRight)
+        self.pCountData.setAlignment(QtAlignRight)
 
         # Assemble
         self.mainBox = QGridLayout(self)
@@ -234,7 +231,7 @@ class GuiItemDetails(QWidget):
             return
 
         self._handle = tHandle
-        iPx = int(round(0.8*SHARED.theme.baseIconSize))
+        iPx = int(round(0.9*SHARED.theme.baseIconHeight))
 
         # Label
         # =====