novelWriter 2.4.2__py3-none-any.whl → 2.5b1__py3-none-any.whl

novelwriter/gui/docviewer.py

@@ -31,27 +31,21 @@ import logging
 from enum import Enum
 
 from PyQt5.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot
-from PyQt5.QtGui import (
-    QCursor, QFont, QMouseEvent, QPalette, QResizeEvent, QTextCursor,
-    QTextOption
-)
+from PyQt5.QtGui import QCursor, QMouseEvent, QPalette, QResizeEvent, QTextCursor
 from PyQt5.QtWidgets import (
     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.core.toqdoc import TextDocumentTheme, ToQTextDocument
 from novelwriter.enum import nwDocAction, nwDocMode, nwItemType
 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
-)
+from novelwriter.types import QtAlignCenterTop, QtKeepAnchor, QtMouseLeft, QtMoveAnchor
 
 logger = logging.getLogger(__name__)
 
@@ -72,6 +66,7 @@ class GuiDocViewer(QTextBrowser):
 
         # Internal Variables
         self._docHandle = None
+        self._docTheme = TextDocumentTheme()
 
         # Settings
         self.setMinimumWidth(CONFIG.pxInt(300))
@@ -140,13 +135,10 @@ class GuiDocViewer(QTextBrowser):
 
     def initViewer(self) -> None:
         """Set editor settings from main config."""
-        self._makeStyleSheet()
-
-        # Set Font
-        font = QFont()
-        font.setFamily(CONFIG.textFont)
-        font.setPointSize(CONFIG.textSize)
-        self.document().setDefaultFont(font)
+        # Set the font. See issues #1862 and #1875.
+        self.setFont(CONFIG.textFont)
+        self.docHeader.updateFont()
+        self.docFooter.updateFont()
 
         # Set the widget colours to match syntax theme
         mainPalette = self.palette()
@@ -159,16 +151,23 @@ class GuiDocViewer(QTextBrowser):
         docPalette.setColor(QPalette.ColorRole.Base, SHARED.theme.colBack)
         docPalette.setColor(QPalette.ColorRole.Text, SHARED.theme.colText)
         self.viewport().setPalette(docPalette)
-
         self.docHeader.matchColours()
         self.docFooter.matchColours()
 
+        # Update theme colours
+        self._docTheme.text      = SHARED.theme.colText
+        self._docTheme.highlight = SHARED.theme.colMark
+        self._docTheme.head      = SHARED.theme.colHead
+        self._docTheme.comment   = SHARED.theme.colHidden
+        self._docTheme.note      = SHARED.theme.colNote
+        self._docTheme.code      = SHARED.theme.colCode
+        self._docTheme.modifier  = SHARED.theme.colMod
+        self._docTheme.keyword   = SHARED.theme.colKey
+        self._docTheme.tag       = SHARED.theme.colTag
+        self._docTheme.optional  = SHARED.theme.colOpt
+
         # Set default text margins
         self.document().setDocumentMargin(0)
-        options = QTextOption()
-        if CONFIG.doJustify:
-            options.setAlignment(QtAlignJustify)
-        self.document().setDefaultTextOption(options)
 
         # Scroll bars
         if CONFIG.hideVScroll:
@@ -200,21 +199,22 @@ class GuiDocViewer(QTextBrowser):
         QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
 
         sPos = self.verticalScrollBar().value()
-        aDoc = ToHtml(SHARED.project)
-        aDoc.setPreview(True)
-        aDoc.setKeywords(True)
-        aDoc.setComments(CONFIG.viewComments)
-        aDoc.setSynopsis(CONFIG.viewSynopsis)
-        aDoc.setLinkHeadings(True)
+        qDoc = ToQTextDocument(SHARED.project)
+        qDoc.setJustify(CONFIG.doJustify)
+        qDoc.initDocument(CONFIG.textFont, self._docTheme)
+        qDoc.setKeywords(True)
+        qDoc.setComments(CONFIG.viewComments)
+        qDoc.setSynopsis(CONFIG.viewSynopsis)
 
         # Be extra careful here to prevent crashes when first opening a
         # project as a crash here leaves no way of recovering.
         # See issue #298
         try:
-            aDoc.setText(tHandle)
-            aDoc.doPreProcessing()
-            aDoc.tokenizeText()
-            aDoc.doConvert()
+            qDoc.setText(tHandle)
+            qDoc.doPreProcessing()
+            qDoc.tokenizeText()
+            qDoc.doConvert()
+            qDoc.appendFootnotes()
         except Exception:
             logger.error("Failed to generate preview for document with handle '%s'", tHandle)
             logException()
@@ -230,11 +230,7 @@ class GuiDocViewer(QTextBrowser):
             self.docHistory.append(tHandle)
 
         self.setDocumentTitle(tHandle)
-
-        # Replace tabs before setting the HTML, and then put them back in
-        self.setHtml(aDoc.result.replace("\t", "!!tab!!"))
-        while self.find("!!tab!!"):
-            self.textCursor().insertText("\t")
+        self.setDocument(qDoc.document)
 
         if self._docHandle == tHandle:
             # This is a refresh, so we set the scrollbar back to where it was
@@ -372,12 +368,10 @@ class GuiDocViewer(QTextBrowser):
     @pyqtSlot("QUrl")
     def _linkClicked(self, url: QUrl) -> None:
         """Process a clicked link in the document."""
-        link = url.url()
-        logger.debug("Clicked link: '%s'", link)
-        if len(link) > 0:
-            bits = link.split("=")
-            if len(bits) == 2:
-                self.loadDocumentTagRequest.emit(bits[1], nwDocMode.VIEW)
+        if link := url.url():
+            logger.debug("Clicked link: '%s'", link)
+            if (bits := link.partition("_")) and bits[2]:
+                self.loadDocumentTagRequest.emit(bits[2], nwDocMode.VIEW)
         return
 
     @pyqtSlot("QPoint")
@@ -467,34 +461,6 @@ class GuiDocViewer(QTextBrowser):
         self._makeSelection(selType)
         return
 
-    def _makeStyleSheet(self) -> None:
-        """Generate an appropriate style sheet for the document viewer,
-        based on the current syntax highlighter theme.
-        """
-        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"
-        )
-
-        return
-
-# END Class GuiDocViewer
-
 
 class GuiDocViewHistory:
 
@@ -608,15 +574,13 @@ class GuiDocViewHistory:
                 )
         return
 
-# END Class GuiDocViewHistory
-
-
-# =============================================================================================== #
-#  The Embedded Document Header
-#  Only used by DocViewer, and is at a fixed position in the QTextBrowser's viewport
-# =============================================================================================== #
 
 class GuiDocViewHeader(QWidget):
+    """The Embedded Document Header
+
+    Only used by DocViewer, and is at a fixed position in the
+    QTextBrowser's viewport.
+    """
 
     def __init__(self, docViewer: GuiDocViewer) -> None:
         super().__init__(parent=docViewer)
@@ -646,10 +610,6 @@ class GuiDocViewHeader(QWidget):
         self.itemTitle.setAlignment(QtAlignCenterTop)
         self.itemTitle.setFixedHeight(iPx)
 
-        lblFont = self.itemTitle.font()
-        lblFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-        self.itemTitle.setFont(lblFont)
-
         # Other Widgets
         self.outlineMenu = QMenu(self)
 
@@ -700,7 +660,7 @@ class GuiDocViewHeader(QWidget):
         self.outerBox.setContentsMargins(mPx, mPx, mPx, mPx)
         self.setMinimumHeight(iPx + 2*mPx)
 
-        # Fix the Colours
+        self.updateFont()
         self.updateTheme()
 
         logger.debug("Ready: GuiDocViewHeader")
@@ -745,6 +705,12 @@ class GuiDocViewHeader(QWidget):
             self._docOutline = data
         return
 
+    def updateFont(self) -> None:
+        """Update the font settings."""
+        self.setFont(SHARED.theme.guiFont)
+        self.itemTitle.setFont(SHARED.theme.guiFontSmall)
+        return
+
     def updateTheme(self) -> None:
         """Update theme elements."""
         self.outlineButton.setThemeIcon("list")
@@ -832,15 +798,13 @@ class GuiDocViewHeader(QWidget):
             self.docViewer.requestProjectItemSelected.emit(self._docHandle, True)
         return
 
-# END Class GuiDocViewHeader
-
-
-# =============================================================================================== #
-#  The Embedded Document Footer
-#  Only used by DocViewer, and is at a fixed position in the QTextBrowser's viewport
-# =============================================================================================== #
 
 class GuiDocViewFooter(QWidget):
+    """The Embedded Document Footer
+
+    Only used by DocViewer, and is at a fixed position in the
+    QTextBrowser's viewport.
+    """
 
     def __init__(self, docViewer: GuiDocViewer) -> None:
         super().__init__(parent=docViewer)
@@ -886,11 +850,6 @@ class GuiDocViewFooter(QWidget):
         self.showSynopsis.toggled.connect(self._doToggleSynopsis)
         self.showSynopsis.setToolTip(self.tr("Show Synopsis Comments"))
 
-        lblFont = self.font()
-        lblFont.setPointSizeF(0.9*SHARED.theme.fontPointSize)
-        self.showComments.setFont(lblFont)
-        self.showSynopsis.setFont(lblFont)
-
         # Assemble Layout
         self.outerBox = QHBoxLayout()
         self.outerBox.addWidget(self.showHide, 0)
@@ -906,7 +865,7 @@ class GuiDocViewFooter(QWidget):
         self.outerBox.setContentsMargins(mPx, mPx, mPx, mPx)
         self.setMinimumHeight(iPx + 2*mPx)
 
-        # Fix the Colours
+        self.updateFont()
         self.updateTheme()
 
         logger.debug("Ready: GuiDocViewFooter")
@@ -917,6 +876,13 @@ class GuiDocViewFooter(QWidget):
     #  Methods
     ##
 
+    def updateFont(self) -> None:
+        """Update the font settings."""
+        self.setFont(SHARED.theme.guiFont)
+        self.showComments.setFont(SHARED.theme.guiFontSmall)
+        self.showSynopsis.setFont(SHARED.theme.guiFontSmall)
+        return
+
     def updateTheme(self) -> None:
         """Update theme elements."""
         # Icons
@@ -964,5 +930,3 @@ class GuiDocViewFooter(QWidget):
         CONFIG.viewSynopsis = state
         self.docViewer.reloadText()
         return
-
-# END Class GuiDocViewFooter

novelwriter/gui/docviewerpanel.py

@@ -209,9 +209,8 @@ class GuiDocViewerPanel(QWidget):
 
     def _updateTabVisibility(self) -> None:
         """Hide class tabs with no content."""
-        if CONFIG.verQtValue >= 0x050f00:
-            for tClass, cTab in self.kwTabs.items():
-                self.mainTabs.setTabVisible(self.idTabs[tClass], cTab.countEntries() > 0)
+        for tClass, cTab in self.kwTabs.items():
+            self.mainTabs.setTabVisible(self.idTabs[tClass], cTab.countEntries() > 0)
         return
 
     def _loadAllTags(self) -> None:
@@ -222,8 +221,6 @@ class GuiDocViewerPanel(QWidget):
                 self.kwTabs[tClass].addUpdateEntry(key, name, iItem, hItem)
         return
 
-# END Class GuiDocViewerPanel
-
 
 class _ViewPanelBackRefs(QTreeWidget):
 
@@ -361,8 +358,6 @@ class _ViewPanelBackRefs(QTreeWidget):
 
         return
 
-# END Class _ViewPanelBackRefs
-
 
 class _ViewPanelKeyWords(QTreeWidget):
 
@@ -450,7 +445,7 @@ class _ViewPanelKeyWords(QTreeWidget):
             nwItem.itemType, nwItem.itemClass,
             nwItem.itemLayout, nwItem.mainHeading
         )
-        impLabel, impIcon = nwItem.getImportStatus(incIcon=True)
+        impLabel, impIcon = nwItem.getImportStatus()
         iLevel = nwHeaders.H_LEVEL.get(hItem.level, 0) if nwItem.isDocumentLayout() else 5
         hDec = SHARED.theme.getHeaderDecorationNarrow(iLevel)
 
@@ -529,5 +524,3 @@ class _ViewPanelKeyWords(QTreeWidget):
         if index.column() not in (self.C_EDIT, self.C_VIEW):
             self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.VIEW)
         return
-
-# END Class _ViewPanelKeyWords

novelwriter/gui/editordocument.py

@@ -28,8 +28,8 @@ import logging
 from collections.abc import Iterable
 from time import time
 
-from PyQt5.QtGui import QTextBlock, QTextCursor, QTextDocument
 from PyQt5.QtCore import QObject, pyqtSlot
+from PyQt5.QtGui import QTextBlock, QTextCursor, QTextDocument
 from PyQt5.QtWidgets import QApplication, QPlainTextDocumentLayout
 
 from novelwriter import SHARED
@@ -133,5 +133,3 @@ class GuiTextDocument(QTextDocument):
         """Set the spell check state of the syntax highlighter."""
         self._syntax.setSpellCheck(state)
         return
-
-# END Class GuiTextDocument

novelwriter/gui/itemdetails.py

@@ -26,12 +26,14 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QWidget, QGridLayout, QLabel
+from PyQt5.QtWidgets import QGridLayout, QLabel, QWidget
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.constants import trConst, nwLabels
+from novelwriter.common import elide
+from novelwriter.constants import nwLabels, trConst
 from novelwriter.types import (
-    QtAlignLeft, QtAlignLeftBase, QtAlignRight, QtAlignRightBase, QtAlignRightMiddle
+    QtAlignLeft, QtAlignLeftBase, QtAlignRight, QtAlignRightBase,
+    QtAlignRightMiddle
 )
 
 logger = logging.getLogger(__name__)
@@ -236,10 +238,6 @@ class GuiItemDetails(QWidget):
         # Label
         # =====
 
-        label = nwItem.itemName
-        if len(label) > 100:
-            label = label[:96].rstrip()+" ..."
-
         if nwItem.isFileType():
             if nwItem.isActive:
                 self.labelIcon.setPixmap(SHARED.theme.getPixmap("checked", (iPx, iPx)))
@@ -248,12 +246,12 @@ class GuiItemDetails(QWidget):
         else:
             self.labelIcon.setPixmap(SHARED.theme.getPixmap("noncheckable", (iPx, iPx)))
 
-        self.labelData.setText(label)
+        self.labelData.setText(elide(nwItem.itemName, 100))
 
         # Status
         # ======
 
-        status, icon = nwItem.getImportStatus(incIcon=True)
+        status, icon = nwItem.getImportStatus()
         self.statusIcon.setPixmap(icon.pixmap(iPx, iPx))
         self.statusData.setText(status)
 
@@ -297,5 +295,3 @@ class GuiItemDetails(QWidget):
             self.wCountData.setText(f"{wC:n}")
             self.pCountData.setText(f"{pC:n}")
         return
-
-# END Class GuiItemDetails

novelwriter/gui/mainmenu.py

@@ -25,16 +25,16 @@ from __future__ import annotations
 
 import logging
 
-from typing import TYPE_CHECKING
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtCore import QUrl, pyqtSignal, pyqtSlot
-from PyQt5.QtWidgets import QMenuBar, QAction
+from PyQt5.QtGui import QDesktopServices
+from PyQt5.QtWidgets import QAction, QMenuBar
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import openExternalPath
-from novelwriter.constants import nwConst, trConst, nwKeyWords, nwLabels, nwUnicode
+from novelwriter.constants import nwConst, nwKeyWords, nwLabels, nwUnicode, trConst
 from novelwriter.enum import nwDocAction, nwDocInsert, nwView, nwWidget
 from novelwriter.extensions.eventfilters import StatusTipFilter
 
@@ -202,7 +202,7 @@ class GuiMainMenu(QMenuBar):
         # Document > Save
         self.aSaveDoc = self.docuMenu.addAction(self.tr("Save Document"))
         self.aSaveDoc.setShortcut("Ctrl+S")
-        self.aSaveDoc.triggered.connect(self.mainGui.saveDocument)
+        self.aSaveDoc.triggered.connect(self.mainGui.forceSaveDocument)
 
         # Document > Close
         self.aCloseDoc = self.docuMenu.addAction(self.tr("Close Document"))
@@ -597,6 +597,12 @@ class GuiMainMenu(QMenuBar):
             lambda: self.requestDocInsert.emit(nwDocInsert.LIPSUM)
         )
 
+        # Insert > Footnote
+        self.aFootnote = self.insMenu.addAction(self.tr("Footnote"))
+        self.aFootnote.triggered.connect(
+            lambda: self.requestDocInsert.emit(nwDocInsert.FOOTNOTE)
+        )
+
         return
 
     def _buildFormatMenu(self) -> None:
@@ -985,5 +991,3 @@ class GuiMainMenu(QMenuBar):
         self.aWebsite.triggered.connect(lambda: self._openWebsite(nwConst.URL_WEB))
 
         return
-
-# END Class GuiMainMenu

novelwriter/gui/noveltree.py

@@ -29,14 +29,13 @@ import logging
 
 from enum import Enum
 from time import time
-from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QModelIndex, QPoint, Qt, pyqtSlot, pyqtSignal
+from PyQt5.QtCore import QModelIndex, QPoint, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QFocusEvent, QFont, QMouseEvent, QPalette, QResizeEvent
 from PyQt5.QtWidgets import (
     QAbstractItemView, QActionGroup, QFrame, QHBoxLayout, QHeaderView,
-    QInputDialog, QMenu, QSizePolicy, QToolTip, QTreeWidget, QTreeWidgetItem,
-    QVBoxLayout, QWidget
+    QInputDialog, QMenu, QToolTip, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -47,10 +46,10 @@ 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
+from novelwriter.types import (
+    QtAlignRight, QtDecoration, QtMouseLeft, QtMouseMiddle, QtSizeExpanding,
+    QtUserRole
+)
 
 logger = logging.getLogger(__name__)
 
@@ -62,8 +61,6 @@ class NovelTreeColumn(Enum):
     FOCUS  = 2
     PLOT   = 3
 
-# END Enum NovelTreeColumn
-
 
 class GuiNovelView(QWidget):
 
@@ -71,10 +68,8 @@ class GuiNovelView(QWidget):
     selectedItemChanged = pyqtSignal(str)
     openDocumentRequest = pyqtSignal(str, Enum, str, bool)
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
-
-        self.mainGui = mainGui
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         # Build GUI
         self.novelTree = GuiNovelTree(self)
@@ -188,8 +183,6 @@ class GuiNovelView(QWidget):
         self.novelTree.refreshHandle(tHandle)
         return
 
-# END Class GuiNovelView
-
 
 class GuiNovelToolBar(QWidget):
 
@@ -199,7 +192,6 @@ class GuiNovelToolBar(QWidget):
         logger.debug("Create: GuiNovelToolBar")
 
         self.novelView = novelView
-        self.mainGui   = novelView.mainGui
 
         iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(2)
@@ -215,7 +207,7 @@ class GuiNovelToolBar(QWidget):
         self.novelValue.setFont(selFont)
         self.novelValue.setListFormat(self.tr("Outline of {0}"))
         self.novelValue.setMinimumWidth(CONFIG.pxInt(150))
-        self.novelValue.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        self.novelValue.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
         self.novelValue.novelSelectionChanged.connect(self.setCurrentRoot)
 
         self.tbNovel = NIconToolButton(self, iSz)
@@ -353,8 +345,6 @@ class GuiNovelToolBar(QWidget):
         self.aLastCol[colType] = aLast
         return
 
-# END Class GuiNovelToolBar
-
 
 class GuiNovelTree(QTreeWidget):
 
@@ -375,7 +365,6 @@ class GuiNovelTree(QTreeWidget):
         logger.debug("Create: GuiNovelTree")
 
         self.novelView = novelView
-        self.mainGui   = novelView.mainGui
 
         # Internal Variables
         self._treeMap     = {}
@@ -490,7 +479,7 @@ class GuiNovelTree(QTreeWidget):
         if rootHandle is None:
             rootHandle = SHARED.project.tree.findRoot(nwItemClass.NOVEL)
 
-        treeChanged = self.mainGui.projView.changedSince(self._lastBuild)
+        treeChanged = SHARED.mainGui.projView.changedSince(self._lastBuild)
         indexChanged = SHARED.project.index.rootChangedSince(rootHandle, self._lastBuild)
         if not (treeChanged or indexChanged or overRide):
             logger.debug("No changes have been made to the novel index")
@@ -783,5 +772,3 @@ class GuiNovelTree(QTreeWidget):
         if tags:
             lines.append(f"<b>{trConst(nwLabels.KEY_NAME[key])}</b>: {tags}")
         return lines
-
-# END Class GuiNovelTree

novelwriter/gui/outline.py

@@ -30,30 +30,28 @@ from __future__ import annotations
 import csv
 import logging
 
-from time import time
 from enum import Enum
+from time import time
 
-from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QT_TRANSLATE_NOOP
+from PyQt5.QtCore import QT_TRANSLATE_NOOP, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QAction, QFileDialog, QFrame, QGridLayout, QGroupBox,
-    QHBoxLayout, QLabel, QMenu, QScrollArea, QSizePolicy, QSplitter, QToolBar,
-    QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
+    QHBoxLayout, QLabel, QMenu, QScrollArea, QSplitter, QToolBar, QToolButton,
+    QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.enum import (
-    nwDocMode, nwItemClass, nwItemLayout, nwItemType, nwOutline
-)
-from novelwriter.error import logException
 from novelwriter.common import checkInt, formatFileFilter, makeFileNameSafe
-from novelwriter.constants import nwHeaders, trConst, nwKeyWords, nwLabels
+from novelwriter.constants import nwHeaders, nwKeyWords, nwLabels, trConst
+from novelwriter.enum import nwDocMode, nwItemClass, nwItemLayout, nwItemType, nwOutline
+from novelwriter.error import logException
 from novelwriter.extensions.configlayout import NColourLabel
 from novelwriter.extensions.novelselector import NovelSelector
 from novelwriter.types import (
-    QtAlignLeftTop, QtAlignRight, QtAlignRightTop, QtDecoration, QtUserRole
+    QtAlignLeftTop, QtAlignRight, QtAlignRightTop, QtDecoration,
+    QtSizeExpanding, QtUserRole
 )
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -196,8 +194,6 @@ class GuiOutlineView(QWidget):
         self.outlineTree.refreshTree(rootHandle=(tHandle or None), overRide=True)
         return
 
-# END Class GuiOutlineView
-
 
 class GuiOutlineToolBar(QToolBar):
 
@@ -215,7 +211,7 @@ class GuiOutlineToolBar(QToolBar):
         self.setContentsMargins(0, 0, 0, 0)
 
         stretch = QWidget(self)
-        stretch.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        stretch.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
 
         # Novel Selector
         self.novelLabel = NColourLabel(
@@ -311,8 +307,6 @@ class GuiOutlineToolBar(QToolBar):
         self.outlineExportRequest.emit()
         return
 
-# END Class GuiOutlineToolBar
-
 
 class GuiOutlineTree(QTreeWidget):
 
@@ -728,8 +722,6 @@ class GuiOutlineTree(QTreeWidget):
 
         return
 
-# END Class GuiOutlineTree
-
 
 class GuiOutlineHeaderMenu(QMenu):
 
@@ -772,8 +764,6 @@ class GuiOutlineHeaderMenu(QMenu):
 
         return
 
-# END Class GuiOutlineHeaderMenu
-
 
 class GuiOutlineDetails(QScrollArea):
 
@@ -1048,7 +1038,7 @@ class GuiOutlineDetails(QScrollArea):
             self.titleLabel.setText(self.tr(self.LVL_MAP.get(novIdx.level, "H1")))
             self.titleValue.setText(novIdx.title)
 
-            itemStatus, _ = nwItem.getImportStatus(incIcon=False)
+            itemStatus, _ = nwItem.getImportStatus()
 
             self.fileValue.setText(nwItem.itemName)
             self.itemValue.setText(itemStatus)
@@ -1104,5 +1094,3 @@ class GuiOutlineDetails(QScrollArea):
         return ", ".join(
             [f"<a href='{tag}'>{tag}</a>" for tag in refs.get(key, [])]
         )
-
-# END Class GuiOutlineDetails