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

novelwriter/gui/projtree.py

@@ -34,9 +34,8 @@ from time import time
 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, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
-    QWidget
+    QAbstractItemView, QAction, QFrame, QHBoxLayout, QHeaderView, QLabel,
+    QMenu, QShortcut, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -167,6 +166,7 @@ class GuiProjectView(QWidget):
 
     def openProjectTasks(self) -> None:
         """Run open project tasks."""
+        self.populateTree()
         self.projBar.buildQuickLinksMenu()
         self.projBar.setEnabled(True)
         return
@@ -214,7 +214,8 @@ class GuiProjectView(QWidget):
     @pyqtSlot(str)
     def updateItemValues(self, tHandle: str) -> None:
         """Update tree item."""
-        self.projTree.setTreeItemValues(tHandle)
+        if nwItem := SHARED.project.tree[tHandle]:
+            self.projTree.setTreeItemValues(nwItem)
         return
 
     @pyqtSlot(str)
@@ -243,6 +244,12 @@ class GuiProjectView(QWidget):
         self.projTree.createNewNote(tag, itemClass)
         return
 
+    @pyqtSlot(str)
+    def refreshUserLabels(self, kind: str) -> None:
+        """Refresh status or importance labels."""
+        self.projTree.refreshUserLabels(kind)
+        return
+
 
 class GuiProjectToolBar(QWidget):
 
@@ -793,11 +800,11 @@ class GuiProjectTree(QTreeWidget):
 
     def renameTreeItem(self, tHandle: str, name: str = "") -> None:
         """Open a dialog to edit the label of an item."""
-        if tItem := SHARED.project.tree[tHandle]:
-            newLabel, dlgOk = GuiEditLabel.getLabel(self, text=name or tItem.itemName)
+        if nwItem := SHARED.project.tree[tHandle]:
+            newLabel, dlgOk = GuiEditLabel.getLabel(self, text=name or nwItem.itemName)
             if dlgOk:
-                tItem.setName(newLabel)
-                self.setTreeItemValues(tHandle)
+                nwItem.setName(newLabel)
+                self.setTreeItemValues(nwItem)
                 self._alertTreeChange(tHandle, flush=False)
         return
 
@@ -998,7 +1005,7 @@ class GuiProjectTree(QTreeWidget):
             trItemP.takeChild(tIndex)
 
             for dHandle in reversed(self.getTreeFromHandle(tHandle)):
-                SHARED.closeDocument(dHandle)
+                SHARED.closeEditor(dHandle)
                 SHARED.project.removeItem(dHandle)
                 self._treeMap.pop(dHandle, None)
 
@@ -1011,44 +1018,52 @@ class GuiProjectTree(QTreeWidget):
 
         return True
 
-    def setTreeItemValues(self, tHandle: str) -> None:
-        """Set the name and flag values for a tree item from a handle in
-        the project tree. Does not trigger a tree change as the data is
-        already coming from the project tree.
+    def refreshUserLabels(self, kind: str) -> None:
+        """Refresh status or importance labels."""
+        if kind == "s":
+            for nwItem in SHARED.project.tree:
+                if nwItem.isNovelLike():
+                    self.setTreeItemValues(nwItem)
+        elif kind == "i":
+            for nwItem in SHARED.project.tree:
+                if not nwItem.isNovelLike():
+                    self.setTreeItemValues(nwItem)
+        return
+
+    def setTreeItemValues(self, nwItem: NWItem | None) -> None:
+        """Set the name and flag values for a tree item in the project
+        tree. Does not trigger a tree change as the data is already
+        coming from project data.
         """
-        trItem = self._getTreeItem(tHandle)
-        nwItem = SHARED.project.tree[tHandle]
-        if trItem is None or nwItem is None:
-            return
-
-        itemStatus, statusIcon = nwItem.getImportStatus()
-        hLevel = nwItem.mainHeading
-        itemIcon = SHARED.theme.getItemIcon(
-            nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
-        )
+        if isinstance(nwItem, NWItem) and (trItem := self._getTreeItem(nwItem.itemHandle)):
+            itemStatus, statusIcon = nwItem.getImportStatus()
+            hLevel = nwItem.mainHeading
+            itemIcon = SHARED.theme.getItemIcon(
+                nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, hLevel
+            )
 
-        trItem.setIcon(self.C_NAME, itemIcon)
-        trItem.setText(self.C_NAME, nwItem.itemName)
-        trItem.setIcon(self.C_STATUS, statusIcon)
-        trItem.setToolTip(self.C_STATUS, itemStatus)
+            trItem.setIcon(self.C_NAME, itemIcon)
+            trItem.setText(self.C_NAME, nwItem.itemName)
+            trItem.setIcon(self.C_STATUS, statusIcon)
+            trItem.setToolTip(self.C_STATUS, itemStatus)
 
-        if nwItem.isFileType():
-            iconName = "checked" if nwItem.isActive else "unchecked"
-            toolTip = self.trActive if nwItem.isActive else self.trInactive
-            trItem.setToolTip(self.C_ACTIVE, toolTip)
-        else:
-            iconName = "noncheckable"
+            if nwItem.isFileType():
+                iconName = "checked" if nwItem.isActive else "unchecked"
+                toolTip = self.trActive if nwItem.isActive else self.trInactive
+                trItem.setToolTip(self.C_ACTIVE, toolTip)
+            else:
+                iconName = "noncheckable"
 
-        trItem.setIcon(self.C_ACTIVE, SHARED.theme.getIcon(iconName))
+            trItem.setIcon(self.C_ACTIVE, SHARED.theme.getIcon(iconName))
 
-        if CONFIG.emphLabels and nwItem.isDocumentLayout():
-            trFont = trItem.font(self.C_NAME)
-            trFont.setBold(hLevel == "H1" or hLevel == "H2")
-            trFont.setUnderline(hLevel == "H1")
-            trItem.setFont(self.C_NAME, trFont)
+            if CONFIG.emphLabels and nwItem.isDocumentLayout():
+                trFont = trItem.font(self.C_NAME)
+                trFont.setBold(hLevel == "H1" or hLevel == "H2")
+                trFont.setUnderline(hLevel == "H1")
+                trItem.setFont(self.C_NAME, trFont)
 
-        # Emit Refresh Signal
-        self.itemRefreshed.emit(tHandle, nwItem, itemIcon)
+            # Emit Refresh Signal
+            self.itemRefreshed.emit(nwItem.itemHandle, nwItem, itemIcon)
 
         return
 
@@ -1354,7 +1369,8 @@ class GuiProjectTree(QTreeWidget):
                 SHARED.project.index.deleteHandle(mHandle)
             else:
                 SHARED.project.index.reIndexHandle(mHandle)
-            self.setTreeItemValues(mHandle)
+            if mItem := SHARED.project.tree[mHandle]:
+                self.setTreeItemValues(mItem)
 
         # Update word count
         self.propagateCount(tHandle, nwItemS.wordCount, countChildren=True)
@@ -1397,19 +1413,15 @@ class GuiProjectTree(QTreeWidget):
         if not newFile:
             itemList.remove(tHandle)
 
-        dlgMerge = GuiDocMerge(SHARED.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
-            SHARED.saveDocument()
+            SHARED.saveEditor()
 
             # Create merge object, and append docs
             docMerger = DocMerger(SHARED.project)
@@ -1424,7 +1436,7 @@ class GuiProjectTree(QTreeWidget):
             else:
                 return False
 
-            for sHandle in mrgList:
+            for sHandle in items:
                 docMerger.appendText(sHandle, True, mLabel)
 
             if not docMerger.writeTargetDoc():
@@ -1441,8 +1453,8 @@ class GuiProjectTree(QTreeWidget):
             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)
@@ -1468,16 +1480,11 @@ class GuiProjectTree(QTreeWidget):
             logger.error("Only valid document items can be split")
             return False
 
-        dlgSplit = GuiDocSplit(SHARED.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:
@@ -1487,7 +1494,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)
@@ -1498,7 +1505,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()
@@ -1604,7 +1611,7 @@ class GuiProjectTree(QTreeWidget):
 
         self._treeMap[tHandle] = newItem
         self.propagateCount(tHandle, nwItem.wordCount, countChildren=True)
-        self.setTreeItemValues(tHandle)
+        self.setTreeItemValues(nwItem)
         newItem.setExpanded(nwItem.isExpanded)
 
         return newItem
@@ -1815,6 +1822,7 @@ class _TreeContextMenu(QMenu):
 
     def _itemHeader(self) -> None:
         """Check if there is a header that can be used for rename."""
+        SHARED.saveEditor()
         if hItem := SHARED.project.index.getItemHeading(self._handle, "T0001"):
             action = self.addAction(self.tr("Rename to Heading"))
             action.triggered.connect(
@@ -1980,7 +1988,7 @@ class _TreeContextMenu(QMenu):
     def _toggleItemActive(self) -> None:
         """Toggle the active status of an item."""
         self._item.setActive(not self._item.isActive)
-        self.projTree.setTreeItemValues(self._handle)
+        self.projTree.setTreeItemValues(self._item)
         self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -1993,14 +2001,14 @@ class _TreeContextMenu(QMenu):
         for tItem in self._items:
             if tItem and tItem.isFileType():
                 tItem.setActive(isActive)
-                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree.setTreeItemValues(tItem)
                 self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemStatus(self, key: str) -> None:
         """Set a new status value of an item."""
         self._item.setStatus(key)
-        self.projTree.setTreeItemValues(self._handle)
+        self.projTree.setTreeItemValues(self._item)
         self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -2009,14 +2017,14 @@ class _TreeContextMenu(QMenu):
         for tItem in self._items:
             if tItem and tItem.isNovelLike():
                 tItem.setStatus(key)
-                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree.setTreeItemValues(tItem)
                 self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemImport(self, key: str) -> None:
         """Set a new importance value of an item."""
         self._item.setImport(key)
-        self.projTree.setTreeItemValues(self._handle)
+        self.projTree.setTreeItemValues(self._item)
         self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -2025,7 +2033,7 @@ class _TreeContextMenu(QMenu):
         for tItem in self._items:
             if tItem and not tItem.isNovelLike():
                 tItem.setImport(key)
-                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree.setTreeItemValues(tItem)
                 self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
@@ -2033,11 +2041,11 @@ class _TreeContextMenu(QMenu):
         """Set a new item layout value of an item."""
         if itemLayout == nwItemLayout.DOCUMENT and self._item.documentAllowed():
             self._item.setLayout(nwItemLayout.DOCUMENT)
-            self.projTree.setTreeItemValues(self._handle)
+            self.projTree.setTreeItemValues(self._item)
             self.projTree._alertTreeChange(self._handle, flush=False)
         elif itemLayout == nwItemLayout.NOTE:
             self._item.setLayout(nwItemLayout.NOTE)
-            self.projTree.setTreeItemValues(self._handle)
+            self.projTree.setTreeItemValues(self._item)
             self.projTree._alertTreeChange(self._handle, flush=False)
         return
 
@@ -2051,12 +2059,12 @@ class _TreeContextMenu(QMenu):
             if msgYes and itemLayout == nwItemLayout.DOCUMENT and self._item.documentAllowed():
                 self._item.setType(nwItemType.FILE)
                 self._item.setLayout(nwItemLayout.DOCUMENT)
-                self.projTree.setTreeItemValues(self._handle)
+                self.projTree.setTreeItemValues(self._item)
                 self.projTree._alertTreeChange(self._handle, flush=False)
             elif msgYes and itemLayout == nwItemLayout.NOTE:
                 self._item.setType(nwItemType.FILE)
                 self._item.setLayout(nwItemLayout.NOTE)
-                self.projTree.setTreeItemValues(self._handle)
+                self.projTree.setTreeItemValues(self._item)
                 self.projTree._alertTreeChange(self._handle, flush=False)
             else:
                 logger.info("Folder conversion cancelled")

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.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
 
     ##

novelwriter/gui/statusbar.py

@@ -27,7 +27,6 @@ import logging
 
 from datetime import datetime
 from time import time
-from typing import Literal
 
 from PyQt5.QtCore import QLocale, pyqtSlot
 from PyQt5.QtWidgets import QApplication, QLabel, QStatusBar, QWidget
@@ -35,6 +34,7 @@ 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
 
 logger = logging.getLogger(__name__)
@@ -51,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
@@ -71,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)
@@ -79,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)
@@ -120,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
 
@@ -133,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
 
     ##
@@ -144,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
@@ -212,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
 
     ##
@@ -236,9 +239,7 @@ class GuiMainStatus(QStatusBar):
         """
         import tracemalloc
 
-        from collections import Counter
-
-        widgets = QApplication.allWidgets()
+        count = len(QApplication.allWidgets())
         if not self._debugInfo:
             if tracemalloc.is_tracing():
                 self._traceMallocRef = "Total"
@@ -246,19 +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

novelwriter/gui/theme.py

@@ -75,6 +75,7 @@ class GuiTheme:
         self.statUnsaved = QColor(0, 0, 0)
         self.statSaved   = QColor(0, 0, 0)
         self.helpText    = QColor(0, 0, 0)
+        self.fadedText   = QColor(0, 0, 0)
         self.errorText   = QColor(255, 0, 0)
 
         # Loaded Syntax Settings
@@ -263,6 +264,7 @@ class GuiTheme:
         sec = "GUI"
         if parser.has_section(sec):
             self.helpText    = self._parseColour(parser, sec, "helptext")
+            self.fadedText   = self._parseColour(parser, sec, "fadedtext")
             self.errorText   = self._parseColour(parser, sec, "errortext")
             self.statNone    = self._parseColour(parser, sec, "statusnone")
             self.statUnsaved = self._parseColour(parser, sec, "statusunsaved")
@@ -405,6 +407,7 @@ class GuiTheme:
         self.statUnsaved = QColor(200, 15, 39)
         self.statSaved   = QColor(2, 133, 37)
         self.helpText    = QColor(0, 0, 0)
+        self.fadedText   = QColor(128, 128, 128)
         self.errorText   = QColor(255, 0, 0)
         return