mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-15 02:12:29 +12:00
Fixed issue #808 by resetting POV once the character gets deleted
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
parent
a63da8d0a8
commit
77eee852de
|
@ -392,6 +392,15 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
#don't know what's up with this
|
||||
pass
|
||||
|
||||
def deleteCharacter(self):
|
||||
ID = self.lstCharacters.removeCharacter()
|
||||
if ID is None:
|
||||
return
|
||||
for itemID in self.mdlOutline.findItemsByPOV(ID):
|
||||
item = self.mdlOutline.getItemByID(itemID)
|
||||
if item:
|
||||
item.resetPOV()
|
||||
|
||||
###############################################################################
|
||||
# PLOTS
|
||||
###############################################################################
|
||||
|
@ -965,7 +974,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
self.tblPersoInfos.setModel(self.mdlCharacter)
|
||||
try:
|
||||
self.btnAddPerso.clicked.connect(self.lstCharacters.addCharacter, F.AUC)
|
||||
self.btnRmPerso.clicked.connect(self.lstCharacters.removeCharacter, F.AUC)
|
||||
self.btnRmPerso.clicked.connect(self.deleteCharacter, F.AUC)
|
||||
|
||||
self.btnPersoColor.clicked.connect(self.lstCharacters.choseCharacterColor, F.AUC)
|
||||
self.chkPersoPOV.stateChanged.connect(self.lstCharacters.changeCharacterPOVState, F.AUC)
|
||||
|
@ -1122,7 +1131,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
|
||||
# Characters
|
||||
self.disconnectAll(self.btnAddPerso.clicked, self.lstCharacters.addCharacter)
|
||||
self.disconnectAll(self.btnRmPerso.clicked, self.lstCharacters.removeCharacter)
|
||||
self.disconnectAll(self.btnRmPerso.clicked, self.deleteCharacter)
|
||||
|
||||
self.disconnectAll(self.btnPersoColor.clicked, self.lstCharacters.choseCharacterColor)
|
||||
self.disconnectAll(self.chkPersoPOV.stateChanged, self.lstCharacters.changeCharacterPOVState)
|
||||
|
|
|
@ -71,6 +71,9 @@ class outlineItem(abstractItem, searchableItem):
|
|||
def POV(self):
|
||||
return self.data(self.enum.POV)
|
||||
|
||||
def resetPOV(self):
|
||||
self.setData(self.enum.POV, None)
|
||||
|
||||
def status(self):
|
||||
return self.data(self.enum.status)
|
||||
|
||||
|
|
|
@ -142,8 +142,10 @@ class characterTreeView(QTreeWidget):
|
|||
Removes selected character.
|
||||
"""
|
||||
ID = self.currentCharacterID()
|
||||
if ID:
|
||||
self._model.removeCharacter(ID)
|
||||
if ID is None:
|
||||
return None
|
||||
self._model.removeCharacter(ID)
|
||||
return ID
|
||||
|
||||
def choseCharacterColor(self):
|
||||
ID = self.currentCharacterID()
|
||||
|
|
Loading…
Reference in a new issue