mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-01 10:39:34 +12:00
Allows pasted items to keep ID if not already in model.
This commit is contained in:
parent
bb57d3d057
commit
4445b55559
|
@ -398,11 +398,23 @@ class outlineModel(QAbstractItemModel):
|
||||||
if not items:
|
if not items:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
r = self.insertItems(items, beginRow, parent)
|
# In case of copy actions, items might be duplicates, so we need new IDs.
|
||||||
|
# But they might not be, if we cut, then paste. Paste is a Copy Action.
|
||||||
|
# The first paste would not need new IDs. But subsequent ones will.
|
||||||
if action == Qt.CopyAction:
|
if action == Qt.CopyAction:
|
||||||
|
IDs = self.rootItem.listAllIDs()
|
||||||
|
|
||||||
for item in items:
|
for item in items:
|
||||||
item.getUniqueID(recursive=True)
|
if item.ID() in IDs:
|
||||||
|
# Recursively remove ID. So will get a new one when inserted.
|
||||||
|
def stripID(item):
|
||||||
|
item.setData(Outline.ID.value, None)
|
||||||
|
for c in item.children():
|
||||||
|
stripID(c)
|
||||||
|
|
||||||
|
stripID(item)
|
||||||
|
|
||||||
|
r = self.insertItems(items, beginRow, parent)
|
||||||
|
|
||||||
return r
|
return r
|
||||||
|
|
||||||
|
@ -928,7 +940,7 @@ class outlineItem():
|
||||||
# Inserting item using the model to signal views
|
# Inserting item using the model to signal views
|
||||||
self._model.insertItem(item, self.row()+1, self.parent().index())
|
self._model.insertItem(item, self.row()+1, self.parent().index())
|
||||||
|
|
||||||
def mergeWith(self, items, sep="\n---\n"):
|
def mergeWith(self, items, sep="\n\n"):
|
||||||
"""
|
"""
|
||||||
Merges item with several other items. Merge is basic, it merges only
|
Merges item with several other items. Merge is basic, it merges only
|
||||||
the text.
|
the text.
|
||||||
|
|
Loading…
Reference in a new issue