CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-17 11:22:28 +12:00
Code Issues Projects Releases Wiki Activity

Corrects a few things in combo and other places

Browse source
This commit is contained in:
Olivier Keshavjee 2016-03-03 17:41:19 +01:00
parent a17745a89a
commit 7e05e22275
8 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
manuskript/models/characterModel.py
View file

@ -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 = []

2
manuskript/models/outlineModel.py
View file

@ -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()

2
manuskript/models/references.py
View file

@ -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()

8
manuskript/ui/views/basicItemView_ui.py
View file

@ -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

6
manuskript/ui/views/basicItemView_ui.ui
View file

@ -43,7 +43,7 @@
</widget>
</item>
<item>
<widget class="cmbOutlinePersoChoser" name="cmbPOV">
<widget class="cmbOutlineCharacterChoser" name="cmbPOV">
<property name="frame">
<bool>false</bool>
</property>
@ -112,9 +112,9 @@
<header>manuskript.ui.views.textEditView.h</header>
</customwidget>
<customwidget>
<class>cmbOutlinePersoChoser</class>
<class>cmbOutlineCharacterChoser</class>
<extends>QComboBox</extends>
<header>manuskript.ui.views.cmbOutlinePersoChoser.h</header>
<header>manuskript.ui.views.cmbOutlineCharacterChoser.h</header>
</customwidget>
<customwidget>
<class>lineEditView</class>

5
manuskript/ui/views/cmbOutlinePersoChoser.py → manuskript/ui/views/cmbOutlineCharacterChoser.py
View file

@ -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()

14
manuskript/ui/views/propertiesView_ui.py
View file

@ -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

8
manuskript/ui/views/propertiesView_ui.ui
View file

@ -53,7 +53,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="cmbOutlinePersoChoser" name="cmbPOV">
<widget class="cmbOutlineCharacterChoser" name="cmbPOV">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -190,7 +190,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="cmbOutlinePersoChoser" name="cmbPOVMulti">
<widget class="cmbOutlineCharacterChoser" name="cmbPOVMulti">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -300,9 +300,9 @@
<header>manuskript.ui.views.lineEditView.h</header>
</customwidget>
<customwidget>
<class>cmbOutlinePersoChoser</class>
<class>cmbOutlineCharacterChoser</class>
<extends>QComboBox</extends>
<header>manuskript.ui.views.cmbOutlinePersoChoser.h</header>
<header>manuskript.ui.views.cmbOutlineCharacterChoser.h</header>
</customwidget>
<customwidget>
<class>cmbOutlineStatusChoser</class>