novelWriter 2.4.4__py3-none-any.whl → 2.5__py3-none-any.whl

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,11 +211,11 @@ 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(
-            self.tr("Outline of"), parent=self, scale=NColourLabel.HEADER_SCALE, bold=True
+            self.tr("Outline of"), self, scale=NColourLabel.HEADER_SCALE, bold=True
         )
         self.novelLabel.setContentsMargins(0, 0, CONFIG.pxInt(12), 0)
 
@@ -272,6 +268,7 @@ class GuiOutlineToolBar(QToolBar):
         self.aExport.setIcon(SHARED.theme.getIcon("export"))
         self.tbColumns.setIcon(SHARED.theme.getIcon("menu"))
         self.tbColumns.setStyleSheet("QToolButton::menu-indicator {image: none;}")
+        self.novelLabel.setTextColors(color=self.palette().windowText().color())
         return
 
     def populateNovelList(self) -> None:
@@ -311,8 +308,6 @@ class GuiOutlineToolBar(QToolBar):
         self.outlineExportRequest.emit()
         return
 
-# END Class GuiOutlineToolBar
-
 
 class GuiOutlineTree(QTreeWidget):
 
@@ -529,12 +524,12 @@ class GuiOutlineTree(QTreeWidget):
     @pyqtSlot()
     def exportOutline(self) -> None:
         """Export the outline as a CSV file."""
-        path = CONFIG.lastPath() / f"{makeFileNameSafe(SHARED.project.data.name)}.csv"
+        path = CONFIG.lastPath("outline") / f"{makeFileNameSafe(SHARED.project.data.name)}.csv"
         path, _ = QFileDialog.getSaveFileName(
             self, self.tr("Save Outline As"), str(path), formatFileFilter(["*.csv", "*"])
         )
         if path:
-            CONFIG.setLastPath(path)
+            CONFIG.setLastPath("outline", path)
             logger.info("Writing CSV file: %s", path)
             cols = [col for col in self._treeOrder if not self._colHidden[col]]
             order = [self._colIdx[col] for col in cols]
@@ -728,8 +723,6 @@ class GuiOutlineTree(QTreeWidget):
 
         return
 
-# END Class GuiOutlineTree
-
 
 class GuiOutlineHeaderMenu(QMenu):
 
@@ -772,8 +765,6 @@ class GuiOutlineHeaderMenu(QMenu):
 
         return
 
-# END Class GuiOutlineHeaderMenu
-
 
 class GuiOutlineDetails(QScrollArea):
 
@@ -1048,7 +1039,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 +1095,3 @@ class GuiOutlineDetails(QScrollArea):
         return ", ".join(
             [f"<a href='{tag}'>{tag}</a>" for tag in refs.get(key, [])]
         )
-
-# END Class GuiOutlineDetails

novelwriter/gui/projtree.py

@@ -30,14 +30,12 @@ import logging
 
 from enum import Enum
 from time import time
-from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import QPoint, Qt, QTimer, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QDragEnterEvent, QDragMoveEvent, QDropEvent, QIcon, QMouseEvent, QPalette
 from PyQt5.QtWidgets import (
-    QAbstractItemView, QAction, QDialog, QFrame, QHBoxLayout, QHeaderView,
-    QLabel, QMenu, QShortcut, QSizePolicy, QTreeWidget, QTreeWidgetItem,
-    QVBoxLayout, QWidget
+    QAbstractItemView, QAction, QFrame, QHBoxLayout, QHeaderView, QLabel,
+    QMenu, QShortcut, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -52,10 +50,10 @@ from novelwriter.dialogs.projectsettings import GuiProjectSettings
 from novelwriter.enum import nwDocMode, nwItemClass, nwItemLayout, nwItemType
 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
+from novelwriter.types import (
+    QtAlignLeft, QtAlignRight, QtMouseLeft, QtMouseMiddle, QtSizeExpanding,
+    QtUserRole
+)
 
 logger = logging.getLogger(__name__)
 
@@ -78,10 +76,8 @@ class GuiProjectView(QWidget):
     # Requests for the main GUI
     projectSettingsRequest = pyqtSignal(int)
 
-    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.projTree = GuiProjectTree(self)
@@ -246,8 +242,6 @@ class GuiProjectView(QWidget):
         self.projTree.createNewNote(tag, itemClass)
         return
 
-# END Class GuiProjectView
-
 
 class GuiProjectToolBar(QWidget):
 
@@ -260,7 +254,6 @@ class GuiProjectToolBar(QWidget):
 
         self.projView = projView
         self.projTree = projView.projTree
-        self.mainGui  = projView.mainGui
 
         iSz = SHARED.theme.baseIconSize
         mPx = CONFIG.pxInt(2)
@@ -272,7 +265,7 @@ class GuiProjectToolBar(QWidget):
         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)
+        self.viewLabel.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
 
         # Quick Links
         self.mQuick = QMenu(self)
@@ -474,8 +467,6 @@ class GuiProjectToolBar(QWidget):
 
         return
 
-# END Class GuiProjectToolBar
-
 
 class GuiProjectTree(QTreeWidget):
 
@@ -496,7 +487,6 @@ class GuiProjectTree(QTreeWidget):
         logger.debug("Create: GuiProjectTree")
 
         self.projView = projView
-        self.mainGui  = projView.mainGui
 
         # Internal Variables
         self._treeMap: dict[str, QTreeWidgetItem] = {}
@@ -1007,8 +997,7 @@ class GuiProjectTree(QTreeWidget):
             trItemP.takeChild(tIndex)
 
             for dHandle in reversed(self.getTreeFromHandle(tHandle)):
-                if self.mainGui.docEditor.docHandle == dHandle:
-                    self.mainGui.closeDocument()
+                SHARED.closeEditor(dHandle)
                 SHARED.project.removeItem(dHandle)
                 self._treeMap.pop(dHandle, None)
 
@@ -1031,7 +1020,7 @@ class GuiProjectTree(QTreeWidget):
         if trItem is None or nwItem is None:
             return
 
-        itemStatus, statusIcon = nwItem.getImportStatus(incIcon=True)
+        itemStatus, statusIcon = nwItem.getImportStatus()
         hLevel = nwItem.mainHeading
         itemIcon = SHARED.theme.getItemIcon(
             nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
@@ -1407,19 +1396,15 @@ class GuiProjectTree(QTreeWidget):
         if not newFile:
             itemList.remove(tHandle)
 
-        dlgMerge = GuiDocMerge(self.mainGui, tHandle, itemList)
-        dlgMerge.exec()
-
-        if dlgMerge.result() == QDialog.DialogCode.Accepted:
-
-            mrgData = dlgMerge.getData()
-            mrgList = mrgData.get("finalItems", [])
-            if not mrgList:
+        data, status = GuiDocMerge.getData(SHARED.mainGui, tHandle, itemList)
+        if status:
+            items = data.get("finalItems", [])
+            if not items:
                 SHARED.info(self.tr("No documents selected for merging."))
                 return False
 
             # Save the open document first, in case it's part of merge
-            self.mainGui.saveDocument()
+            SHARED.saveEditor()
 
             # Create merge object, and append docs
             docMerger = DocMerger(SHARED.project)
@@ -1434,7 +1419,7 @@ class GuiProjectTree(QTreeWidget):
             else:
                 return False
 
-            for sHandle in mrgList:
+            for sHandle in items:
                 docMerger.appendText(sHandle, True, mLabel)
 
             if not docMerger.writeTargetDoc():
@@ -1448,10 +1433,11 @@ class GuiProjectTree(QTreeWidget):
             if newFile:
                 self.revealNewTreeItem(mHandle, nHandle=tHandle, wordCount=True)
 
-            self.mainGui.openDocument(mHandle, doScroll=True)
+            self.projView.openDocumentRequest.emit(mHandle, nwDocMode.EDIT, "", False)
+            self.projView.setSelectedHandle(mHandle, doScroll=True)
 
-            if mrgData.get("moveToTrash", False):
-                for sHandle in reversed(mrgData.get("finalItems", [])):
+            if data.get("moveToTrash", False):
+                for sHandle in reversed(data.get("finalItems", [])):
                     trItem = self._getTreeItem(sHandle)
                     if isinstance(trItem, QTreeWidgetItem) and trItem.childCount() == 0:
                         self.moveItemToTrash(sHandle, askFirst=False, flush=False)
@@ -1477,16 +1463,11 @@ class GuiProjectTree(QTreeWidget):
             logger.error("Only valid document items can be split")
             return False
 
-        dlgSplit = GuiDocSplit(self.mainGui, tHandle)
-        dlgSplit.exec()
-
-        if dlgSplit.result() == QDialog.DialogCode.Accepted:
-
-            splitData, splitText = dlgSplit.getData()
-
-            headerList = splitData.get("headerList", [])
-            intoFolder = splitData.get("intoFolder", False)
-            docHierarchy = splitData.get("docHierarchy", False)
+        data, text, status = GuiDocSplit.getData(SHARED.mainGui, tHandle)
+        if status:
+            headerList = data.get("headerList", [])
+            intoFolder = data.get("intoFolder", False)
+            docHierarchy = data.get("docHierarchy", False)
 
             docSplit = DocSplitter(SHARED.project, tHandle)
             if intoFolder:
@@ -1496,7 +1477,7 @@ class GuiProjectTree(QTreeWidget):
             else:
                 docSplit.setParentItem(tItem.itemParent)
 
-            docSplit.splitDocument(headerList, splitText)
+            docSplit.splitDocument(headerList, text)
             for writeOk, dHandle, nHandle in docSplit.writeDocuments(docHierarchy):
                 SHARED.project.index.reIndexHandle(dHandle)
                 self.revealNewTreeItem(dHandle, nHandle=nHandle, wordCount=True)
@@ -1507,7 +1488,7 @@ class GuiProjectTree(QTreeWidget):
                         info=docSplit.getError()
                     )
 
-            if splitData.get("moveToTrash", False):
+            if data.get("moveToTrash", False):
                 self.moveItemToTrash(tHandle, askFirst=False, flush=True)
 
             self.saveTreeOrder()
@@ -1656,8 +1637,6 @@ class GuiProjectTree(QTreeWidget):
 
         return
 
-# END Class GuiProjectTree
-
 
 class _UpdatableMenu(QMenu):
 
@@ -1721,8 +1700,6 @@ class _UpdatableMenu(QMenu):
         self.menuItemTriggered.emit(str(action.data()))
         return
 
-# END Class _UpdatableMenu
-
 
 class _TreeContextMenu(QMenu):
 
@@ -1828,7 +1805,7 @@ class _TreeContextMenu(QMenu):
 
     def _itemHeader(self) -> None:
         """Check if there is a header that can be used for rename."""
-        SHARED.ensureEditorSaved(self._handle)
+        SHARED.saveEditor()
         if hItem := SHARED.project.index.getItemHeading(self._handle, "T0001"):
             action = self.addAction(self.tr("Rename to Heading"))
             action.triggered.connect(
@@ -1854,11 +1831,11 @@ class _TreeContextMenu(QMenu):
         if self._item.isNovelLike():
             menu = self.addMenu(self.tr("Set Status to ..."))
             current = self._item.itemStatus
-            for n, (key, entry) in enumerate(SHARED.project.data.itemStatus.items()):
-                name = entry["name"]
+            for n, (key, entry) in enumerate(SHARED.project.data.itemStatus.iterItems()):
+                name = entry.name
                 if not multi and current == key:
                     name += f" ({nwUnicode.U_CHECK})"
-                action = menu.addAction(entry["icon"], name)
+                action = menu.addAction(entry.icon, name)
                 if multi:
                     action.triggered.connect(lambda n, key=key: self._iterSetItemStatus(key))
                 else:
@@ -1871,11 +1848,11 @@ class _TreeContextMenu(QMenu):
         else:
             menu = self.addMenu(self.tr("Set Importance to ..."))
             current = self._item.itemImport
-            for n, (key, entry) in enumerate(SHARED.project.data.itemImport.items()):
-                name = entry["name"]
+            for n, (key, entry) in enumerate(SHARED.project.data.itemImport.iterItems()):
+                name = entry.name
                 if not multi and current == key:
                     name += f" ({nwUnicode.U_CHECK})"
-                action = menu.addAction(entry["icon"], name)
+                action = menu.addAction(entry.icon, name)
                 if multi:
                     action.triggered.connect(lambda n, key=key: self._iterSetItemImport(key))
                 else:
@@ -2075,5 +2052,3 @@ class _TreeContextMenu(QMenu):
             else:
                 logger.info("Folder conversion cancelled")
         return
-
-# END Class _TreeContextMenu

novelwriter/gui/search.py

@@ -208,6 +208,12 @@ class GuiProjectSearch(QWidget):
         self.searchResult.clear()
         return
 
+    def refreshCurrentSearch(self) -> None:
+        """Refresh the search if there is one."""
+        if self.searchResult.topLevelItemCount() > 0:
+            self._processSearch()
+        return
+
     ##
     #  Events
     ##
@@ -259,7 +265,7 @@ class GuiProjectSearch(QWidget):
         if not self._blocked:
             QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
             start = time()
-            SHARED.mainGui.saveDocument()
+            SHARED.saveEditor()
             self._blocked = True
             self._map = {}
             self.searchResult.clear()
@@ -298,18 +304,21 @@ class GuiProjectSearch(QWidget):
     def _toggleCase(self, state: bool) -> None:
         """Enable/disable case sensitive mode."""
         CONFIG.searchProjCase = state
+        self.refreshCurrentSearch()
         return
 
     @pyqtSlot(bool)
     def _toggleWord(self, state: bool) -> None:
         """Enable/disable whole word search mode."""
         CONFIG.searchProjWord = state
+        self.refreshCurrentSearch()
         return
 
     @pyqtSlot(bool)
     def _toggleRegEx(self, state: bool) -> None:
         """Enable/disable regular expression search mode."""
         CONFIG.searchProjRegEx = state
+        self.refreshCurrentSearch()
         return
 
     ##
@@ -358,5 +367,3 @@ class GuiProjectSearch(QWidget):
             QApplication.processEvents()
 
         return
-
-# END Class GuiProjectSearch

novelwriter/gui/sidebar.py

@@ -27,8 +27,8 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QPalette
 from PyQt5.QtCore import QEvent, QPoint, QSize, pyqtSignal
+from PyQt5.QtGui import QPalette
 from PyQt5.QtWidgets import QMenu, QVBoxLayout, QWidget
 
 from novelwriter import CONFIG, SHARED
@@ -58,7 +58,7 @@ class GuiSideBar(QWidget):
         iSz = QSize(iPx, iPx)
 
         self.setContentsMargins(0, 0, 0, 0)
-        self.installEventFilter(StatusTipFilter(mainGui))
+        self.installEventFilter(StatusTipFilter(self.mainGui))
 
         # Buttons
         self.tbProject = NIconToolButton(self, iSz)
@@ -150,8 +150,6 @@ class GuiSideBar(QWidget):
 
         return
 
-# END Class GuiSideBar
-
 
 class _PopRightMenu(QMenu):
 
@@ -162,5 +160,3 @@ class _PopRightMenu(QMenu):
                 offset = QPoint(parent.width(), parent.height() - self.height())
                 self.move(parent.mapToGlobal(offset))
         return super(_PopRightMenu, self).event(event)
-
-# END Class _PopRightMenu

novelwriter/gui/statusbar.py

@@ -27,26 +27,23 @@ import logging
 
 from datetime import datetime
 from time import time
-from typing import TYPE_CHECKING, Literal
 
-from PyQt5.QtCore import pyqtSlot, QLocale
-from PyQt5.QtWidgets import QApplication, QStatusBar, QLabel
+from PyQt5.QtCore import QLocale, pyqtSlot
+from PyQt5.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime
 from novelwriter.constants import nwConst
+from novelwriter.enum import nwTrinary
 from novelwriter.extensions.statusled import StatusLED
 
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
-
 logger = logging.getLogger(__name__)
 
 
 class GuiMainStatus(QStatusBar):
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiMainStatus")
 
@@ -54,10 +51,6 @@ class GuiMainStatus(QStatusBar):
         self._userIdle = False
         self._debugInfo = False
 
-        colNone = SHARED.theme.statNone
-        colSaved = SHARED.theme.statSaved
-        colUnsaved = SHARED.theme.statUnsaved
-
         iPx = SHARED.theme.baseIconHeight
 
         # Permanent Widgets
@@ -74,7 +67,7 @@ class GuiMainStatus(QStatusBar):
         self.addPermanentWidget(self.langText)
 
         # The Editor Status
-        self.docIcon = StatusLED(colNone, colSaved, colUnsaved, iPx, iPx, self)
+        self.docIcon = StatusLED(iPx, iPx, self)
         self.docText = QLabel(self.tr("Editor"), self)
         self.docIcon.setContentsMargins(0, 0, 0, 0)
         self.docText.setContentsMargins(0, 0, xM, 0)
@@ -82,7 +75,7 @@ class GuiMainStatus(QStatusBar):
         self.addPermanentWidget(self.docText)
 
         # The Project Status
-        self.projIcon = StatusLED(colNone, colSaved, colUnsaved, iPx, iPx, self)
+        self.projIcon = StatusLED(iPx, iPx, self)
         self.projText = QLabel(self.tr("Project"), self)
         self.projIcon.setContentsMargins(0, 0, 0, 0)
         self.projText.setContentsMargins(0, 0, xM, 0)
@@ -123,8 +116,8 @@ class GuiMainStatus(QStatusBar):
         self.setRefTime(-1.0)
         self.setLanguage(*SHARED.spelling.describeDict())
         self.setProjectStats(0, 0)
-        self.setProjectStatus(StatusLED.S_NONE)
-        self.setDocumentStatus(StatusLED.S_NONE)
+        self.setProjectStatus(nwTrinary.NEUTRAL)
+        self.setDocumentStatus(nwTrinary.NEUTRAL)
         self.updateTime()
         return
 
@@ -136,6 +129,13 @@ class GuiMainStatus(QStatusBar):
         self.timePixmap = SHARED.theme.getPixmap("status_time", (iPx, iPx))
         self.idlePixmap = SHARED.theme.getPixmap("status_idle", (iPx, iPx))
         self.timeIcon.setPixmap(self.timePixmap)
+
+        colNone = SHARED.theme.statNone
+        colSaved = SHARED.theme.statSaved
+        colUnsaved = SHARED.theme.statUnsaved
+        self.docIcon.setColors(colNone, colSaved, colUnsaved)
+        self.projIcon.setColors(colNone, colSaved, colUnsaved)
+
         return
 
     ##
@@ -147,12 +147,12 @@ class GuiMainStatus(QStatusBar):
         self._refTime = refTime
         return
 
-    def setProjectStatus(self, state: Literal[0, 1, 2]) -> None:
+    def setProjectStatus(self, state: nwTrinary) -> None:
         """Set the project status colour icon."""
         self.projIcon.setState(state)
         return
 
-    def setDocumentStatus(self, state: Literal[0, 1, 2]) -> None:
+    def setDocumentStatus(self, state: nwTrinary) -> None:
         """Set the document status colour icon."""
         self.docIcon.setState(state)
         return
@@ -215,13 +215,13 @@ class GuiMainStatus(QStatusBar):
     @pyqtSlot(bool)
     def updateProjectStatus(self, status: bool) -> None:
         """Update the project status."""
-        self.setProjectStatus(StatusLED.S_BAD if status else StatusLED.S_GOOD)
+        self.setProjectStatus(nwTrinary.NEGATIVE if status else nwTrinary.POSITIVE)
         return
 
     @pyqtSlot(bool)
     def updateDocumentStatus(self, status: bool) -> None:
         """Update the document status."""
-        self.setDocumentStatus(StatusLED.S_BAD if status else StatusLED.S_GOOD)
+        self.setDocumentStatus(nwTrinary.NEGATIVE if status else nwTrinary.POSITIVE)
         return
 
     ##
@@ -238,9 +238,8 @@ class GuiMainStatus(QStatusBar):
         before starting novelWriter.
         """
         import tracemalloc
-        from collections import Counter
 
-        widgets = QApplication.allWidgets()
+        count = len(QApplication.allWidgets())
         if not self._debugInfo:
             if tracemalloc.is_tracing():
                 self._traceMallocRef = "Total"
@@ -248,21 +247,14 @@ class GuiMainStatus(QStatusBar):
                 self._traceMallocRef = "Relative"
                 tracemalloc.start()
             self._debugInfo = True
-            self._wCounts = Counter([type(x).__name__ for x in widgets])
-
-        if hasattr(self, "_wCounts"):
-            diff = Counter([type(x).__name__ for x in widgets]) - self._wCounts
-            for name, count in diff.items():
-                logger.debug("Widget '%s': +%d", name, count)
 
-        mem = tracemalloc.get_traced_memory()
+        current, peak = tracemalloc.get_traced_memory()
         stamp = datetime.now().strftime("%H:%M:%S")
-        self.showMessage((
-            f"Debug [{stamp}]"
-            f" \u2013 Widgets: {len(widgets)}"
-            f" \u2013 {self._traceMallocRef} Memory: {mem[0]:n}"
-            f" \u2013 Peak: {mem[1]:n}"
-        ), 6000)
+        message = (
+            f"Widgets: {count} \u2013 "
+            f"{self._traceMallocRef} Memory: {current/1024:,.2f} kiB \u2013 "
+            f"Peak: {peak/1024:,.2f} kiB"
+        )
+        self.showMessage(f"Debug [{stamp}] {message}", 6000)
+        logger.debug("[MEMINFO] %s", message)
         return
-
-# END Class GuiMainStatus