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
src/DataViews/_EventView.py
+2 -2
View File
@@ -31,7 +31,7 @@ __revision__ = "$Revision$"
# gramps modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import PageView
import DisplayModels
import Utils
@@ -207,7 +207,7 @@ class EventView(PageView.ListView):
def add(self, obj):
try:
EditEvent(self.dbstate, self.uistate, [], RelLib.Event())
EditEvent(self.dbstate, self.uistate, [], gen.lib.Event())
except Errors.WindowActiveError:
pass
src/DataViews/_FamilyList.py
+2 -2
View File
@@ -31,7 +31,7 @@ __revision__ = "$Revision$"
# gramps modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import PageView
import DisplayModels
import Bookmarks
@@ -193,7 +193,7 @@ class FamilyListView(PageView.ListView):
def add(self, obj):
from Editors import EditFamily
family = RelLib.Family()
family = gen.lib.Family()
try:
EditFamily(self.dbstate, self.uistate, [], family)
except Errors.WindowActiveError:
src/DataViews/_MediaView.py
+2 -2
View File
@@ -56,7 +56,7 @@ import Config
import Utils
import Bookmarks
import Mime
import RelLib
import gen.lib
from Editors import EditMedia, DeleteMediaQuery
import Errors
@@ -187,7 +187,7 @@ class MediaView(PageView.ListView):
mime = Mime.get_type(name)
if not Mime.is_valid_type(mime):
return
photo = RelLib.MediaObject()
photo = gen.lib.MediaObject()
photo.set_path(name)
photo.set_mime_type(mime)
basename = os.path.basename(name)
src/DataViews/_NoteView.py
+1 -1
View File
@@ -45,7 +45,7 @@ import Errors
import Bookmarks
import Config
import ColumnOrder
from RelLib import Note
from gen.lib import Note
from DdTargets import DdTargets
from QuestionDialog import QuestionDialog, ErrorDialog
from Filters.SideBar import NoteSidebarFilter
src/DataViews/_PedigreeView.py
+22 -22
View File
@@ -49,7 +49,7 @@ except:
# Gramps Modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import PageView
from BasicUtils import name_displayer
import Utils
@@ -81,9 +81,9 @@ class PersonBoxWidget_old( gtk.Button):
if person:
gtk.Button.__init__(self, fh.format_person(person, maxlines))
gender = person.get_gender()
if gender == RelLib.Person.MALE:
if gender == gen.lib.Person.MALE:
self.modify_bg( gtk.STATE_NORMAL, self.get_colormap().alloc_color("#F5FFFF"))
elif gender == RelLib.Person.FEMALE:
elif gender == gen.lib.Person.FEMALE:
self.modify_bg( gtk.STATE_NORMAL, self.get_colormap().alloc_color("#FFF5FF"))
else:
self.modify_bg( gtk.STATE_NORMAL, self.get_colormap().alloc_color("#FFFFF5"))
@@ -135,19 +135,19 @@ class PersonBoxWidget_cairo( gtk.DrawingArea, _PersonWidget_base):
self.text = ""
if self.person:
self.text = self.fh.format_person(self.person,self.maxlines,True)
if alive and self.person.get_gender() == RelLib.Person.MALE:
if alive and self.person.get_gender() == gen.lib.Person.MALE:
self.bgcolor = (185/256.0, 207/256.0, 231/256.0)
self.bordercolor = (32/256.0, 74/256.0, 135/256.0)
elif alive and self.person.get_gender() == RelLib.Person.FEMALE:
elif alive and self.person.get_gender() == gen.lib.Person.FEMALE:
self.bgcolor = (255/256.0, 205/256.0, 241/256.0)
self.bordercolor = (135/256.0, 32/256.0, 106/256.0)
elif alive:
self.bgcolor = (244/256.0, 220/256.0, 183/256.0)
self.bordercolor = (143/256.0, 89/256.0, 2/256.0)
elif self.person.get_gender() == RelLib.Person.MALE:
elif self.person.get_gender() == gen.lib.Person.MALE:
self.bgcolor = (185/256.0, 207/256.0, 231/256.0)
self.bordercolor = (0,0,0)
elif self.person.get_gender() == RelLib.Person.FEMALE:
elif self.person.get_gender() == gen.lib.Person.FEMALE:
self.bgcolor = (255/256.0, 205/256.0, 241/256.0)
self.bordercolor = (0,0,0)
else:
@@ -305,16 +305,16 @@ class PersonBoxWidget( gtk.DrawingArea, _PersonWidget_base):
self.shadow_gc.line_style = gtk.gdk.LINE_SOLID
self.shadow_gc.line_width = 4
if self.person:
if self.alive and self.person.get_gender() == RelLib.Person.MALE:
if self.alive and self.person.get_gender() == gen.lib.Person.MALE:
self.bg_gc.set_foreground( self.get_colormap().alloc_color("#b9cfe7"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#204a87"))
elif self.person.get_gender() == RelLib.Person.MALE:
elif self.person.get_gender() == gen.lib.Person.MALE:
self.bg_gc.set_foreground( self.get_colormap().alloc_color("#b9cfe7"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#000000"))
elif self.alive and self.person.get_gender() == RelLib.Person.FEMALE:
elif self.alive and self.person.get_gender() == gen.lib.Person.FEMALE:
self.bg_gc.set_foreground( self.get_colormap().alloc_color("#ffcdf1"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#87206a"))
elif self.person.get_gender() == RelLib.Person.FEMALE:
elif self.person.get_gender() == gen.lib.Person.FEMALE:
self.bg_gc.set_foreground( self.get_colormap().alloc_color("#ffcdf1"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#000000"))
elif self.alive:
@@ -358,7 +358,7 @@ class FormattingHelper:
text = ""
for event_ref in family.get_event_ref_list():
event = self.dbstate.db.get_event_from_handle(event_ref.ref)
if event and event.get_type() == RelLib.EventType.MARRIAGE:
if event and event.get_type() == gen.lib.EventType.MARRIAGE:
if line_count < 3:
return DateHandler.get_date(event)
name = str(event.get_type())
@@ -402,7 +402,7 @@ class FormattingHelper:
text = name
if line_count >= 3:
birth = ReportUtils.get_birth_or_fallback(self.dbstate.db, person)
if birth and use_markup and birth.get_type() != RelLib.EventType.BIRTH:
if birth and use_markup and birth.get_type() != gen.lib.EventType.BIRTH:
bdate = "<i>%s</i>" % escape(DateHandler.get_date(birth))
bplace = "<i>%s</i>" % escape(self.get_place_name(birth.get_place_handle()))
elif birth and use_markup:
@@ -415,7 +415,7 @@ class FormattingHelper:
bdate = ""
bplace = ""
death = ReportUtils.get_death_or_fallback(self.dbstate.db, person)
if death and use_markup and death.get_type() != RelLib.EventType.DEATH:
if death and use_markup and death.get_type() != gen.lib.EventType.DEATH:
ddate = "<i>%s</i>" % escape(DateHandler.get_date(death))
dplace = "<i>%s</i>" % escape(self.get_place_name(death.get_place_handle()))
elif death and use_markup:
@@ -1111,8 +1111,8 @@ class PedigreeView(PageView.PersonNavView):
if family_handle: # one parent already exists -> Edit current family
family = self.dbstate.db.get_family_from_handle(family_handle)
else: # no parents -> create new family
family = RelLib.Family()
childref = RelLib.ChildRef()
family = gen.lib.Family()
childref = gen.lib.ChildRef()
childref.set_reference_handle(person_handle)
family.add_child_ref(childref)
try:
@@ -1274,8 +1274,8 @@ class PedigreeView(PageView.PersonNavView):
if family != None:
for child_ref in family.get_child_ref_list():
if child_ref.ref == person.handle:
mrel = child_ref.mrel == RelLib.ChildRefType.BIRTH
frel = child_ref.frel == RelLib.ChildRefType.BIRTH
mrel = child_ref.mrel == gen.lib.ChildRefType.BIRTH
frel = child_ref.frel == gen.lib.ChildRefType.BIRTH
lst[index] = (person,val,family,alive)
father_handle = family.get_father_handle()
@@ -1777,10 +1777,10 @@ def build_detail_string(db,person):
else:
for event_ref in person.get_event_ref_list():
event = db.get_event_from_handle(event_ref.ref)
if event and event.get_type() == RelLib.EventType.BAPTISM:
if event and event.get_type() == gen.lib.EventType.BAPTISM:
detail_text += format_event(db, _BAPT, event)
break
if event and event.get_type() == RelLib.EventType.CHRISTEN:
if event and event.get_type() == gen.lib.EventType.CHRISTEN:
detail_text += format_event(db, _CHRI, event)
break
@@ -1791,10 +1791,10 @@ def build_detail_string(db,person):
else:
for event_ref in person.get_event_ref_list():
event = db.get_event_from_handle(event_ref.ref)
if event and event.get_type() == RelLib.EventType.BURIAL:
if event and event.get_type() == gen.lib.EventType.BURIAL:
detail_text += format_event(db, _BURI, event)
break
if event and event.get_type() == RelLib.EventType.CREMATION:
if event and event.get_type() == gen.lib.EventType.CREMATION:
detail_text += format_event(db, _CREM, event)
break
src/DataViews/_PersonView.py
+2 -2
View File
@@ -50,7 +50,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK
# GRAMPS modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
from DisplayModels import PeopleModel
import PageView
from BasicUtils import name_displayer
@@ -551,7 +551,7 @@ class PersonView(PageView.PersonNavView):
self.dirty = True
def add(self, obj):
person = RelLib.Person()
person = gen.lib.Person()
# attempt to get the current surname
src/DataViews/_PlaceView.py
+2 -2
View File
@@ -38,7 +38,7 @@ import gtk
# gramps modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import PageView
import DisplayModels
import Utils
@@ -227,7 +227,7 @@ class PlaceView(PageView.ListView):
def add(self, obj):
try:
EditPlace(self.dbstate, self.uistate, [], RelLib.Place())
EditPlace(self.dbstate, self.uistate, [], gen.lib.Place())
except Errors.WindowActiveError:
pass
src/DataViews/_RelationView.py
+17 -17
View File
@@ -46,7 +46,7 @@ import gtk
# Gramps Modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import PageView
from BasicUtils import name_displayer
import DateHandler
@@ -59,9 +59,9 @@ import gen.utils
from ReportBase import ReportUtils
_GenderCode = {
RelLib.Person.MALE : u'\u2642',
RelLib.Person.FEMALE : u'\u2640',
RelLib.Person.UNKNOWN : u'\u2650',
gen.lib.Person.MALE : u'\u2642',
gen.lib.Person.FEMALE : u'\u2640',
gen.lib.Person.UNKNOWN : u'\u2650',
}
_NAME_START = 0
@@ -745,9 +745,9 @@ class RelationshipView(PageView.PersonNavView):
elif count == 1 :
gender = self.dbstate.db.get_person_from_handle(\
child_list[0]).gender
if gender == RelLib.Person.MALE :
if gender == gen.lib.Person.MALE :
childmsg = _(" (1 brother)")
elif gender == RelLib.Person.FEMALE :
elif gender == gen.lib.Person.FEMALE :
childmsg = _(" (1 sister)")
else :
childmsg = _(" (1 sibling)")
@@ -934,7 +934,7 @@ class RelationshipView(PageView.PersonNavView):
return None
birth = ReportUtils.get_birth_or_fallback(self.dbstate.db, child)
if birth and birth.get_type != RelLib.EventType.BIRTH:
if birth and birth.get_type != gen.lib.EventType.BIRTH:
bdate = "<i>%s</i>" % cgi.escape(DateHandler.get_date(birth))
elif birth:
bdate = cgi.escape(DateHandler.get_date(birth))
@@ -942,7 +942,7 @@ class RelationshipView(PageView.PersonNavView):
bdate = ""
death = ReportUtils.get_death_or_fallback(self.dbstate.db, child)
if death and death.get_type != RelLib.EventType.DEATH:
if death and death.get_type != gen.lib.EventType.DEATH:
ddate = "<i>%s</i>" % cgi.escape(DateHandler.get_date(death))
elif death:
ddate = cgi.escape(DateHandler.get_date(death))
@@ -1030,7 +1030,7 @@ class RelationshipView(PageView.PersonNavView):
for event_ref in family.get_event_ref_list():
handle = event_ref.ref
event = self.dbstate.db.get_event_from_handle(handle)
if event.get_type() == RelLib.EventType.MARRIAGE:
if event.get_type() == gen.lib.EventType.MARRIAGE:
self.write_event_ref(vbox, _('Marriage'), event)
value = True
return value
@@ -1172,12 +1172,12 @@ class RelationshipView(PageView.PersonNavView):
def add_family(self, obj, event, handle):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
from Editors import EditFamily
family = RelLib.Family()
family = gen.lib.Family()
person = self.dbstate.active
if not person:
return
if person.gender == RelLib.Person.MALE:
if person.gender == gen.lib.Person.MALE:
family.set_father_handle(person.handle)
else:
family.set_mother_handle(person.handle)
@@ -1189,13 +1189,13 @@ class RelationshipView(PageView.PersonNavView):
def add_spouse(self, obj):
from Editors import EditFamily
family = RelLib.Family()
family = gen.lib.Family()
person = self.dbstate.active
if not person:
return
if person.gender == RelLib.Person.MALE:
if person.gender == gen.lib.Person.MALE:
family.set_father_handle(person.handle)
else:
family.set_mother_handle(person.handle)
@@ -1253,13 +1253,13 @@ class RelationshipView(PageView.PersonNavView):
def add_parents(self, obj):
from Editors import EditFamily
family = RelLib.Family()
family = gen.lib.Family()
person = self.dbstate.active
if not person:
return
ref = RelLib.ChildRef()
ref = gen.lib.ChildRef()
ref.ref = person.handle
family.add_child_ref(ref)
@@ -1271,10 +1271,10 @@ class RelationshipView(PageView.PersonNavView):
def add_parent_family(self, obj, event, handle):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
from Editors import EditFamily
family = RelLib.Family()
family = gen.lib.Family()
person = self.dbstate.active
ref = RelLib.ChildRef()
ref = gen.lib.ChildRef()
ref.ref = person.handle
family.add_child_ref(ref)
src/DataViews/_RepositoryView.py
+2 -2
View File
@@ -38,7 +38,7 @@ import gtk
# gramps modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import PageView
import DisplayModels
import Utils
@@ -190,7 +190,7 @@ class RepositoryView(PageView.ListView):
pass
def add(self, obj):
EditRepository(self.dbstate, self.uistate, [], RelLib.Repository())
EditRepository(self.dbstate, self.uistate, [], gen.lib.Repository())
def remove(self, obj):
db = self.dbstate.db
src/DataViews/_SourceView.py
+2 -2
View File
@@ -38,7 +38,7 @@ import gtk
# gramps modules
#
#-------------------------------------------------------------------------
import RelLib
import gen.lib
import Config
import PageView
import DisplayModels
@@ -189,7 +189,7 @@ class SourceView(PageView.ListView):
pass
def add(self, obj):
EditSource(self.dbstate, self.uistate, [], RelLib.Source())
EditSource(self.dbstate, self.uistate, [], gen.lib.Source())
def remove(self, obj):
for source_handle in self.selected_handles():