Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix move to trash and permanently delete for multi select menu

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-03-03 21:16:46 +01:00
parent 750ba36d32
commit c182cc4383
1 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/projtree.py
+46 -34
View File
@@ -505,7 +505,7 @@ class GuiProjectTree(QTreeWidget):
self.mainGui = projView.mainGui self.mainGui = projView.mainGui
# Internal Variables # Internal Variables
self._treeMap = {} self._treeMap: dict[str, QTreeWidgetItem] = {}
self._timeChanged = 0.0 self._timeChanged = 0.0
self._popAlert = None self._popAlert = None
@@ -1129,9 +1129,8 @@ class GuiProjectTree(QTreeWidget):
"""Get the currently selected handle. If multiple items are """Get the currently selected handle. If multiple items are
selected, return the first. selected, return the first.
""" """
selItem = self.selectedItems() if items := self.selectedItems():
if selItem: return items[0].data(self.C_DATA, self.D_HANDLE)
return selItem[0].data(self.C_DATA, self.D_HANDLE)
return None return None
def setSelectedHandle(self, tHandle: str | None, doScroll: bool = False) -> bool: def setSelectedHandle(self, tHandle: str | None, doScroll: bool = False) -> bool:
@@ -1143,9 +1142,8 @@ class GuiProjectTree(QTreeWidget):
if tHandle in self._treeMap: if tHandle in self._treeMap:
self.setCurrentItem(self._treeMap[tHandle]) self.setCurrentItem(self._treeMap[tHandle])
selIndex = self.selectedIndexes() if (indexes := self.selectedIndexes()) and doScroll:
if selIndex and doScroll: self.scrollTo(indexes[0], QAbstractItemView.ScrollHint.PositionAtCenter)
self.scrollTo(selIndex[0], QAbstractItemView.ScrollHint.PositionAtCenter)
return True return True
@@ -1160,10 +1158,8 @@ class GuiProjectTree(QTreeWidget):
def openContextOnSelected(self) -> bool: def openContextOnSelected(self) -> bool:
"""Open the context menu on the current selected item.""" """Open the context menu on the current selected item."""
selItem = self.selectedItems() if items := self.selectedItems():
if selItem: return self._openContextMenu(self.visualItemRect(items[0]).center())
pos = self.visualItemRect(selItem[0]).center()
return self._openContextMenu(pos)
return False return False
def changedSince(self, checkTime: float) -> bool: def changedSince(self, checkTime: float) -> bool:
@@ -1746,7 +1742,7 @@ class _TreeContextMenu(QMenu):
self._item = nwItem self._item = nwItem
self._handle = nwItem.itemHandle self._handle = nwItem.itemHandle
self._items: list[str] = [] self._items: list[NWItem] = []
logger.debug("Ready: _TreeContextMenu") logger.debug("Ready: _TreeContextMenu")
@@ -1799,13 +1795,17 @@ class _TreeContextMenu(QMenu):
return return
def buildMultiSelectMenu(self, items: list[str]) -> None: def buildMultiSelectMenu(self, handles: list[str]) -> None:
"""Build the multi-select menu.""" """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._itemActive(True)
self._itemStatusImport(True) self._itemStatusImport(True)
self.addSeparator() self.addSeparator()
self._moveToTrash(True) self._multiMoveToTrash()
return return
## ##
@@ -1964,10 +1964,14 @@ class _TreeContextMenu(QMenu):
return return
def _moveToTrash(self, multi: bool) -> None: def _multiMoveToTrash(self) -> None:
"""Add move to Trash action.""" """Add move to Trash action."""
action = self.addAction(self.tr("Move to Trash")) areTrash = [i.itemClass == nwItemClass.TRASH for i in self._items]
if multi: 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) action.triggered.connect(self._iterMoveToTrash)
return return
@@ -1979,10 +1983,21 @@ class _TreeContextMenu(QMenu):
def _iterMoveToTrash(self) -> None: def _iterMoveToTrash(self) -> None:
"""Iterate through files and move them to Trash.""" """Iterate through files and move them to Trash."""
if SHARED.question(self.tr("Move {0} items to Trash?").format(len(self._items))): if SHARED.question(self.tr("Move {0} items to Trash?").format(len(self._items))):
for tHandle in self._items: for tItem in self._items:
tItem = SHARED.project.tree[tHandle] if tItem.isFileType() and tItem.itemClass != nwItemClass.TRASH:
if tItem and tItem.isFileType(): self.projTree.moveItemToTrash(tItem.itemHandle, askFirst=False, flush=False)
self.projTree.moveItemToTrash(tHandle, askFirst=False, flush=False) self.projTree.saveTreeOrder()
return
@pyqtSlot()
def _iterPermDelete(self) -> None:
"""Iterate through files and delete them."""
if SHARED.question(
self.tr("Permanently delete {0} documents in Trash?").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() self.projTree.saveTreeOrder()
return return
@@ -2000,12 +2015,11 @@ class _TreeContextMenu(QMenu):
def _iterItemActive(self, isActive: bool) -> None: def _iterItemActive(self, isActive: bool) -> None:
"""Set the active status of multiple items.""" """Set the active status of multiple items."""
for tHandle in self._items: for tItem in self._items:
tItem = SHARED.project.tree[tHandle]
if tItem and tItem.isFileType(): if tItem and tItem.isFileType():
tItem.setActive(isActive) tItem.setActive(isActive)
self.projTree.setTreeItemValues(tHandle) self.projTree.setTreeItemValues(tItem.itemHandle)
self.projTree._alertTreeChange(tHandle, flush=False) self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
return return
def _changeItemStatus(self, key: str) -> None: def _changeItemStatus(self, key: str) -> None:
@@ -2017,12 +2031,11 @@ class _TreeContextMenu(QMenu):
def _iterSetItemStatus(self, key: str) -> None: def _iterSetItemStatus(self, key: str) -> None:
"""Change the status value for multiple items.""" """Change the status value for multiple items."""
for tHandle in self._items: for tItem in self._items:
tItem = SHARED.project.tree[tHandle]
if tItem and tItem.isNovelLike(): if tItem and tItem.isNovelLike():
tItem.setStatus(key) tItem.setStatus(key)
self.projTree.setTreeItemValues(tHandle) self.projTree.setTreeItemValues(tItem.itemHandle)
self.projTree._alertTreeChange(tHandle, flush=False) self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
return return
def _changeItemImport(self, key: str) -> None: def _changeItemImport(self, key: str) -> None:
@@ -2034,12 +2047,11 @@ class _TreeContextMenu(QMenu):
def _iterSetItemImport(self, key: str) -> None: def _iterSetItemImport(self, key: str) -> None:
"""Change the status value for multiple items.""" """Change the status value for multiple items."""
for tHandle in self._items: for tItem in self._items:
tItem = SHARED.project.tree[tHandle]
if tItem and not tItem.isNovelLike(): if tItem and not tItem.isNovelLike():
tItem.setImport(key) tItem.setImport(key)
self.projTree.setTreeItemValues(tHandle) self.projTree.setTreeItemValues(tItem.itemHandle)
self.projTree._alertTreeChange(tHandle, flush=False) self.projTree._alertTreeChange(tItem.itemHandle, flush=False)
return return
def _changeItemLayout(self, itemLayout: nwItemLayout) -> None: def _changeItemLayout(self, itemLayout: nwItemLayout) -> None: