novelWriter 2.3rc1__py3-none-any.whl → 2.4b1__py3-none-any.whl

novelwriter/gui/projtree.py

@@ -38,20 +38,22 @@ from PyQt5.QtGui import (
 from PyQt5.QtCore import QPoint, QTimer, Qt, QSize, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QAction, QDialog, QFrame, QHBoxLayout, QHeaderView,
-    QLabel, QMenu, QShortcut, QSizePolicy, QToolButton, QTreeWidget,
-    QTreeWidgetItem, QVBoxLayout, QWidget
+    QLabel, QMenu, QShortcut, QSizePolicy, QTreeWidget, QTreeWidgetItem,
+    QVBoxLayout, QWidget
 )
 
 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
 from novelwriter.core.coretools import DocDuplicator, DocMerger, DocSplitter
+from novelwriter.core.item import NWItem
 from novelwriter.dialogs.docmerge import GuiDocMerge
 from novelwriter.dialogs.docsplit import GuiDocSplit
 from novelwriter.dialogs.editlabel import GuiEditLabel
 from novelwriter.dialogs.projectsettings import GuiProjectSettings
+from novelwriter.enum import nwDocMode, nwItemType, nwItemClass, nwItemLayout
+from novelwriter.extensions.modified import NIconToolButton
+from novelwriter.gui.theme import STYLES_MIN_TOOLBUTTON
 
 if TYPE_CHECKING:  # pragma: no cover
     from novelwriter.guimain import GuiMain
@@ -142,7 +144,6 @@ class GuiProjectView(QWidget):
         self.requestDeleteItem = self.projTree.requestDeleteItem
         self.getSelectedHandle = self.projTree.getSelectedHandle
         self.changedSince = self.projTree.changedSince
-        self.createNewNote = self.projTree.createNewNote
 
         return
 
@@ -240,6 +241,12 @@ class GuiProjectView(QWidget):
         self.projBar.buildQuickLinksMenu()
         return
 
+    @pyqtSlot(str, nwItemClass)
+    def createNewNote(self, tag: str, itemClass: nwItemClass) -> None:
+        """Process new not request."""
+        self.projTree.createNewNote(tag, itemClass)
+        return
+
 # END Class GuiProjectView
 
 
@@ -263,29 +270,26 @@ class GuiProjectToolBar(QWidget):
         self.setAutoFillBackground(True)
 
         # Widget Label
-        self.viewLabel = QLabel("<b>%s</b>" % self.tr("Project Content"))
+        self.viewLabel = QLabel(self.tr("Project Content"))
+        self.viewLabel.setFont(SHARED.theme.guiFontB)
         self.viewLabel.setContentsMargins(0, 0, 0, 0)
         self.viewLabel.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
 
         # Quick Links
         self.mQuick = QMenu(self)
 
-        self.tbQuick = QToolButton(self)
+        self.tbQuick = NIconToolButton(self, iPx)
         self.tbQuick.setToolTip("%s [Ctrl+L]" % self.tr("Quick Links"))
         self.tbQuick.setShortcut("Ctrl+L")
-        self.tbQuick.setIconSize(QSize(iPx, iPx))
         self.tbQuick.setMenu(self.mQuick)
-        self.tbQuick.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         # Move Buttons
-        self.tbMoveU = QToolButton(self)
+        self.tbMoveU = NIconToolButton(self, iPx)
         self.tbMoveU.setToolTip("%s [Ctrl+Up]" % self.tr("Move Up"))
-        self.tbMoveU.setIconSize(QSize(iPx, iPx))
         self.tbMoveU.clicked.connect(lambda: self.projTree.moveTreeItem(-1))
 
-        self.tbMoveD = QToolButton(self)
+        self.tbMoveD = NIconToolButton(self, iPx)
         self.tbMoveD.setToolTip("%s [Ctrl+Down]" % self.tr("Move Down"))
-        self.tbMoveD.setIconSize(QSize(iPx, iPx))
         self.tbMoveD.clicked.connect(lambda: self.projTree.moveTreeItem(1))
 
         # Add Item Menu
@@ -324,12 +328,10 @@ class GuiProjectToolBar(QWidget):
         self.mAddRoot = self.mAdd.addMenu(trConst(nwLabels.ITEM_DESCRIPTION["root"]))
         self._buildRootMenu()
 
-        self.tbAdd = QToolButton(self)
+        self.tbAdd = NIconToolButton(self, iPx)
         self.tbAdd.setToolTip("%s [Ctrl+N]" % self.tr("Add Item"))
         self.tbAdd.setShortcut("Ctrl+N")
-        self.tbAdd.setIconSize(QSize(iPx, iPx))
         self.tbAdd.setMenu(self.mAdd)
-        self.tbAdd.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         # More Options Menu
         self.mMore = QMenu(self)
@@ -343,11 +345,9 @@ class GuiProjectToolBar(QWidget):
         self.aEmptyTrash = self.mMore.addAction(self.tr("Empty Trash"))
         self.aEmptyTrash.triggered.connect(lambda: self.projTree.emptyTrash())
 
-        self.tbMore = QToolButton(self)
+        self.tbMore = NIconToolButton(self, iPx)
         self.tbMore.setToolTip(self.tr("More Options"))
-        self.tbMore.setIconSize(QSize(iPx, iPx))
         self.tbMore.setMenu(self.mMore)
-        self.tbMore.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         # Assemble
         self.outerBox = QHBoxLayout()
@@ -377,18 +377,12 @@ class GuiProjectToolBar(QWidget):
         qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base())
         self.setPalette(qPalette)
 
-        fadeCol = qPalette.text().color()
-        buttonStyle = (
-            "QToolButton {{padding: {0}px; border: none; background: transparent;}} "
-            "QToolButton:hover {{border: none; background: rgba({1},{2},{3},0.2);}}"
-        ).format(CONFIG.pxInt(2), fadeCol.red(), fadeCol.green(), fadeCol.blue())
-        buttonStyleMenu = f"{buttonStyle} QToolButton::menu-indicator {{image: none;}}"
-
-        self.tbQuick.setStyleSheet(buttonStyleMenu)
+        buttonStyle = SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON)
+        self.tbQuick.setStyleSheet(buttonStyle)
         self.tbMoveU.setStyleSheet(buttonStyle)
         self.tbMoveD.setStyleSheet(buttonStyle)
-        self.tbAdd.setStyleSheet(buttonStyleMenu)
-        self.tbMore.setStyleSheet(buttonStyleMenu)
+        self.tbAdd.setStyleSheet(buttonStyle)
+        self.tbMore.setStyleSheet(buttonStyle)
 
         self.tbQuick.setIcon(SHARED.theme.getIcon("bookmark"))
         self.tbMoveU.setIcon(SHARED.theme.getIcon("up"))
@@ -505,10 +499,15 @@ class GuiProjectTree(QTreeWidget):
         self.mainGui  = projView.mainGui
 
         # Internal Variables
-        self._treeMap = {}
+        self._treeMap: dict[str, QTreeWidgetItem] = {}
         self._timeChanged = 0.0
         self._popAlert = None
 
+        # Cached Translations
+        self.trActive = self.tr("Active")
+        self.trInactive = self.tr("Inactive")
+        self.trPermDelete = self.tr("Permanently delete {0} file(s) from Trash?")
+
         # Build GUI
         # =========
 
@@ -555,10 +554,6 @@ class GuiProjectTree(QTreeWidget):
         trRoot = self.invisibleRootItem()
         trRoot.setFlags(trRoot.flags() ^ Qt.ItemFlag.ItemIsDropEnabled)
 
-        # Cached values
-        self._lblActive = self.tr("Active")
-        self._lblInactive = self.tr("Inactive")
-
         # Set selection options
         self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
         self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
@@ -605,18 +600,18 @@ class GuiProjectTree(QTreeWidget):
         self._timeChanged = 0.0
         return
 
-    def createNewNote(self, tag: str, itemClass: nwItemClass | None) -> bool:
+    def createNewNote(self, tag: str, itemClass: nwItemClass) -> None:
         """Create a new note. This function is used by the document
         editor to create note files for unknown tags.
         """
-        rHandle = SHARED.project.tree.findRoot(itemClass)
-        if rHandle:
-            tHandle = SHARED.project.newFile(tag, rHandle)
-            if tHandle:
+        if itemClass != nwItemClass.NO_CLASS:
+            if not (rHandle := SHARED.project.tree.findRoot(itemClass)):
+                self.newTreeItem(nwItemType.ROOT, itemClass)
+                rHandle = SHARED.project.tree.findRoot(itemClass)
+            if rHandle and (tHandle := SHARED.project.newFile(tag, rHandle)):
                 SHARED.project.writeNewFile(tHandle, 1, False, f"@tag: {tag}\n\n")
                 self.revealNewTreeItem(tHandle, wordCount=True)
-                return True
-        return False
+        return
 
     def newTreeItem(self, itemType: nwItemType, itemClass: nwItemClass | None = None,
                     hLevel: int = 1, isNote: bool = False, copyDoc: str | None = None) -> bool:
@@ -902,10 +897,7 @@ class GuiProjectTree(QTreeWidget):
             SHARED.info(self.tr("The Trash folder is already empty."))
             return False
 
-        msgYes = SHARED.question(
-            self.tr("Permanently delete {0} file(s) from Trash?").format(nTrash)
-        )
-        if not msgYes:
+        if not SHARED.question(self.trPermDelete.format(nTrash)):
             logger.info("Action cancelled by user")
             return False
 
@@ -1052,7 +1044,7 @@ class GuiProjectTree(QTreeWidget):
 
         if nwItem.isFileType():
             iconName = "checked" if nwItem.isActive else "unchecked"
-            toolTip = self._lblActive if nwItem.isActive else self._lblInactive
+            toolTip = self.trActive if nwItem.isActive else self.trInactive
             trItem.setToolTip(self.C_ACTIVE, toolTip)
         else:
             iconName = "noncheckable"
@@ -1129,9 +1121,8 @@ class GuiProjectTree(QTreeWidget):
         """Get the currently selected handle. If multiple items are
         selected, return the first.
         """
-        selItem = self.selectedItems()
-        if selItem:
-            return selItem[0].data(self.C_DATA, self.D_HANDLE)
+        if items := self.selectedItems():
+            return items[0].data(self.C_DATA, self.D_HANDLE)
         return None
 
     def setSelectedHandle(self, tHandle: str | None, doScroll: bool = False) -> bool:
@@ -1143,9 +1134,8 @@ class GuiProjectTree(QTreeWidget):
         if tHandle in self._treeMap:
             self.setCurrentItem(self._treeMap[tHandle])
 
-        selIndex = self.selectedIndexes()
-        if selIndex and doScroll:
-            self.scrollTo(selIndex[0], QAbstractItemView.ScrollHint.PositionAtCenter)
+        if (indexes := self.selectedIndexes()) and doScroll:
+            self.scrollTo(indexes[0], QAbstractItemView.ScrollHint.PositionAtCenter)
 
         return True
 
@@ -1160,10 +1150,8 @@ class GuiProjectTree(QTreeWidget):
 
     def openContextOnSelected(self) -> bool:
         """Open the context menu on the current selected item."""
-        selItem = self.selectedItems()
-        if selItem:
-            pos = self.visualItemRect(selItem[0]).center()
-            return self._openContextMenu(pos)
+        if items := self.selectedItems():
+            return self._openContextMenu(self.visualItemRect(items[0]).center())
         return False
 
     def changedSince(self, checkTime: float) -> bool:
@@ -1746,7 +1734,7 @@ class _TreeContextMenu(QMenu):
 
         self._item = nwItem
         self._handle = nwItem.itemHandle
-        self._items: list[str] = []
+        self._items: list[NWItem] = []
 
         logger.debug("Ready: _TreeContextMenu")
 
@@ -1799,13 +1787,17 @@ class _TreeContextMenu(QMenu):
 
         return
 
-    def buildMultiSelectMenu(self, items: list[str]) -> None:
+    def buildMultiSelectMenu(self, handles: list[str]) -> None:
         """Build the multi-select menu."""
-        self._items = items
+        self._items = []
+        for tHandle in handles:
+            if (tItem := SHARED.project.tree[tHandle]):
+                self._items.append(tItem)
+
         self._itemActive(True)
         self._itemStatusImport(True)
         self.addSeparator()
-        self._moveToTrash(True)
+        self._multiMoveToTrash()
         return
 
     ##
@@ -1836,7 +1828,7 @@ class _TreeContextMenu(QMenu):
 
     def _itemHeader(self) -> None:
         """Check if there is a header that can be used for rename."""
-        if hItem := SHARED.project.index.getItemHeader(self._handle, "T0001"):
+        if hItem := SHARED.project.index.getItemHeading(self._handle, "T0001"):
             action = self.addAction(self.tr("Rename to Heading"))
             action.triggered.connect(
                 lambda: self.projTree.renameTreeItem(self._handle, hItem.title)
@@ -1847,9 +1839,9 @@ class _TreeContextMenu(QMenu):
         """Add Active/Inactive actions."""
         if multi:
             mSub = self.addMenu(self.tr("Set Active to ..."))
-            aOne = mSub.addAction(SHARED.theme.getIcon("checked"), self.tr("Active"))
+            aOne = mSub.addAction(SHARED.theme.getIcon("checked"), self.projTree.trActive)
             aOne.triggered.connect(lambda: self._iterItemActive(True))
-            aTwo = mSub.addAction(SHARED.theme.getIcon("unchecked"), self.tr("Inactive"))
+            aTwo = mSub.addAction(SHARED.theme.getIcon("unchecked"), self.projTree.trInactive)
             aTwo.triggered.connect(lambda: self._iterItemActive(False))
         else:
             action = self.addAction(self.tr("Toggle Active"))
@@ -1935,7 +1927,7 @@ class _TreeContextMenu(QMenu):
             action.triggered.connect(lambda: tree._mergeDocuments(tHandle, True))
 
         if isFile:
-            action = menu.addAction(self.tr("Split Document by Headers"))
+            action = menu.addAction(self.tr("Split Document by Headings"))
             action.triggered.connect(lambda: tree._splitDocument(tHandle))
 
         return
@@ -1949,11 +1941,9 @@ class _TreeContextMenu(QMenu):
             action.triggered.connect(lambda: tree.setExpandedFromHandle(tHandle, True))
             action = self.addAction(self.tr("Collapse All"))
             action.triggered.connect(lambda: tree.setExpandedFromHandle(tHandle, False))
-            action = self.addAction(self.tr("Duplicate from Here"))
-            action.triggered.connect(lambda: tree._duplicateFromHandle(tHandle))
-        elif isFile:
-            action = self.addAction(self.tr("Duplicate Document"))
-            action.triggered.connect(lambda: tree._duplicateFromHandle(tHandle))
+
+        action = self.addAction(self.tr("Duplicate"))
+        action.triggered.connect(lambda: tree._duplicateFromHandle(tHandle))
 
         if self._item.itemClass == nwItemClass.TRASH or isRoot or (isFolder and not hasChild):
             action = self.addAction(self.tr("Delete Permanently"))
@@ -1964,10 +1954,14 @@ class _TreeContextMenu(QMenu):
 
         return
 
-    def _moveToTrash(self, multi: bool) -> None:
+    def _multiMoveToTrash(self) -> None:
         """Add move to Trash action."""
-        action = self.addAction(self.tr("Move to Trash"))
-        if multi:
+        areTrash = [i.itemClass == nwItemClass.TRASH for i in self._items]
+        if all(areTrash):
+            action = self.addAction(self.tr("Delete Permanently"))
+            action.triggered.connect(self._iterPermDelete)
+        elif not any(areTrash):
+            action = self.addAction(self.tr("Move to Trash"))
             action.triggered.connect(self._iterMoveToTrash)
         return
 
@@ -1979,10 +1973,19 @@ class _TreeContextMenu(QMenu):
     def _iterMoveToTrash(self) -> None:
         """Iterate through files and move them to Trash."""
         if SHARED.question(self.tr("Move {0} items to Trash?").format(len(self._items))):
-            for tHandle in self._items:
-                tItem = SHARED.project.tree[tHandle]
-                if tItem and tItem.isFileType():
-                    self.projTree.moveItemToTrash(tHandle, askFirst=False, flush=False)
+            for tItem in self._items:
+                if tItem.isFileType() and tItem.itemClass != nwItemClass.TRASH:
+                    self.projTree.moveItemToTrash(tItem.itemHandle, askFirst=False, flush=False)
+                self.projTree.saveTreeOrder()
+        return
+
+    @pyqtSlot()
+    def _iterPermDelete(self) -> None:
+        """Iterate through files and delete them."""
+        if SHARED.question(self.projTree.trPermDelete.format(len(self._items))):
+            for tItem in self._items:
+                if tItem.isFileType() and tItem.itemClass == nwItemClass.TRASH:
+                    self.projTree.permDeleteItem(tItem.itemHandle, askFirst=False, flush=False)
                 self.projTree.saveTreeOrder()
         return
 
@@ -2000,12 +2003,11 @@ class _TreeContextMenu(QMenu):
 
     def _iterItemActive(self, isActive: bool) -> None:
         """Set the active status of multiple items."""
-        for tHandle in self._items:
-            tItem = SHARED.project.tree[tHandle]
+        for tItem in self._items:
             if tItem and tItem.isFileType():
                 tItem.setActive(isActive)
-                self.projTree.setTreeItemValues(tHandle)
-                self.projTree._alertTreeChange(tHandle, flush=False)
+                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemStatus(self, key: str) -> None:
@@ -2017,12 +2019,11 @@ class _TreeContextMenu(QMenu):
 
     def _iterSetItemStatus(self, key: str) -> None:
         """Change the status value for multiple items."""
-        for tHandle in self._items:
-            tItem = SHARED.project.tree[tHandle]
+        for tItem in self._items:
             if tItem and tItem.isNovelLike():
                 tItem.setStatus(key)
-                self.projTree.setTreeItemValues(tHandle)
-                self.projTree._alertTreeChange(tHandle, flush=False)
+                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemImport(self, key: str) -> None:
@@ -2034,12 +2035,11 @@ class _TreeContextMenu(QMenu):
 
     def _iterSetItemImport(self, key: str) -> None:
         """Change the status value for multiple items."""
-        for tHandle in self._items:
-            tItem = SHARED.project.tree[tHandle]
+        for tItem in self._items:
             if tItem and not tItem.isNovelLike():
                 tItem.setImport(key)
-                self.projTree.setTreeItemValues(tHandle)
-                self.projTree._alertTreeChange(tHandle, flush=False)
+                self.projTree.setTreeItemValues(tItem.itemHandle)
+                self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
         return
 
     def _changeItemLayout(self, itemLayout: nwItemLayout) -> None: