Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/RelLib/*: fix different typos.

Browse Source 
* src/DataViews/_FamilyView.py: adapt changes in RelLib
	



svn: r6326
This commit is contained in:
Martin Hawlisch 2006-04-13 11:21:33 +00:00
parent 064e200d0d
commit 9fdfd50bc4
12 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2006-04-13 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/RelLib/*: fix different typos.
* src/DataViews/_FamilyView.py: adapt changes in RelLib
2006-04-12 Alex Roitman <shura@gramps-project.org> 2006-04-12 Alex Roitman <shura@gramps-project.org>
* src/NameDisplay.py: Add constants to number name components. * src/NameDisplay.py: Add constants to number name components.
* src/PeopleModel.py: Correct constants. * src/PeopleModel.py: Correct constants.

9
gramps2/src/DataViews/_FamilyView.py
View File

@ -254,7 +254,7 @@ class FamilyView(PageView.PersonNavView):
self.row = 5 self.row = 5
family_handle_list = person.get_parent_family_handle_list() family_handle_list = person.get_parent_family_handle_list()
if family_handle_list: if family_handle_list:
for (family_handle, mrel, frel) in family_handle_list: for family_handle in family_handle_list:
if family_handle: if family_handle:
self.write_parents(family_handle) self.write_parents(family_handle)
else: else:
@ -639,11 +639,11 @@ class FamilyView(PageView.PersonNavView):
if not self.write_marriage(family): if not self.write_marriage(family):
self.write_relationship(family) self.write_relationship(family)
child_list = family.get_child_handle_list() child_list = family.get_child_ref_list()
label = _("Children") label = _("Children")
if child_list: if child_list:
for child in child_list: for child_ref in child_list:
self.write_child(label, child) self.write_child(label, child_ref.ref)
label = u"" label = u""
self.row += 1 self.row += 1
@ -732,4 +732,3 @@ class FamilyView(PageView.PersonNavView):
def change_to(self, obj, handle): def change_to(self, obj, handle):
self.dbstate.change_active_handle(handle) self.dbstate.change_active_handle(handle)

2
gramps2/src/RelLib/_Attribute.py
View File

@ -83,7 +83,7 @@ class Attribute(BaseObject,PrivacyBase,SourceBase,NoteBase):
def unserialize(self,data): def unserialize(self,data):
(privacy,source_list,note,self.type,self.value) = data (privacy,source_list,note,self.type,self.value) = data
PrivateBase.unserialize(self,privacy) PrivacyBase.unserialize(self,privacy)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
NoteBase.unserialize(self,note) NoteBase.unserialize(self,note)
return self return self

2
gramps2/src/RelLib/_ChildRef.py
View File

@ -80,7 +80,7 @@ class ChildRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase):
def unserialize(self,data): def unserialize(self,data):
(privacy,source_list,note,ref,self.frel,self.mrel) = data (privacy,source_list,note,ref,self.frel,self.mrel) = data
PrivateBase.unserialize(self,privacy) PrivacyBase.unserialize(self,privacy)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
NoteBase.unserialize(self,note) NoteBase.unserialize(self,note)
RefBase.unserialize(self,ref) RefBase.unserialize(self,ref)

2
gramps2/src/RelLib/_Event.py
View File

@ -168,7 +168,7 @@ class Event(PrimaryObject,SourceBase,NoteBase,MediaBase,DateBase,PlaceBase):
DateBase.unserialize(self,date) DateBase.unserialize(self,date)
MediaBase.unserialize(self,media_list) MediaBase.unserialize(self,media_list)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
Note.unserialize(self,note) NoteBase.unserialize(self,note)
def _has_handle_reference(self,classname,handle): def _has_handle_reference(self,classname,handle):
if classname == 'Place': if classname == 'Place':

2
gramps2/src/RelLib/_EventRef.py
View File

@ -82,7 +82,7 @@ class EventRef(BaseObject,PrivacyBase,NoteBase,RefBase):
return ( return (
PrivacyBase.serialize(self), PrivacyBase.serialize(self),
NoteBase.serialize(self), NoteBase.serialize(self),
Refbase.serialize(self), RefBase.serialize(self),
self.role self.role
) )

4
gramps2/src/RelLib/_Family.py
View File

@ -121,7 +121,7 @@ class Family(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase,
lds_seal = self.lds_seal.serialize() lds_seal = self.lds_seal.serialize()
return (self.handle, self.gramps_id, self.father_handle, return (self.handle, self.gramps_id, self.father_handle,
self.mother_handle, self.mother_handle,
[cr.serialize for cr in self.child_ref_list], [cr.serialize() for cr in self.child_ref_list],
self.type, self.type,
[er.serialize() for er in self.event_ref_list], [er.serialize() for er in self.event_ref_list],
MediaBase.serialize(self), MediaBase.serialize(self),
@ -375,7 +375,7 @@ class Family(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase,
@param person_handle: L{Person} database handle @param person_handle: L{Person} database handle
@type person_handle: str @type person_handle: str
""" """
if child_ref and not isinstance(childref,ChildRef): if child_ref and not isinstance(child_ref,ChildRef):
raise ValueError("expecting ChildRef instance") raise ValueError("expecting ChildRef instance")
self.child_ref_list.append(child_ref) self.child_ref_list.append(child_ref)

4
gramps2/src/RelLib/_MediaRef.py
View File

@ -63,12 +63,12 @@ class MediaRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase,
SourceBase.serialize(self), SourceBase.serialize(self),
NoteBase.serialize(self), NoteBase.serialize(self),
AttributeBase.serialize(self), AttributeBase.serialize(self),
Refbase.serialize(self), RefBase.serialize(self),
self.rect) self.rect)
def unserialize(self,data): def unserialize(self,data):
(privacy,source_list,note,attribute_list,ref,self.rect) = data (privacy,source_list,note,attribute_list,ref,self.rect) = data
PrivateBase.unserialize(self,privacy) PrivacyBase.unserialize(self,privacy)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
NoteBase.unserialize(self,note) NoteBase.unserialize(self,note)
AttributeBase.unserialize(self,attribute_list) AttributeBase.unserialize(self,attribute_list)

2
gramps2/src/RelLib/_Name.py
View File

@ -74,7 +74,7 @@ class Name(BaseObject,PrivacyBase,SourceBase,NoteBase,DateBase):
self.first_name,self.surname,self.suffix,self.title, self.first_name,self.surname,self.suffix,self.title,
self.type,self.prefix,self.patronymic,self.sname, self.type,self.prefix,self.patronymic,self.sname,
self.group_as,self.sort_as,self.display_as) = data self.group_as,self.sort_as,self.display_as) = data
PrivateBase.unserialize(self,privacy) PrivacyBase.unserialize(self,privacy)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
NoteBase.unserialize(self,note) NoteBase.unserialize(self,note)
DateBase.unserialize(self,date) DateBase.unserialize(self,date)

2
gramps2/src/RelLib/_PersonRef.py
View File

@ -69,7 +69,7 @@ class PersonRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase):
def unserialize(self,data): def unserialize(self,data):
(privacy,source_list,note,ref,self.rel) = data (privacy,source_list,note,ref,self.rel) = data
PrivateBase.unserialize(self,privacy) PrivacyBase.unserialize(self,privacy)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
NoteBase.unserialize(self,note) NoteBase.unserialize(self,note)
RefBase.unserialize(self,ref) RefBase.unserialize(self,ref)

2
gramps2/src/RelLib/_RepoRef.py
View File

@ -73,7 +73,7 @@ class RepoRef(BaseObject,NoteBase,RefBase):
def serialize(self): def serialize(self):
return ( return (
NoteBase.serialize(self), NoteBase.serialize(self),
Refbase.serialize(self), RefBase.serialize(self),
self.call_number,self.media_type) self.call_number,self.media_type)
def unserialize(self,data): def unserialize(self,data):

2
gramps2/src/RelLib/_SourceRef.py
View File

@ -72,7 +72,7 @@ class SourceRef(BaseObject,DateBase,PrivacyBase,NoteBase,RefBase):
PrivacyBase.serialize(self), PrivacyBase.serialize(self),
NoteBase.serialize(self), NoteBase.serialize(self),
self.confidence, self.confidence,
Refbase.serialize(self), RefBase.serialize(self),
self.page,self.text) self.page,self.text)
def unserialize(self,data): def unserialize(self,data):