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

Ensure that the moveTreeItem function exits properly if no item to be moved is selected

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-12-09 23:19:02 +01:00
parent e129319faa
commit c2321c502f
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/projtree.py
+26 -26
View File
@@ -286,36 +286,36 @@ class GuiProjectTree(QTreeWidget):
logger.error("No project open") logger.error("No project open")
return False return False
hasFocus = qApp.focusWidget() == self or not self.mainConf.showGUI if qApp.focusWidget() != self and self.mainConf.showGUI:
if hasFocus and self.theParent.hasProject: return False
tHandle = self.getSelectedHandle() tHandle = self.getSelectedHandle()
tItem = self._getTreeItem(tHandle) tItem = self._getTreeItem(tHandle)
pItem = tItem.parent() if tItem is None:
if pItem is None: return False
tIndex = self.indexOfTopLevelItem(tItem)
nChild = self.topLevelItemCount()
nIndex = tIndex + nStep
if nIndex < 0 or nIndex >= nChild:
return False
cItem = self.takeTopLevelItem(tIndex)
self.insertTopLevelItem(nIndex, cItem)
else: pItem = tItem.parent()
tIndex = pItem.indexOfChild(tItem) if pItem is None:
nChild = pItem.childCount() tIndex = self.indexOfTopLevelItem(tItem)
nIndex = tIndex + nStep nChild = self.topLevelItemCount()
if nIndex < 0 or nIndex >= nChild: nIndex = tIndex + nStep
return False if nIndex < 0 or nIndex >= nChild:
cItem = pItem.takeChild(tIndex) return False
pItem.insertChild(nIndex, cItem) cItem = self.takeTopLevelItem(tIndex)
self.insertTopLevelItem(nIndex, cItem)
self.clearSelection()
cItem.setSelected(True)
self._setTreeChanged(True)
else: else:
return False tIndex = pItem.indexOfChild(tItem)
nChild = pItem.childCount()
nIndex = tIndex + nStep
if nIndex < 0 or nIndex >= nChild:
return False
cItem = pItem.takeChild(tIndex)
pItem.insertChild(nIndex, cItem)
self.clearSelection()
cItem.setSelected(True)
self._setTreeChanged(True)
return True return True