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

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/DisplayModels/_FamilyModel.py
View File

@@ -45,7 +45,7 @@ import ToolTips
import GrampsLocale
import DateHandler
from BasicUtils import name_displayer
import RelLib
import gen.lib
import gen.utils
from _BaseModel import BaseModel
@@ -126,10 +126,10 @@ class FamilyModel(BaseModel):
return u""
def column_type(self, data):
return str(RelLib.FamilyRelType(data[5]))
return str(gen.lib.FamilyRelType(data[5]))
def column_marriage(self, data):
erlist = [ RelLib.EventRef().unserialize(d) for d in data[6] ]
erlist = [ gen.lib.EventRef().unserialize(d) for d in data[6] ]
event = gen.utils.marriage_from_eventref_list(self.db, erlist)
if event:
return DateHandler.displayer.display(event.date)
@@ -137,7 +137,7 @@ class FamilyModel(BaseModel):
return u''
def sort_marriage(self, data):
erlist = [ RelLib.EventRef().unserialize(d) for d in data[6] ]
erlist = [ gen.lib.EventRef().unserialize(d) for d in data[6] ]
event = gen.utils.marriage_from_eventref_list(self.db, erlist)
if event:
return "%09d" % event.date.get_sort_value()
@@ -165,11 +165,11 @@ class FamilyModel(BaseModel):
def column_marker_color(self, data):
try:
col = data[FamilyModel._MARKER_COL][0]
if col == RelLib.MarkerType.COMPLETE:
if col == gen.lib.MarkerType.COMPLETE:
return self.complete_color
elif col == RelLib.MarkerType.TODO_TYPE:
elif col == gen.lib.MarkerType.TODO_TYPE:
return self.todo_color
elif col == RelLib.MarkerType.CUSTOM:
elif col == gen.lib.MarkerType.CUSTOM:
return self.custom_color
except IndexError:
pass