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

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)
@@ -67,7 +69,7 @@ class GuiSideBar(QWidget):
         self.tbNovel.clicked.connect(lambda: self.viewChangeRequested.emit(nwView.NOVEL))
 
         self.tbOutline = QToolButton(self)
-        self.tbOutline.setToolTip(f"{0} [Ctrl+Shift+T]".format(self.tr("Novel Outline View")))
+        self.tbOutline.setToolTip("{0} [Ctrl+Shift+T]".format(self.tr("Novel Outline View")))
         self.tbOutline.setIconSize(iconSize)
         self.tbOutline.clicked.connect(lambda: self.viewChangeRequested.emit(nwView.OUTLINE))
 
@@ -111,7 +113,7 @@ class GuiSideBar(QWidget):
         self.outerBox.addWidget(self.tbDetails)
         self.outerBox.addWidget(self.tbStats)
         self.outerBox.addWidget(self.tbSettings)
-        self.outerBox.setContentsMargins(0, 0, CONFIG.pxInt(2), 0)
+        self.outerBox.setContentsMargins(0, 0, 0, 0)
         self.outerBox.setSpacing(CONFIG.pxInt(4))
 
         self.setLayout(self.outerBox)
@@ -131,7 +133,7 @@ class GuiSideBar(QWidget):
         buttonStyle = (
             "QToolButton {{padding: {0}px; border: none; background: transparent;}} "
             "QToolButton:hover {{border: none; background: rgba({1},{2},{3},0.2);}}"
-        ).format(CONFIG.pxInt(4), fadeCol.red(), fadeCol.green(), fadeCol.blue())
+        ).format(CONFIG.pxInt(6), fadeCol.red(), fadeCol.green(), fadeCol.blue())
         buttonStyleMenu = f"{buttonStyle} QToolButton::menu-indicator {{image: none;}}"
 
         self.tbProject.setIcon(SHARED.theme.getIcon("view_editor"))
@@ -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)
@@ -97,7 +99,7 @@ class GuiMainStatus(QStatusBar):
         self.addPermanentWidget(self.statsText)
 
         # The Session Clock
-        # Set the mimimum width so the label doesn't rescale every second
+        # Set the minimum width so the label doesn't rescale every second
         self.timeIcon = QLabel()
         self.timeText = QLabel("")
         self.timeText.setToolTip(self.tr("Session Time"))
@@ -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
@@ -133,6 +133,7 @@ class GuiTheme:
         self.getToggleIcon = self.iconCache.getToggleIcon
         self.loadDecoration = self.iconCache.loadDecoration
         self.getHeaderDecoration = self.iconCache.getHeaderDecoration
+        self.getHeaderDecorationNarrow = self.iconCache.getHeaderDecorationNarrow
 
         # Extract Other Info
         self.guiDPI = qApp.primaryScreen().logicalDotsPerInchX()
@@ -459,13 +460,13 @@ 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",
-        "export", "forward", "maximise", "menu", "minimise", "noncheckable", "reference",
-        "refresh", "remove", "revert", "search_replace", "search", "settings", "unchecked", "up",
+        "export", "forward", "maximise", "menu", "minimise", "noncheckable", "panel", "refresh",
+        "remove", "revert", "search_replace", "search", "settings", "unchecked", "up", "view",
 
         # Switches
         "sticky-on", "sticky-off",
@@ -473,12 +474,13 @@ class GuiIcons:
 
         # Decorations
         "deco_doc_h0", "deco_doc_h1", "deco_doc_h2", "deco_doc_h3", "deco_doc_h4", "deco_doc_more",
+        "deco_doc_h0_n", "deco_doc_h1_n", "deco_doc_h2_n", "deco_doc_h3_n", "deco_doc_h4_n",
+        "deco_doc_nt_n",
     }
 
     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 = {
@@ -493,6 +495,7 @@ class GuiIcons:
         self._qIcons: dict[str, QIcon] = {}
         self._themeMap: dict[str, Path] = {}
         self._headerDec: list[QPixmap] = []
+        self._headerDecNarrow: list[QPixmap] = []
 
         # Icon Theme Path
         self._confName = "icons.conf"
@@ -580,6 +583,7 @@ class GuiIcons:
             self._qIcons[iconKey] = qIcon
 
         self._headerDec = []
+        self._headerDecNarrow = []
 
         return True
 
@@ -680,6 +684,20 @@ class GuiIcons:
             ]
         return self._headerDec[minmax(hLevel, 0, 4)]
 
+    def getHeaderDecorationNarrow(self, hLevel: int) -> QPixmap:
+        """Get the narrow decoration for a specific header level."""
+        if not self._headerDecNarrow:
+            iPx = self.mainTheme.baseIconSize
+            self._headerDecNarrow = [
+                self.loadDecoration("deco_doc_h0_n", h=iPx),
+                self.loadDecoration("deco_doc_h1_n", h=iPx),
+                self.loadDecoration("deco_doc_h2_n", h=iPx),
+                self.loadDecoration("deco_doc_h3_n", h=iPx),
+                self.loadDecoration("deco_doc_h4_n", h=iPx),
+                self.loadDecoration("deco_doc_nt_n", h=iPx),
+            ]
+        return self._headerDecNarrow[minmax(hLevel, 0, 5)]
+
     ##
     #  Internal Functions
     ##