From 7e05e2227540cae57e6aa828c429b317a70d1479 Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Thu, 3 Mar 2016 17:41:19 +0100 Subject: [PATCH] Corrects a few things in combo and other places --- manuskript/models/characterModel.py | 13 +++++++------ manuskript/models/outlineModel.py | 2 +- manuskript/models/references.py | 2 +- manuskript/ui/views/basicItemView_ui.py | 8 ++++---- manuskript/ui/views/basicItemView_ui.ui | 6 +++--- ...PersoChoser.py => cmbOutlineCharacterChoser.py} | 5 ++++- manuskript/ui/views/propertiesView_ui.py | 14 +++++++------- manuskript/ui/views/propertiesView_ui.ui | 8 ++++---- 8 files changed, 31 insertions(+), 27 deletions(-) rename manuskript/ui/views/{cmbOutlinePersoChoser.py => cmbOutlineCharacterChoser.py} (96%) diff --git a/manuskript/models/characterModel.py b/manuskript/models/characterModel.py index 85745344..a9881f94 100644 --- a/manuskript/models/characterModel.py +++ b/manuskript/models/characterModel.py @@ -141,10 +141,11 @@ class characterModel(QAbstractItemModel): return r def getCharacterByID(self, ID): - ID = int(ID) - for c in self.characters: - if c.ID() == ID: - return c + if ID is not None: + ID = str(ID) + for c in self.characters: + if c.ID() == ID: + return c return None ############################################################################### @@ -267,13 +268,13 @@ class Character(): """Assigns an unused character ID.""" vals = [] for c in self._model.characters: - vals.append(c.ID()) + vals.append(int(c.ID())) k = 0 while k in vals: k += 1 - self._data[C.ID.value] = k + self._data[C.ID.value] = str(k) def listInfos(self): r = [] diff --git a/manuskript/models/outlineModel.py b/manuskript/models/outlineModel.py index 6fc547df..9f2c1fe0 100644 --- a/manuskript/models/outlineModel.py +++ b/manuskript/models/outlineModel.py @@ -855,7 +855,7 @@ class outlineItem(): for c in columns: if c == Outline.POV.value: - searchIn = mainWindow.mdlCharacter.getPersoNameByID(self.POV()) + searchIn = mainWindow.mdlCharacter.getCharacterByID(self.POV()).name() elif c == Outline.status.value: searchIn = mainWindow.mdlStatus.item(toInt(self.status()), 0).text() diff --git a/manuskript/models/references.py b/manuskript/models/references.py index 16663199..64261d7e 100644 --- a/manuskript/models/references.py +++ b/manuskript/models/references.py @@ -417,7 +417,7 @@ def shortInfos(ref): infos["type"] = CharacterLetter m = mainWindow().mdlCharacter - c = m.getCharacterByID(int(_ref)) + c = m.getCharacterByID(_ref) if c: infos["title"] = c.name() diff --git a/manuskript/ui/views/basicItemView_ui.py b/manuskript/ui/views/basicItemView_ui.py index 6be70e81..f0594fad 100644 --- a/manuskript/ui/views/basicItemView_ui.py +++ b/manuskript/ui/views/basicItemView_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/views/basicItemView_ui.ui' # -# Created: Wed Mar 2 00:33:34 2016 +# Created: Thu Mar 3 17:26:11 2016 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -24,7 +24,7 @@ class Ui_basicItemView(object): self.lblPlanPOV.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lblPlanPOV.setObjectName("lblPlanPOV") self.horizontalLayout_11.addWidget(self.lblPlanPOV) - self.cmbPOV = cmbOutlinePersoChoser(basicItemView) + self.cmbPOV = cmbOutlineCharacterChoser(basicItemView) self.cmbPOV.setFrame(False) self.cmbPOV.setObjectName("cmbPOV") self.horizontalLayout_11.addWidget(self.cmbPOV) @@ -67,6 +67,6 @@ class Ui_basicItemView(object): self.txtSummarySentence.setPlaceholderText(_translate("basicItemView", "One line summary")) self.label_9.setText(_translate("basicItemView", "Few sentences summary:")) -from manuskript.ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser -from manuskript.ui.views.textEditView import textEditView +from manuskript.ui.views.cmbOutlineCharacterChoser import cmbOutlineCharacterChoser from manuskript.ui.views.lineEditView import lineEditView +from manuskript.ui.views.textEditView import textEditView diff --git a/manuskript/ui/views/basicItemView_ui.ui b/manuskript/ui/views/basicItemView_ui.ui index 64552858..6466cc73 100644 --- a/manuskript/ui/views/basicItemView_ui.ui +++ b/manuskript/ui/views/basicItemView_ui.ui @@ -43,7 +43,7 @@ - + false @@ -112,9 +112,9 @@
manuskript.ui.views.textEditView.h
- cmbOutlinePersoChoser + cmbOutlineCharacterChoser QComboBox -
manuskript.ui.views.cmbOutlinePersoChoser.h
+
manuskript.ui.views.cmbOutlineCharacterChoser.h
 lineEditView diff --git a/manuskript/ui/views/cmbOutlinePersoChoser.py b/manuskript/ui/views/cmbOutlineCharacterChoser.py similarity index 96% rename from manuskript/ui/views/cmbOutlinePersoChoser.py rename to manuskript/ui/views/cmbOutlineCharacterChoser.py index dfb9449d..4185aca9 100644 --- a/manuskript/ui/views/cmbOutlinePersoChoser.py +++ b/manuskript/ui/views/cmbOutlineCharacterChoser.py @@ -8,7 +8,7 @@ from manuskript.enums import Outline from manuskript.functions import toInt -class cmbOutlinePersoChoser(QComboBox): +class cmbOutlineCharacterChoser(QComboBox): def __init__(self, parent=None): QComboBox.__init__(self, parent) self.activated[int].connect(self.submit) @@ -21,6 +21,9 @@ class cmbOutlinePersoChoser(QComboBox): def setModels(self, mdlCharacter, mdlOutline): self.mdlCharacters = mdlCharacter self.mdlCharacters.dataChanged.connect(self.updateItems) + self.mdlCharacters.rowsInserted.connect(self.updateItems) + self.mdlCharacters.rowsRemoved.connect(self.updateItems) + self.mdlOutline = mdlOutline self.mdlOutline.dataChanged.connect(self.update) self.updateItems() diff --git a/manuskript/ui/views/propertiesView_ui.py b/manuskript/ui/views/propertiesView_ui.py index 0d9a56e2..217b3ab5 100644 --- a/manuskript/ui/views/propertiesView_ui.py +++ b/manuskript/ui/views/propertiesView_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/views/propertiesView_ui.ui' # -# Created: Wed Mar 2 00:30:18 2016 +# Created: Thu Mar 3 17:26:11 2016 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -37,7 +37,7 @@ class Ui_propertiesView(object): self.lblPOV = QtWidgets.QLabel(self.page) self.lblPOV.setObjectName("lblPOV") self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.lblPOV) - self.cmbPOV = cmbOutlinePersoChoser(self.page) + self.cmbPOV = cmbOutlineCharacterChoser(self.page) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -116,7 +116,7 @@ class Ui_propertiesView(object): self.lblPOV_2 = QtWidgets.QLabel(self.page_2) self.lblPOV_2.setObjectName("lblPOV_2") self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.lblPOV_2) - self.cmbPOVMulti = cmbOutlinePersoChoser(self.page_2) + self.cmbPOVMulti = cmbOutlineCharacterChoser(self.page_2) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -195,9 +195,9 @@ class Ui_propertiesView(object): self.label_36.setText(_translate("propertiesView", "Goal")) self.txtGoalMulti.setPlaceholderText(_translate("propertiesView", "Word count")) -from manuskript.ui.views.cmbOutlineStatusChoser import cmbOutlineStatusChoser from manuskript.ui.views.lineEditView import lineEditView -from manuskript.ui.views.chkOutlineCompile import chkOutlineCompile -from manuskript.ui.views.cmbOutlineLabelChoser import cmbOutlineLabelChoser +from manuskript.ui.views.cmbOutlineCharacterChoser import cmbOutlineCharacterChoser from manuskript.ui.views.cmbOutlineTypeChoser import cmbOutlineTypeChoser -from manuskript.ui.views.cmbOutlinePersoChoser import cmbOutlinePersoChoser +from manuskript.ui.views.chkOutlineCompile import chkOutlineCompile +from manuskript.ui.views.cmbOutlineStatusChoser import cmbOutlineStatusChoser +from manuskript.ui.views.cmbOutlineLabelChoser import cmbOutlineLabelChoser diff --git a/manuskript/ui/views/propertiesView_ui.ui b/manuskript/ui/views/propertiesView_ui.ui index 0c342b84..d76b439d 100644 --- a/manuskript/ui/views/propertiesView_ui.ui +++ b/manuskript/ui/views/propertiesView_ui.ui @@ -53,7 +53,7 @@ - + 0 @@ -190,7 +190,7 @@ - + 0 @@ -300,9 +300,9 @@
manuskript.ui.views.lineEditView.h
- cmbOutlinePersoChoser + cmbOutlineCharacterChoser QComboBox -
manuskript.ui.views.cmbOutlinePersoChoser.h
+
manuskript.ui.views.cmbOutlineCharacterChoser.h
 cmbOutlineStatusChoser