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

Save handle and title key with other data in novel model

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-02-23 22:34:53 +01:00
parent 43e420ab0b
commit 4da120633e
3 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/noveltree.py
+12 -10
View File
@@ -418,7 +418,8 @@ class GuiNovelTree(NTreeView):
items are selected, return the first.
"""
if model := self._getModel():
return model.keys(self.currentIndex())
index = self.currentIndex()
return model.handle(index), model.key(index)
return None, None
##
@@ -452,7 +453,7 @@ class GuiNovelTree(NTreeView):
def drawRow(self, painter: QPainter, opt: QStyleOptionViewItem, index: QModelIndex) -> None:
"""Draw a box on the active row."""
if (model := self._getModel()) and model.keys(index)[0] == self._actHandle:
if (model := self._getModel()) and model.handle(index) == self._actHandle:
painter.fillRect(opt.rect, self.palette().alternateBase())
super().drawRow(painter, opt, index)
return
@@ -465,8 +466,7 @@ class GuiNovelTree(NTreeView):
def _onSingleClick(self, index: QModelIndex) -> None:
"""The user single-clicked an index."""
if index.isValid() and (model := self._getModel()):
keys = model.keys(index)
if (tHandle := keys[0]) and (sTitle := keys[1]):
if (tHandle := model.handle(index)) and (sTitle := model.key(index)):
self.novelView.selectedItemChanged.emit(tHandle)
if index.column() == model.columnCount(index) - 1:
pos = self.mapToGlobal(self.visualRect(index).topRight())
@@ -477,20 +477,22 @@ class GuiNovelTree(NTreeView):
def _onDoubleClick(self, index: QModelIndex) -> None:
"""The user double-clicked an index."""
if (
(model := self._getModel()) and (keys := model.keys(index))
and (tHandle := keys[0]) and (sTitle := keys[1])
(model := self._getModel())
and (tHandle := model.handle(index))
and (sTitle := model.key(index))
):
self.novelView.openDocumentRequest.emit(tHandle, nwDocMode.EDIT, sTitle or "", False)
self.novelView.openDocumentRequest.emit(tHandle, nwDocMode.EDIT, sTitle, False)
return
@pyqtSlot(QModelIndex)
def _onMiddleClick(self, index: QModelIndex) -> None:
"""The user middle-clicked an index."""
if (
(model := self._getModel()) and (keys := model.keys(index))
and (tHandle := keys[0]) and (sTitle := keys[1])
(model := self._getModel())
and (tHandle := model.handle(index))
and (sTitle := model.key(index))
):
self.novelView.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, sTitle or "", False)
self.novelView.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, sTitle, False)
return
##