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

Update data recursively when moving an item with child items

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2022-04-23 16:09:50 +02:00
parent 1a47bbaf8c
commit 5cdcda66a5
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/projtree.py
+28 -20
View File
@@ -435,7 +435,6 @@ class GuiProjectTree(QTreeWidget):
logger.error("Could not find tree item for deletion") logger.error("Could not find tree item for deletion")
return False return False
wCount = int(trItemS.data(self.C_COUNT, Qt.UserRole))
if nwItemS.itemType == nwItemType.FILE: if nwItemS.itemType == nwItemType.FILE:
logger.debug("User requested file '%s' deleted", tHandle) logger.debug("User requested file '%s' deleted", tHandle)
trItemP = trItemS.parent() trItemP = trItemS.parent()
@@ -494,7 +493,7 @@ class GuiProjectTree(QTreeWidget):
tIndex = trItemP.indexOfChild(trItemS) tIndex = trItemP.indexOfChild(trItemS)
trItemC = trItemP.takeChild(tIndex) trItemC = trItemP.takeChild(tIndex)
trItemT.addChild(trItemC) trItemT.addChild(trItemC)
self._postItemMove(tHandle, wCount) self._postItemMove(tHandle)
self._recordLastMove(trItemS, trItemP, tIndex) self._recordLastMove(trItemS, trItemP, tIndex)
self._setTreeChanged(True) self._setTreeChanged(True)
@@ -646,7 +645,6 @@ class GuiProjectTree(QTreeWidget):
return False return False
dstIndex = min(max(0, dstIndex), dstItem.childCount()) dstIndex = min(max(0, dstIndex), dstItem.childCount())
wCount = int(srcItem.data(self.C_COUNT, Qt.UserRole))
sHandle = srcItem.data(self.C_NAME, Qt.UserRole) sHandle = srcItem.data(self.C_NAME, Qt.UserRole)
dHandle = dstItem.data(self.C_NAME, Qt.UserRole) dHandle = dstItem.data(self.C_NAME, Qt.UserRole)
logger.debug("Moving item '%s' back to '%s', index %d", sHandle, dHandle, dstIndex) logger.debug("Moving item '%s' back to '%s', index %d", sHandle, dHandle, dstIndex)
@@ -657,7 +655,7 @@ class GuiProjectTree(QTreeWidget):
movItem = parItem.takeChild(srcIndex) movItem = parItem.takeChild(srcIndex)
dstItem.insertChild(dstIndex, movItem) dstItem.insertChild(dstIndex, movItem)
self._postItemMove(sHandle, wCount) self._postItemMove(sHandle)
self.clearSelection() self.clearSelection()
movItem.setSelected(True) movItem.setSelected(True)
@@ -801,11 +799,9 @@ class GuiProjectTree(QTreeWidget):
if (inSame or isFile) and not isRoot: if (inSame or isFile) and not isRoot:
logger.debug("Drag'n'drop of item '%s' accepted", sHandle) logger.debug("Drag'n'drop of item '%s' accepted", sHandle)
wCount = int(sItem.data(self.C_COUNT, Qt.UserRole))
self.propagateCount(sHandle, 0) self.propagateCount(sHandle, 0)
QTreeWidget.dropEvent(self, theEvent) QTreeWidget.dropEvent(self, theEvent)
self._postItemMove(sHandle, wCount) self._postItemMove(sHandle)
self._recordLastMove(sItem, pItem, pIndex) self._recordLastMove(sItem, pItem, pIndex)
else: else:
@@ -822,7 +818,7 @@ class GuiProjectTree(QTreeWidget):
# Internal Functions # Internal Functions
## ##
def _postItemMove(self, tHandle, wCount): def _postItemMove(self, tHandle):
"""Run various maintenance tasks for a moved item. """Run various maintenance tasks for a moved item.
""" """
trItemS = self._getTreeItem(tHandle) trItemS = self._getTreeItem(tHandle)
@@ -836,19 +832,23 @@ class GuiProjectTree(QTreeWidget):
# is updated accordingly, and update word count # is updated accordingly, and update word count
pHandle = trItemP.data(self.C_NAME, Qt.UserRole) pHandle = trItemP.data(self.C_NAME, Qt.UserRole)
nwItemS.setParent(pHandle) nwItemS.setParent(pHandle)
self.theProject.projTree.updateItemData(tHandle)
self.setTreeItemValues(tHandle)
self.propagateCount(tHandle, wCount)
logger.debug("The parent of item '%s' has been changed to '%s'", tHandle, pHandle) logger.debug("The parent of item '%s' has been changed to '%s'", tHandle, pHandle)
# The items dropped into archive or trash should be removed mHandles = self.getTreeFromHandle(tHandle)
# from the project index, for all other items, we rescan the logger.debug("A total of %d item(s) were moved", len(mHandles))
# file to ensure the index is up to date. for mHandle in mHandles:
if nwItemS.isInactive(): logger.debug("Updating item '%s'", mHandle)
self.theIndex.deleteHandle(tHandle) wCount = self._getItemWordCount(mHandle)
else: self.theProject.projTree.updateItemData(mHandle)
self.theIndex.reIndexHandle(tHandle)
# Update the index
if nwItemS.isInactive():
self.theIndex.deleteHandle(tHandle)
else:
self.theIndex.reIndexHandle(tHandle)
self.setTreeItemValues(mHandle)
self.propagateCount(mHandle, wCount)
# Trigger dependent updates # Trigger dependent updates
self._setTreeChanged(True) self._setTreeChanged(True)
@@ -856,8 +856,16 @@ class GuiProjectTree(QTreeWidget):
return True return True
def _getItemWordCount(self, tHandle):
"""Retrun the word count of a given item handle.
"""
tItem = self._getTreeItem(tHandle)
if tItem is None:
return 0
return int(tItem.data(self.C_COUNT, Qt.UserRole))
def _getTreeItem(self, tHandle): def _getTreeItem(self, tHandle):
"""Returns the QTreeWidgetItem of a given item handle. """Return the QTreeWidgetItem of a given item handle.
""" """
return self._treeMap.get(tHandle, None) return self._treeMap.get(tHandle, None)