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

Improve the tree change method

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2022-09-29 14:09:03 +02:00
parent 3d3ac0d05d
commit 9c4b3dbc08
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/projtree.py
+25 -19
View File
@@ -537,7 +537,7 @@ class GuiProjectTree(QTreeWidget):
if pHandle is not None and pHandle in self._treeMap: if pHandle is not None and pHandle in self._treeMap:
self._treeMap[pHandle].setExpanded(True) self._treeMap[pHandle].setExpanded(True)
self._alertTreeChange(tHandle=tHandle, flush=True) self._alertTreeChange(tHandle, flush=True)
self.clearSelection() self.clearSelection()
trItem.setSelected(True) trItem.setSelected(True)
@@ -577,7 +577,7 @@ class GuiProjectTree(QTreeWidget):
pItem.insertChild(nIndex, cItem) pItem.insertChild(nIndex, cItem)
self._recordLastMove(cItem, pItem, tIndex) self._recordLastMove(cItem, pItem, tIndex)
self._alertTreeChange(tHandle=tHandle, flush=True) self._alertTreeChange(tHandle, flush=True)
self.clearSelection() self.clearSelection()
trItem.setSelected(True) trItem.setSelected(True)
trItem.setExpanded(isExp) trItem.setExpanded(isExp)
@@ -595,7 +595,7 @@ class GuiProjectTree(QTreeWidget):
if dlgOk: if dlgOk:
tItem.setName(newLabel) tItem.setName(newLabel)
self.setTreeItemValues(tHandle) self.setTreeItemValues(tHandle)
self._alertTreeChange(tHandle=tHandle, flush=False) self._alertTreeChange(tHandle, flush=False)
return return
@@ -665,7 +665,7 @@ class GuiProjectTree(QTreeWidget):
self.deleteItem(tHandle, alreadyAsked=True, bulkAction=True) self.deleteItem(tHandle, alreadyAsked=True, bulkAction=True)
if nTrash > 0: if nTrash > 0:
self._alertTreeChange(tHandle=trashHandle, flush=True) self._alertTreeChange(trashHandle, flush=True)
return True return True
@@ -707,7 +707,7 @@ class GuiProjectTree(QTreeWidget):
if trItemS.childCount() == 0: if trItemS.childCount() == 0:
self.takeTopLevelItem(tIndex) self.takeTopLevelItem(tIndex)
self._deleteTreeItem(tHandle) self._deleteTreeItem(tHandle)
self._alertTreeChange(tHandle=tHandle, flush=True) self._alertTreeChange(tHandle, flush=True)
else: else:
self.mainGui.makeAlert(self.tr( self.mainGui.makeAlert(self.tr(
"Cannot delete root folder. It is not empty. " "Cannot delete root folder. It is not empty. "
@@ -723,7 +723,7 @@ class GuiProjectTree(QTreeWidget):
tIndex = trItemP.indexOfChild(trItemS) tIndex = trItemP.indexOfChild(trItemS)
trItemP.takeChild(tIndex) trItemP.takeChild(tIndex)
self._deleteTreeItem(tHandle) self._deleteTreeItem(tHandle)
self._alertTreeChange(tHandle=tHandle, flush=autoFlush) self._alertTreeChange(tHandle, flush=autoFlush)
else: else:
# A populated FOLDER or a FILE requires confirmtation # A populated FOLDER or a FILE requires confirmtation
@@ -759,7 +759,7 @@ class GuiProjectTree(QTreeWidget):
self.mainGui.closeDocument() self.mainGui.closeDocument()
self._deleteTreeItem(dHandle) self._deleteTreeItem(dHandle)
self._alertTreeChange(tHandle=tHandle, flush=autoFlush) self._alertTreeChange(tHandle, flush=autoFlush)
self.projView.wordCountsChanged.emit() self.projView.wordCountsChanged.emit()
else: else:
@@ -778,7 +778,7 @@ class GuiProjectTree(QTreeWidget):
trItemT.addChild(trItemC) trItemT.addChild(trItemC)
self._postItemMove(tHandle, wCount) self._postItemMove(tHandle, wCount)
self._recordLastMove(trItemS, trItemP, tIndex) self._recordLastMove(trItemS, trItemP, tIndex)
self._alertTreeChange(tHandle=tHandle, flush=autoFlush) self._alertTreeChange(tHandle, flush=autoFlush)
return True return True
@@ -904,7 +904,7 @@ class GuiProjectTree(QTreeWidget):
dstItem.insertChild(dstIndex, movItem) dstItem.insertChild(dstIndex, movItem)
self._postItemMove(sHandle, wCount) self._postItemMove(sHandle, wCount)
self._alertTreeChange(tHandle=sHandle, flush=True) self._alertTreeChange(sHandle, flush=True)
self.clearSelection() self.clearSelection()
movItem.setSelected(True) movItem.setSelected(True)
@@ -1168,7 +1168,7 @@ class GuiProjectTree(QTreeWidget):
QTreeWidget.dropEvent(self, theEvent) QTreeWidget.dropEvent(self, theEvent)
self._postItemMove(sHandle, wCount) self._postItemMove(sHandle, wCount)
self._recordLastMove(sItem, pItem, pIndex) self._recordLastMove(sItem, pItem, pIndex)
self._alertTreeChange(tHandle=sHandle, flush=True) self._alertTreeChange(sHandle, flush=True)
sItem.setExpanded(isExpanded) sItem.setExpanded(isExpanded)
return return
@@ -1250,6 +1250,7 @@ class GuiProjectTree(QTreeWidget):
if tItem is not None: if tItem is not None:
tItem.setExported(not tItem.isExported) tItem.setExported(not tItem.isExported)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tItem.itemHandle)
self._alertTreeChange(tHandle, flush=False)
return return
def _changeItemStatus(self, tHandle, tStatus): def _changeItemStatus(self, tHandle, tStatus):
@@ -1259,6 +1260,7 @@ class GuiProjectTree(QTreeWidget):
if tItem is not None: if tItem is not None:
tItem.setStatus(tStatus) tItem.setStatus(tStatus)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tItem.itemHandle)
self._alertTreeChange(tHandle, flush=False)
return return
def _changeItemImport(self, tHandle, tImport): def _changeItemImport(self, tHandle, tImport):
@@ -1268,6 +1270,7 @@ class GuiProjectTree(QTreeWidget):
if tItem is not None: if tItem is not None:
tItem.setImport(tImport) tItem.setImport(tImport)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tItem.itemHandle)
self._alertTreeChange(tHandle, flush=False)
return return
def _changeItemLayout(self, tHandle, itemLayout): def _changeItemLayout(self, tHandle, itemLayout):
@@ -1277,10 +1280,12 @@ class GuiProjectTree(QTreeWidget):
if tItem is not None: if tItem is not None:
if itemLayout == nwItemLayout.DOCUMENT and tItem.documentAllowed(): if itemLayout == nwItemLayout.DOCUMENT and tItem.documentAllowed():
tItem.setLayout(nwItemLayout.DOCUMENT) tItem.setLayout(nwItemLayout.DOCUMENT)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tHandle)
self._alertTreeChange(tHandle, flush=False)
elif itemLayout == nwItemLayout.NOTE: elif itemLayout == nwItemLayout.NOTE:
tItem.setLayout(nwItemLayout.NOTE) tItem.setLayout(nwItemLayout.NOTE)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tHandle)
self._alertTreeChange(tHandle, flush=False)
return return
def _covertFolderToFile(self, tHandle, itemLayout): def _covertFolderToFile(self, tHandle, itemLayout):
@@ -1298,13 +1303,13 @@ class GuiProjectTree(QTreeWidget):
if msgYes and itemLayout == nwItemLayout.DOCUMENT and tItem.documentAllowed(): if msgYes and itemLayout == nwItemLayout.DOCUMENT and tItem.documentAllowed():
tItem.setType(nwItemType.FILE) tItem.setType(nwItemType.FILE)
tItem.setLayout(nwItemLayout.DOCUMENT) tItem.setLayout(nwItemLayout.DOCUMENT)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tHandle)
self._alertTreeChange(tHandle, flush=True) self._alertTreeChange(tHandle, flush=False)
elif msgYes and itemLayout == nwItemLayout.NOTE: elif msgYes and itemLayout == nwItemLayout.NOTE:
tItem.setType(nwItemType.FILE) tItem.setType(nwItemType.FILE)
tItem.setLayout(nwItemLayout.NOTE) tItem.setLayout(nwItemLayout.NOTE)
self.setTreeItemValues(tItem.itemHandle) self.setTreeItemValues(tHandle)
self._alertTreeChange(tHandle, flush=True) self._alertTreeChange(tHandle, flush=False)
else: else:
logger.info("Folder conversion cancelled") logger.info("Folder conversion cancelled")
return return
@@ -1391,13 +1396,14 @@ class GuiProjectTree(QTreeWidget):
trItem = self._addTreeItem(self.theProject.tree[trashHandle]) trItem = self._addTreeItem(self.theProject.tree[trashHandle])
if trItem is not None: if trItem is not None:
trItem.setExpanded(True) trItem.setExpanded(True)
self._alertTreeChange(tHandle=trashHandle, flush=True) self._alertTreeChange(trashHandle, flush=True)
return trItem return trItem
def _alertTreeChange(self, tHandle=None, flush=True): def _alertTreeChange(self, tHandle, flush=False):
"""Update information on tree change state, and emit necessary """Update information on tree change state, and emit necessary
signals. signals. A flush is only needed if an item is moved, created or
deleted.
""" """
self._timeChanged = time() self._timeChanged = time()
self.theProject.setProjectChanged(True) self.theProject.setProjectChanged(True)