novelWriter 2.2rc1__py3-none-any.whl → 2.2.1__py3-none-any.whl

novelwriter/gui/editordocument.py

@@ -3,10 +3,10 @@ novelWriter – GUI Text Document
 ===============================
 
 File History:
-Created: 2023-09-07 [2.2b1]
+Created: 2023-09-07 [2.2b1] GuiTextDocument
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ class GuiTextDocument(QTextDocument):
 
         return
 
-    def __del__(self):  # pragma: no cover
+    def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: GuiTextDocument")
         return
 

novelwriter/gui/itemdetails.py

@@ -3,10 +3,10 @@ novelWriter – GUI Item Details Panel
 ====================================
 
 File History:
-Created: 2019-04-24 [0.0.1]
+Created: 2019-04-24 [0.0.1] GuiItemDetails
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

novelwriter/gui/mainmenu.py

@@ -3,10 +3,10 @@ novelWriter – GUI Main Menu
 ===========================
 
 File History:
-Created: 2019-04-27 [0.0.1]
+Created: 2019-04-27 [0.0.1] GuiMainMenu
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.enum import nwDocAction, nwDocInsert, nwWidget
 from novelwriter.common import openExternalPath
 from novelwriter.constants import nwConst, trConst, nwKeyWords, nwLabels, nwUnicode
+from novelwriter.extensions.eventfilters import StatusTipFilter
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -73,6 +74,8 @@ class GuiMainMenu(QMenuBar):
         self._buildToolsMenu()
         self._buildHelpMenu()
 
+        self.installEventFilter(StatusTipFilter(mainGui))
+
         logger.debug("Ready: GuiMainMenu")
 
         return
@@ -154,12 +157,12 @@ class GuiMainMenu(QMenuBar):
         # Project > Project Settings
         self.aProjectSettings = self.projMenu.addAction(self.tr("Project Settings"))
         self.aProjectSettings.setShortcut("Ctrl+Shift+,")
-        self.aProjectSettings.triggered.connect(lambda: self.mainGui.showProjectSettingsDialog())
+        self.aProjectSettings.triggered.connect(self.mainGui.showProjectSettingsDialog)
 
         # Project > Project Details
         self.aProjectDetails = self.projMenu.addAction(self.tr("Project Details"))
         self.aProjectDetails.setShortcut("Shift+F6")
-        self.aProjectDetails.triggered.connect(lambda: self.mainGui.showProjectDetailsDialog())
+        self.aProjectDetails.triggered.connect(self.mainGui.showProjectDetailsDialog)
 
         # Project > Separator
         self.projMenu.addSeparator()
@@ -566,7 +569,7 @@ class GuiMainMenu(QMenuBar):
 
         # Insert > Short Description Comment
         self.aInsShort = self.mInsComments.addAction(self.tr("Short Description Comment"))
-        self.aInsShort.setShortcut("Ctrl+K, U")
+        self.aInsShort.setShortcut("Ctrl+K, H")
         self.aInsShort.triggered.connect(
             lambda: self.requestDocInsert.emit(nwDocInsert.SHORT)
         )
@@ -593,8 +596,10 @@ class GuiMainMenu(QMenuBar):
         )
 
         # Insert > Placeholder Text
-        self.aLipsumText = self.mInsBreaks.addAction(self.tr("Placeholder Text"))
-        self.aLipsumText.triggered.connect(lambda: self.mainGui.showLoremIpsumDialog())
+        self.aLipsumText = self.insMenu.addAction(self.tr("Placeholder Text"))
+        self.aLipsumText.triggered.connect(
+            lambda: self.requestDocInsert.emit(nwDocInsert.LIPSUM)
+        )
 
         return
 
@@ -603,25 +608,25 @@ class GuiMainMenu(QMenuBar):
         # Format
         self.fmtMenu = self.addMenu(self.tr("&Format"))
 
-        # Format > Emphasis
-        self.aFmtEmph = self.fmtMenu.addAction(self.tr("Emphasis"))
-        self.aFmtEmph.setShortcut("Ctrl+I")
-        self.aFmtEmph.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.EMPH)
+        # Format > Bold
+        self.aFmtBold = self.fmtMenu.addAction(self.tr("Bold"))
+        self.aFmtBold.setShortcut("Ctrl+B")
+        self.aFmtBold.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_BOLD)
         )
 
-        # Format > Strong Emphasis
-        self.aFmtStrong = self.fmtMenu.addAction(self.tr("Strong Emphasis"))
-        self.aFmtStrong.setShortcut("Ctrl+B")
-        self.aFmtStrong.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.STRONG)
+        # Format > Italic
+        self.aFmtItalic = self.fmtMenu.addAction(self.tr("Italic"))
+        self.aFmtItalic.setShortcut("Ctrl+I")
+        self.aFmtItalic.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.MD_ITALIC)
         )
 
         # Format > Strikethrough
         self.aFmtStrike = self.fmtMenu.addAction(self.tr("Strikethrough"))
         self.aFmtStrike.setShortcut("Ctrl+D")
         self.aFmtStrike.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.STRIKE)
+            lambda: self.requestDocAction.emit(nwDocAction.MD_STRIKE)
         )
 
         # Edit > Separator
@@ -647,18 +652,18 @@ class GuiMainMenu(QMenuBar):
         # Shortcodes
         self.mShortcodes = self.fmtMenu.addMenu(self.tr("More Formats ..."))
 
-        # Shortcode Italic
-        self.aScItalic = self.mShortcodes.addAction(self.tr("Italics (Shortcode)"))
-        self.aScItalic.triggered.connect(
-            lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
-        )
-
         # Shortcode Bold
         self.aScBold = self.mShortcodes.addAction(self.tr("Bold (Shortcode)"))
         self.aScBold.triggered.connect(
             lambda: self.requestDocAction.emit(nwDocAction.SC_BOLD)
         )
 
+        # Shortcode Italic
+        self.aScItalic = self.mShortcodes.addAction(self.tr("Italics (Shortcode)"))
+        self.aScItalic.triggered.connect(
+            lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
+        )
+
         # Shortcode Strikethrough
         self.aScStrike = self.mShortcodes.addAction(self.tr("Strikethrough (Shortcode)"))
         self.aScStrike.triggered.connect(
@@ -872,7 +877,7 @@ class GuiMainMenu(QMenuBar):
 
         # Tools > Project Word List
         self.aEditWordList = self.toolsMenu.addAction(self.tr("Project Word List"))
-        self.aEditWordList.triggered.connect(lambda: self.mainGui.showProjectWordListDialog())
+        self.aEditWordList.triggered.connect(self.mainGui.showProjectWordListDialog)
 
         # Tools > Add Dictionaries
         if CONFIG.osWindows or CONFIG.isDebug:
@@ -902,13 +907,13 @@ class GuiMainMenu(QMenuBar):
         # Tools > Writing Statistics
         self.aWritingStats = self.toolsMenu.addAction(self.tr("Writing Statistics"))
         self.aWritingStats.setShortcut("F6")
-        self.aWritingStats.triggered.connect(lambda: self.mainGui.showWritingStatsDialog())
+        self.aWritingStats.triggered.connect(self.mainGui.showWritingStatsDialog)
 
         # Tools > Preferences
         self.aPreferences = self.toolsMenu.addAction(self.tr("Preferences"))
         self.aPreferences.setShortcut("Ctrl+,")
         self.aPreferences.setMenuRole(QAction.PreferencesRole)
-        self.aPreferences.triggered.connect(lambda: self.mainGui.showPreferencesDialog())
+        self.aPreferences.triggered.connect(self.mainGui.showPreferencesDialog)
 
         return
 
@@ -920,12 +925,12 @@ class GuiMainMenu(QMenuBar):
         # Help > About
         self.aAboutNW = self.helpMenu.addAction(self.tr("About novelWriter"))
         self.aAboutNW.setMenuRole(QAction.AboutRole)
-        self.aAboutNW.triggered.connect(lambda: self.mainGui.showAboutNWDialog())
+        self.aAboutNW.triggered.connect(self.mainGui.showAboutNWDialog)
 
         # Help > About Qt5
         self.aAboutQt = self.helpMenu.addAction(self.tr("About Qt5"))
         self.aAboutQt.setMenuRole(QAction.AboutQtRole)
-        self.aAboutQt.triggered.connect(lambda: self.mainGui.showAboutQtDialog())
+        self.aAboutQt.triggered.connect(self.mainGui.showAboutQtDialog)
 
         # Help > Separator
         self.helpMenu.addSeparator()
@@ -961,7 +966,7 @@ class GuiMainMenu(QMenuBar):
 
         # Document > Check for Updates
         self.aUpdates = self.helpMenu.addAction(self.tr("Check for New Release"))
-        self.aUpdates.triggered.connect(lambda: self.mainGui.showUpdatesDialog())
+        self.aUpdates.triggered.connect(self.mainGui.showUpdatesDialog)
 
         return
 

novelwriter/gui/noveltree.py

@@ -8,7 +8,7 @@ Created: 2022-06-12 [2.0rc1] GuiNovelView
 Created: 2022-06-12 [2.0rc1] GuiNovelToolBar
 
 This file is a part of novelWriter
-Copyright 2018–2020, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -145,6 +145,7 @@ class GuiNovelView(QWidget):
         """Run closing project tasks."""
         lastColType = self.novelTree.lastColType
         lastColSize = self.novelTree.lastColSize
+        logger.debug("Saving State: GuiNovelView")
         pOptions = SHARED.project.options
         pOptions.setValue("GuiNovelView", "lastCol", lastColType)
         pOptions.setValue("GuiNovelView", "lastColSize", lastColSize)
@@ -205,18 +206,18 @@ class GuiNovelToolBar(QWidget):
 
         # Novel Selector
         selFont = self.font()
-        selFont.setWeight(QFont.Bold)
+        selFont.setWeight(QFont.Weight.Bold)
         self.novelPrefix = self.tr("Outline of {0}")
         self.novelValue = NovelSelector(self)
         self.novelValue.setFont(selFont)
         self.novelValue.setMinimumWidth(CONFIG.pxInt(150))
-        self.novelValue.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.novelValue.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         self.novelValue.novelSelectionChanged.connect(self.setCurrentRoot)
 
         self.tbNovel = QToolButton(self)
         self.tbNovel.setToolTip(self.tr("Novel Root"))
         self.tbNovel.setIconSize(QSize(iPx, iPx))
-        self.tbNovel.clicked.connect(self._openNovelSelector)
+        self.tbNovel.clicked.connect(self.novelValue.showPopup)
 
         # Refresh Button
         self.tbRefresh = QToolButton(self)
@@ -243,7 +244,7 @@ class GuiNovelToolBar(QWidget):
         self.tbMore.setToolTip(self.tr("More Options"))
         self.tbMore.setIconSize(QSize(iPx, iPx))
         self.tbMore.setMenu(self.mMore)
-        self.tbMore.setPopupMode(QToolButton.InstantPopup)
+        self.tbMore.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         # Assemble
         self.outerBox = QHBoxLayout()
@@ -274,7 +275,7 @@ class GuiNovelToolBar(QWidget):
         self.tbMore.setIcon(SHARED.theme.getIcon("menu"))
 
         qPalette = self.palette()
-        qPalette.setBrush(QPalette.Window, qPalette.base())
+        qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base())
         self.setPalette(qPalette)
 
         # StyleSheets
@@ -326,12 +327,6 @@ class GuiNovelToolBar(QWidget):
     #  Private Slots
     ##
 
-    @pyqtSlot()
-    def _openNovelSelector(self) -> None:
-        """Trigger the dropdown list of the novel selector."""
-        self.novelValue.showPopup()
-        return
-
     @pyqtSlot()
     def _refreshNovelTree(self) -> None:
         """Rebuild the current tree."""
@@ -407,14 +402,14 @@ class GuiNovelTree(QTreeWidget):
         cMg = CONFIG.pxInt(6)
 
         self.setIconSize(QSize(iPx, iPx))
-        self.setFrameStyle(QFrame.NoFrame)
+        self.setFrameStyle(QFrame.Shape.NoFrame)
         self.setUniformRowHeights(True)
         self.setAllColumnsShowFocus(True)
         self.setHeaderHidden(True)
         self.setIndentation(0)
         self.setColumnCount(4)
-        self.setSelectionBehavior(QAbstractItemView.SelectRows)
-        self.setSelectionMode(QAbstractItemView.SingleSelection)
+        self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
+        self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
         self.setExpandsOnDoubleClick(False)
         self.setDragEnabled(False)
 
@@ -422,10 +417,10 @@ class GuiNovelTree(QTreeWidget):
         treeHeader = self.header()
         treeHeader.setStretchLastSection(False)
         treeHeader.setMinimumSectionSize(iPx + cMg)
-        treeHeader.setSectionResizeMode(self.C_TITLE, QHeaderView.Stretch)
-        treeHeader.setSectionResizeMode(self.C_WORDS, QHeaderView.ResizeToContents)
-        treeHeader.setSectionResizeMode(self.C_EXTRA, QHeaderView.ResizeToContents)
-        treeHeader.setSectionResizeMode(self.C_MORE, QHeaderView.ResizeToContents)
+        treeHeader.setSectionResizeMode(self.C_TITLE, QHeaderView.ResizeMode.Stretch)
+        treeHeader.setSectionResizeMode(self.C_WORDS, QHeaderView.ResizeMode.ResizeToContents)
+        treeHeader.setSectionResizeMode(self.C_EXTRA, QHeaderView.ResizeMode.ResizeToContents)
+        treeHeader.setSectionResizeMode(self.C_MORE, QHeaderView.ResizeMode.ResizeToContents)
 
         # Pre-Generate Tree Formatting
         fH1 = self.font()
@@ -454,14 +449,14 @@ class GuiNovelTree(QTreeWidget):
         """Set or update tree widget settings."""
         # Scroll bars
         if CONFIG.hideVScroll:
-            self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+            self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
         else:
-            self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+            self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
 
         if CONFIG.hideHScroll:
-            self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+            self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
         else:
-            self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+            self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
 
         return
 
@@ -521,21 +516,16 @@ class GuiNovelTree(QTreeWidget):
 
     def refreshHandle(self, tHandle: str) -> None:
         """Refresh the data for a given handle."""
-        idxData = SHARED.project.index.getItemData(tHandle)
-        if idxData is None:
-            return
-
-        logger.debug("Refreshing meta data for item '%s'", tHandle)
-        for sTitle, tHeading in idxData.items():
-            sKey = f"{tHandle}:{sTitle}"
-            trItem = self._treeMap.get(sKey, None)
-            if trItem is None:
-                logger.debug("Heading '%s' not in novel tree", sKey)
-                self.refreshTree()
-                return
-
-            self._updateTreeItemValues(trItem, tHeading, tHandle, sTitle)
-
+        if idxData := SHARED.project.index.getItemData(tHandle):
+            logger.debug("Refreshing meta data for item '%s'", tHandle)
+            for sTitle, tHeading in idxData.items():
+                sKey = f"{tHandle}:{sTitle}"
+                if trItem := self._treeMap.get(sKey, None):
+                    self._updateTreeItemValues(trItem, tHeading, tHandle, sTitle)
+                else:
+                    logger.debug("Heading '%s' not in novel tree", sKey)
+                    self.refreshTree()
+                    return
         return
 
     def getSelectedHandle(self) -> tuple[str | None, str | None]:
@@ -566,27 +556,25 @@ class GuiNovelTree(QTreeWidget):
         self._lastColSize = minmax(colSize, 15, 75)/100.0
         return
 
-    def setActiveHandle(self, tHandle: str | None) -> None:
+    def setActiveHandle(self, tHandle: str | None, doScroll: bool = False) -> None:
         """Highlight the rows associated with a given handle."""
-        tStart = time()
-
+        didScroll = False
         self._actHandle = tHandle
         for i in range(self.topLevelItemCount()):
-            tItem = self.topLevelItem(i)
-            if tItem is not None:
+            if tItem := self.topLevelItem(i):
                 if tItem.data(self.C_DATA, self.D_HANDLE) == tHandle:
                     tItem.setBackground(self.C_TITLE, self.palette().alternateBase())
                     tItem.setBackground(self.C_WORDS, self.palette().alternateBase())
                     tItem.setBackground(self.C_EXTRA, self.palette().alternateBase())
                     tItem.setBackground(self.C_MORE, self.palette().alternateBase())
+                    if doScroll and not didScroll:
+                        self.scrollToItem(tItem, QAbstractItemView.ScrollHint.PositionAtCenter)
+                        didScroll = True
                 else:
                     tItem.setBackground(self.C_TITLE, self.palette().base())
                     tItem.setBackground(self.C_WORDS, self.palette().base())
                     tItem.setBackground(self.C_EXTRA, self.palette().base())
                     tItem.setBackground(self.C_MORE, self.palette().base())
-
-        logger.debug("Highlighted Novel Tree in %.3f ms", (time() - tStart)*1000)
-
         return
 
     ##
@@ -600,12 +588,12 @@ class GuiNovelTree(QTreeWidget):
         """
         super().mousePressEvent(event)
 
-        if event.button() == Qt.LeftButton:
+        if event.button() == Qt.MouseButton.LeftButton:
             selItem = self.indexAt(event.pos())
             if not selItem.isValid():
                 self.clearSelection()
 
-        elif event.button() == Qt.MiddleButton:
+        elif event.button() == Qt.MouseButton.MiddleButton:
             selItem = self.itemAt(event.pos())
             if not isinstance(selItem, QTreeWidgetItem):
                 return
@@ -636,7 +624,10 @@ class GuiNovelTree(QTreeWidget):
                 trItem = self.topLevelItem(i)
                 if isinstance(trItem, QTreeWidgetItem):
                     lastText = trItem.data(self.C_DATA, self.D_EXTRA)
-                    trItem.setText(self.C_EXTRA, fMetric.elidedText(lastText, Qt.ElideRight, eliW))
+                    trItem.setText(
+                        self.C_EXTRA,
+                        fMetric.elidedText(lastText, Qt.TextElideMode.ElideRight, eliW)
+                    )
         return
 
     ##
@@ -692,7 +683,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.AlignRight)
+            newItem.setTextAlignment(self.C_WORDS, Qt.AlignmentFlag.AlignRight)
 
             self._updateTreeItemValues(newItem, novIdx, tHandle, sTitle)
             self._treeMap[tKey] = newItem
@@ -711,16 +702,16 @@ class GuiNovelTree(QTreeWidget):
         iLevel = nwHeaders.H_LEVEL.get(idxItem.level, 0)
         hDec = SHARED.theme.getHeaderDecoration(iLevel)
 
-        trItem.setData(self.C_TITLE, Qt.DecorationRole, hDec)
+        trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, 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.DecorationRole, self._pMore)
+        trItem.setData(self.C_MORE, Qt.ItemDataRole.DecorationRole, self._pMore)
 
         # Custom column
         mW = int(self._lastColSize * self.viewport().width())
         lastText, toolTip = self._getLastColumnText(tHandle, sTitle)
-        elideText = self.fontMetrics().elidedText(lastText, Qt.ElideRight, mW)
+        elideText = self.fontMetrics().elidedText(lastText, Qt.TextElideMode.ElideRight, mW)
         trItem.setText(self.C_EXTRA, elideText)
         trItem.setData(self.C_DATA, self.D_EXTRA, lastText)
         trItem.setToolTip(self.C_EXTRA, toolTip)

novelwriter/gui/outline.py

@@ -10,7 +10,7 @@ Created: 2019-11-16 [0.4.1]  GuiOutlineHeaderMenu
 Created: 2020-06-02 [0.7]    GuiOutlineDetails
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -606,6 +606,7 @@ class GuiOutlineTree(QTreeWidget):
                 logHidden, orgWidth if logHidden and logWidth == 0 else logWidth
             ]
 
+        logger.debug("Saving State: GuiOutline")
         pOptions = SHARED.project.options
         pOptions.setValue("GuiOutline", "columnState", colState)
         pOptions.saveSettings()

novelwriter/gui/projtree.py

@@ -6,9 +6,10 @@ File History:
 Created: 2018-09-29 [0.0.1]  GuiProjectTree
 Created: 2022-06-06 [2.0rc1] GuiProjectView
 Created: 2022-06-06 [2.0rc1] GuiProjectToolBar
+Created: 2023-11-22 [2.2rc1] _TreeContextMenu
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -40,6 +41,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter import CONFIG, SHARED
+from novelwriter.enum import nwDocMode, nwItemType, nwItemClass, nwItemLayout
 from novelwriter.common import minmax
 from novelwriter.constants import nwHeaders, nwUnicode, trConst, nwLabels
 from novelwriter.core.item import NWItem
@@ -48,9 +50,6 @@ from novelwriter.dialogs.docmerge import GuiDocMerge
 from novelwriter.dialogs.docsplit import GuiDocSplit
 from novelwriter.dialogs.editlabel import GuiEditLabel
 from novelwriter.dialogs.projsettings import GuiProjectSettings
-from novelwriter.enum import (
-    nwDocMode, nwItemType, nwItemClass, nwItemLayout, nwWidget
-)
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -681,7 +680,7 @@ class GuiProjectTree(QTreeWidget):
 
         # Add the new item to the project tree
         self.revealNewTreeItem(tHandle, nHandle=nHandle, wordCount=True)
-        self.mainGui.switchFocus(nwWidget.TREE)
+        self.projView.setTreeFocus()  # See issue #1376
 
         return True
 
@@ -1650,7 +1649,7 @@ class _TreeContextMenu(QMenu):
 
         return
 
-    def __del__(self):  # pragma: no cover
+    def __del__(self) -> None:  # pragma: no cover
         logger.debug("Delete: _TreeContextMenu")
         return
 

novelwriter/gui/sidebar.py

@@ -3,10 +3,10 @@ novelWriter – GUI Main Window SideBar
 =====================================
 
 File History:
-Created: 2022-05-10 [2.0rc1]
+Created: 2022-05-10 [2.0rc1] GuiSideBar
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,12 +27,13 @@ import logging
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtCore import QEvent, QPoint, Qt, QSize, pyqtSignal
 from PyQt5.QtGui import QPalette
+from PyQt5.QtCore import QEvent, QPoint, Qt, QSize, pyqtSignal
 from PyQt5.QtWidgets import QMenu, QToolButton, QVBoxLayout, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.enum import nwView
+from novelwriter.extensions.eventfilters import StatusTipFilter
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -54,6 +55,7 @@ class GuiSideBar(QWidget):
         iPx = CONFIG.pxInt(24)
         iconSize = QSize(iPx, iPx)
         self.setContentsMargins(0, 0, 0, 0)
+        self.installEventFilter(StatusTipFilter(mainGui))
 
         # Buttons
         self.tbProject = QToolButton(self)
@@ -162,7 +164,7 @@ class GuiSideBar(QWidget):
 
 class _PopRightMenu(QMenu):
 
-    def event(self, event: QEvent):
+    def event(self, event: QEvent) -> bool:
         """Overload the show event and move the menu popup location."""
         if event.type() == QEvent.Show:
             parent = self.parent()

novelwriter/gui/statusbar.py

@@ -3,10 +3,10 @@ novelWriter – GUI Main Window Status Bar
 ========================================
 
 File History:
-Created: 2019-04-20 [0.0.1]
+Created: 2019-04-20 [0.0.1] GuiMainStatus
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,9 +27,10 @@ import logging
 
 from time import time
 from typing import TYPE_CHECKING, Literal
+from datetime import datetime
 
-from PyQt5.QtCore import pyqtSlot, QLocale
 from PyQt5.QtGui import QColor
+from PyQt5.QtCore import pyqtSlot, QLocale
 from PyQt5.QtWidgets import qApp, QStatusBar, QLabel
 
 from novelwriter import CONFIG, SHARED
@@ -50,8 +51,9 @@ class GuiMainStatus(QStatusBar):
 
         logger.debug("Create: GuiMainStatus")
 
-        self._refTime  = -1.0
+        self._refTime = -1.0
         self._userIdle = False
+        self._debugInfo = False
 
         colNone = QColor(*SHARED.theme.statNone)
         colSaved = QColor(*SHARED.theme.statSaved)
@@ -223,4 +225,45 @@ class GuiMainStatus(QStatusBar):
         self.setDocumentStatus(StatusLED.S_BAD if status else StatusLED.S_GOOD)
         return
 
+    ##
+    #  Debug
+    ##
+
+    def memInfo(self) -> None:  # pragma: no cover
+        """Display memory info on the status bar. This is used to
+        investigate memory usage and Qt widgets that get left in memory.
+        Enabled by the --meminfo command line flag.
+
+        By default, this tracks memory usage diff after launch. To track
+        full memory usage, set environment variable PYTHONTRACEMALLOC=1
+        before starting novelWriter.
+        """
+        import tracemalloc
+        from collections import Counter
+
+        widgets = qApp.allWidgets()
+        if not self._debugInfo:
+            if tracemalloc.is_tracing():
+                self._traceMallocRef = "Total"
+            else:
+                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()
+        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)
+        return
+
 # END Class GuiMainStatus

novelwriter/gui/theme.py

@@ -7,7 +7,7 @@ Created: 2019-05-18 [0.1.3] GuiTheme
 Created: 2019-11-08 [0.4]   GuiIcons
 
 This file is a part of novelWriter
-Copyright 2018–2023, Veronica Berglyd Olsen
+Copyright 2018–2024, Veronica Berglyd Olsen
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -460,8 +460,8 @@ class GuiIcons:
         "search_regex", "search_word",
 
         # Format Icons
-        "fmt_bold", "fmt_italic", "fmt_mode-md", "fmt_mode-sc", "fmt_strike", "fmt_subscript",
-        "fmt_superscript", "fmt_underline",
+        "fmt_bold", "fmt_bold-md", "fmt_italic", "fmt_italic-md", "fmt_strike", "fmt_strike-md",
+        "fmt_subscript", "fmt_superscript", "fmt_underline",
 
         # General Button Icons
         "add", "backward", "bookmark", "browse", "checked", "close", "cross", "down", "edit",
@@ -479,9 +479,8 @@ class GuiIcons:
     }
 
     TOGGLE_ICON_KEYS = {
-        "sticky":   ("sticky-on", "sticky-off"),
-        "bullet":   ("bullet-on", "bullet-off"),
-        "fmt_mode": ("fmt_mode-sc", "fmt_mode-md"),
+        "sticky": ("sticky-on", "sticky-off"),
+        "bullet": ("bullet-on", "bullet-off"),
     }
 
     IMAGE_MAP = {