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

8
src/DisplayModels/_EventModel.py
View File

@@ -43,7 +43,7 @@ import gtk
import ToolTips
import GrampsLocale
import DateHandler
import RelLib
import gen.lib
from _BaseModel import BaseModel
#-------------------------------------------------------------------------
@@ -107,21 +107,21 @@ class EventModel(BaseModel):
return u''
def column_type(self,data):
return str(RelLib.EventType(data[COLUMN_TYPE]))
return str(gen.lib.EventType(data[COLUMN_TYPE]))
def column_id(self,data):
return unicode(data[COLUMN_ID])
def column_date(self,data):
if data[COLUMN_DATE]:
event = RelLib.Event()
event = gen.lib.Event()
event.unserialize(data)
return DateHandler.get_date(event)
return u''
def sort_date(self,data):
if data[COLUMN_DATE]:
event = RelLib.Event()
event = gen.lib.Event()
event.unserialize(data)
return "%09d" % event.get_date_object().get_sort_value()
return u''

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

6
src/DisplayModels/_MediaModel.py
View File

@@ -45,7 +45,7 @@ import const
import ToolTips
import GrampsLocale
import DateHandler
import RelLib
import gen.lib
from _BaseModel import BaseModel
#-------------------------------------------------------------------------
@@ -109,13 +109,13 @@ class MediaModel(BaseModel):
def column_date(self,data):
if data[9]:
date = RelLib.Date()
date = gen.lib.Date()
date.unserialize(data[9])
return unicode(DateHandler.displayer.display(date))
return u''
def sort_date(self,data):
obj = RelLib.MediaObject()
obj = gen.lib.MediaObject()
obj.unserialize(data)
d = obj.get_date_object()
if d:

12
src/DisplayModels/_NoteModel.py
View File

@@ -45,7 +45,7 @@ import const
import ToolTips
import GrampsLocale
from _BaseModel import BaseModel
import RelLib
import gen.lib
#-------------------------------------------------------------------------
#
@@ -146,12 +146,12 @@ class NoteModel(BaseModel):
return unicode(data[1])
def column_type(self,data):
temp = RelLib.NoteType()
temp = gen.lib.NoteType()
temp.set(data[4])
return unicode(str(temp))
def column_marker(self, data):
temp = RelLib.MarkerType()
temp = gen.lib.MarkerType()
temp.set(data[6])
return unicode(str(temp))
@@ -170,11 +170,11 @@ class NoteModel(BaseModel):
def column_marker_color(self, data):
try:
col = data[NoteModel._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

2
src/DisplayModels/_PeopleModel.py
View File

@@ -59,7 +59,7 @@ import gtk
#
#-------------------------------------------------------------------------
import const
from RelLib import *
from gen.lib import *
from BasicUtils import name_displayer
import DateHandler
import ToolTips

30
src/DisplayModels/_RepositoryModel.py
View File

@@ -39,7 +39,7 @@ import gtk
# GRAMPS modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
from _BaseModel import BaseModel
#-------------------------------------------------------------------------
@@ -100,7 +100,7 @@ class RepositoryModel(BaseModel):
return unicode(data[1])
def column_type(self,data):
return str(RelLib.RepositoryType(data[2]))
return str(gen.lib.RepositoryType(data[2]))
def column_name(self,data):
return unicode(data[3])
@@ -108,7 +108,7 @@ class RepositoryModel(BaseModel):
def column_city(self,data):
try:
if data[4]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[4][0])
return addr.get_city()
else:
@@ -119,7 +119,7 @@ class RepositoryModel(BaseModel):
def column_street(self,data):
try:
if data[5]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[5][0])
return addr.get_street()
else:
@@ -130,7 +130,7 @@ class RepositoryModel(BaseModel):
def column_county(self,data):
try:
if data[5]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[5][0])
return addr.get_county()
else:
@@ -141,7 +141,7 @@ class RepositoryModel(BaseModel):
def column_state(self,data):
try:
if data[5]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[5][0])
return addr.get_state()
else:
@@ -152,7 +152,7 @@ class RepositoryModel(BaseModel):
def column_country(self,data):
try:
if data[5]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[5][0])
return addr.get_country()
else:
@@ -163,7 +163,7 @@ class RepositoryModel(BaseModel):
def column_postal_code(self,data):
try:
if data[5]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[5][0])
return addr.get_postal_code()
else:
@@ -174,7 +174,7 @@ class RepositoryModel(BaseModel):
def column_phone(self,data):
try:
if data[5]:
addr = RelLib.Address()
addr = gen.lib.Address()
addr.unserialize(data[5][0])
return addr.get_phone()
else:
@@ -185,27 +185,27 @@ class RepositoryModel(BaseModel):
def column_email(self,data):
if data[6]:
for i in data[6]:
url = RelLib.Url()
url = gen.lib.Url()
url.unserialize(i)
if url.get_type() == RelLib.UrlType.EMAIL:
if url.get_type() == gen.lib.UrlType.EMAIL:
return unicode(url.path)
return u''
def column_search_url(self,data):
if data[6]:
for i in data[6]:
url = RelLib.Url()
url = gen.lib.Url()
url.unserialize(i)
if url.get_type() == RelLib.UrlType.WEB_SEARCH:
if url.get_type() == gen.lib.UrlType.WEB_SEARCH:
return unicode(url.path)
return u''
def column_home_url(self,data):
if data[6]:
for i in data[6]:
url = RelLib.Url()
url = gen.lib.Url()
url.unserialize(i)
if url.get_type() == RelLib.UrlType.WEB_HOME:
if url.get_type() == gen.lib.UrlType.WEB_HOME:
return unicode(url.path)
return u""