2007-10-08 Don Allingham <don@gramps-project.org>

* various: gen.lib integration. probably touches almost every file

	* various: gen.utils integration


svn: r9101
This commit is contained in:
Don Allingham
2007-10-08 16:41:39 +00:00
parent 8038bc0dca
commit d58641415d
245 changed files with 2315 additions and 2355 deletions

View File

@ -44,7 +44,7 @@ from ReportBase import Report, ReportUtils, ReportOptions, \
FilterListOption, \
CATEGORY_DRAW, CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI
import GrampsLocale
import RelLib
import gen.lib
from Utils import probably_alive, ProgressMeter
from FontScale import string_trim, string_width
pt2cm = ReportUtils.pt2cm
@ -84,7 +84,7 @@ class Calendar(Report):
married_name = None
names = [primary_name] + person.get_alternate_names()
for n in names:
if int(n.get_type()) == RelLib.NameType.MARRIED:
if int(n.get_type()) == gen.lib.NameType.MARRIED:
married_name = n
# Now, decide which to use:
if maiden_name != None:
@ -265,7 +265,7 @@ class Calendar(Report):
# add some things to handle maiden name:
father_lastname = None # husband, actually
if self.maiden_name == 0: # get husband's last name:
if person.get_gender() == RelLib.Person.FEMALE:
if person.get_gender() == gen.lib.Person.FEMALE:
family_list = person.get_family_handle_list()
if len(family_list) > 0:
fhandle = family_list[0] # first is primary