2006-04-19 Alex Roitman <shura@gramps-project.org>

* src/Utils.py: Remove obsolete code.
	* src/DisplayTabs.py (EventRefModel.column_role): Adapt to new types.
	* src/PeopleModel.py: Adapt to new types.
	* src/plugins/TestcaseGenerator.py: Adapt to new types.
	* src/RelLib/Makefile.am: Ship new files.
	* src/RelLib/_EventRef.py: Adapt to new types.
	* src/RelLib/_PrimaryObject.py: Adapt to new types.
	* src/RelLib/_EventRoleType.py: Add new module.
	* src/RelLib/_RepoRef.py: Adapt to new types.
	* src/RelLib/_MarkerType.py: Add new module.
	* src/RelLib/_Family.py: Adapt to new types.
	* src/RelLib/_Person.py: Adapt to new types.
	* src/RelLib/_SourceMediaType.py: Add new module.
	* src/RelLib/__init__.py: Expose new modules.
	* src/Editors/_EditPerson.py: Use new type.
	* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_9): Adapt to new types.
	* src/GrampsDb/_ConstXML.py: Comment out obsolete code.
	* src/GrampsDb/_ReadXML.py: Adapt to new types.
	* src/GrampsDb/_GrampsDbBase.py (commit_person): Properly use marker.
	* src/GrampsDb/_ReadGedcom.py: Adapt to new types.
	* src/DataViews/_FamilyView.py (write_relationship): Use new type.
	* src/DataViews/_PedigreeView.py (format_relation): Use new type.



svn: r6372
This commit is contained in:
Alex Roitman
2006-04-20 00:44:44 +00:00
parent 41a9e9205c
commit cd5518015b
24 changed files with 379 additions and 224 deletions

View File

@@ -583,15 +583,8 @@ class FamilyView(PageView.PersonNavView):
self.dbstate.change_active_handle(handle)
def write_relationship(self, family):
rtype = family.get_relationship()
if type(rtype) == tuple:
if rtype[0] == RelLib.Family.CUSTOM:
rel_text = rtype[1]
else:
rel_text = Utils.family_relations[rtype[0]]
else:
rel_text = Utils.family_relations[rtype]
self.write_data(_('Relationship type: %s') % rel_text)
self.write_data(_('Relationship type: %s') %
str(family.get_relationship()))
def place_name(self, handle):
p = self.dbstate.db.get_place_from_handle(handle)

View File

@@ -358,10 +358,11 @@ class FormattingHelper:
text = ""
for event_ref in family.get_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref)
if event and int(event.get_type) == RelLib.EventType.MARRIAGE:
if event and int(event.get_type()) == RelLib.EventType.MARRIAGE:
if line_count < 3:
return DateHandler.get_date(event)
(i,s) = event.get_type()
i = int(event.get_type())
s = str(even.get_type())
name = Utils.family_events.get(i)
text += name
text += "\n"
@@ -372,7 +373,7 @@ class FormattingHelper:
return text;
break
if not text:
text = Utils.format_family_relation(family.get_relationship())
text = str(family.get_relationship())
return text
def get_place_name( self, place_handle):