beckermj/gramps
1
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,9 @@
2007-10-08 Don Allingham <don@gramps-project.org>
* various: gen.lib integration. probably touches almost every file
2007-10-07 Don Allingham <don@gramps-project.org> 2007-10-07 Don Allingham <don@gramps-project.org>
* various: gen.utils integrationk * various: gen.utils integration
2007-10-07 Gary Burton <gary.burton@zen.co.uk> 2007-10-07 Gary Burton <gary.burton@zen.co.uk>
* src/DataViews/_RelationView.py: init scroll pos on new person, issue #442 * src/DataViews/_RelationView.py: init scroll pos on new person, issue #442

6
src/AddMedia.py
View File

@ -54,7 +54,7 @@ import gtk.glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Utils import Utils
import RelLib import gen.lib
import Mime import Mime
import GrampsDisplay import GrampsDisplay
import ManagedWindow import ManagedWindow
@ -130,7 +130,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
description = unicode(self.description.get_text()) description = unicode(self.description.get_text())
if self.internal.get_active(): if self.internal.get_active():
mobj = RelLib.MediaObject() mobj = gen.lib.MediaObject()
mobj.set_description(description) mobj.set_description(description)
mobj.set_handle(Utils.create_id()) mobj.set_handle(Utils.create_id())
mobj.set_mime_type(None) mobj.set_mime_type(None)
@ -155,7 +155,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
if description == "": if description == "":
description = os.path.basename(filename) description = os.path.basename(filename)
mobj = RelLib.MediaObject() mobj = gen.lib.MediaObject()
mobj.set_description(description) mobj.set_description(description)
mobj.set_mime_type(mtype) mobj.set_mime_type(mtype)
name = filename name = filename

26
src/BasicUtils/_NameDisplay.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Name from gen.lib import Name
from Errors import NameDisplayError from Errors import NameDisplayError
try: try:
@ -455,15 +455,15 @@ class NameDisplay:
def sorted(self,person): def sorted(self,person):
""" """
Returns a text string representing the L{RelLib.Person} instance's Returns a text string representing the L{gen.lib.Person} instance's
L{Name} in a manner that should be used for displaying a sorted L{Name} in a manner that should be used for displaying a sorted
name. name.
@param person: L{RelLib.Person} instance that contains the @param person: L{gen.lib.Person} instance that contains the
L{Name} that is to be displayed. The primary name is used for L{Name} that is to be displayed. The primary name is used for
the display. the display.
@type person: L{RelLib.Person} @type person: L{gen.lib.Person}
@returns: Returns the L{RelLib.Person} instance's name @returns: Returns the L{gen.lib.Person} instance's name
@rtype: str @rtype: str
""" """
name = person.get_primary_name() name = person.get_primary_name()
@ -499,14 +499,14 @@ class NameDisplay:
def display(self,person): def display(self,person):
""" """
Returns a text string representing the L{RelLib.Person} instance's Returns a text string representing the L{gen.lib.Person} instance's
L{Name} in a manner that should be used for normal displaying. L{Name} in a manner that should be used for normal displaying.
@param person: L{RelLib.Person} instance that contains the @param person: L{gen.lib.Person} instance that contains the
L{Name} that is to be displayed. The primary name is used for L{Name} that is to be displayed. The primary name is used for
the display. the display.
@type person: L{RelLib.Person} @type person: L{gen.lib.Person}
@returns: Returns the L{RelLib.Person} instance's name @returns: Returns the L{gen.lib.Person} instance's name
@rtype: str @rtype: str
""" """
name = person.get_primary_name() name = person.get_primary_name()
@ -514,14 +514,14 @@ class NameDisplay:
def display_formal(self,person): def display_formal(self,person):
""" """
Returns a text string representing the L{RelLib.Person} instance's Returns a text string representing the L{gen.lib.Person} instance's
L{Name} in a manner that should be used for normal displaying. L{Name} in a manner that should be used for normal displaying.
@param person: L{RelLib.Person} instance that contains the @param person: L{gen.lib.Person} instance that contains the
L{Name} that is to be displayed. The primary name is used for L{Name} that is to be displayed. The primary name is used for
the display. the display.
@type person: L{RelLib.Person} @type person: L{gen.lib.Person}
@returns: Returns the L{RelLib.Person} instance's name @returns: Returns the L{gen.lib.Person} instance's name
@rtype: str @rtype: str
""" """
# FIXME: At this time, this is just duplicating display() method # FIXME: At this time, this is just duplicating display() method

4
src/DataViews/_EventView.py
View File

@ -31,7 +31,7 @@ __revision__ = "$Revision$"
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import PageView import PageView
import DisplayModels import DisplayModels
import Utils import Utils
@ -207,7 +207,7 @@ class EventView(PageView.ListView):
def add(self, obj): def add(self, obj):
try: try:
EditEvent(self.dbstate, self.uistate, [], RelLib.Event()) EditEvent(self.dbstate, self.uistate, [], gen.lib.Event())
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass

4
src/DataViews/_FamilyList.py
View File

@ -31,7 +31,7 @@ __revision__ = "$Revision$"
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import PageView import PageView
import DisplayModels import DisplayModels
import Bookmarks import Bookmarks
@ -193,7 +193,7 @@ class FamilyListView(PageView.ListView):
def add(self, obj): def add(self, obj):
from Editors import EditFamily from Editors import EditFamily
family = RelLib.Family() family = gen.lib.Family()
try: try:
EditFamily(self.dbstate, self.uistate, [], family) EditFamily(self.dbstate, self.uistate, [], family)
except Errors.WindowActiveError: except Errors.WindowActiveError:

4
src/DataViews/_MediaView.py
View File

@ -56,7 +56,7 @@ import Config
import Utils import Utils
import Bookmarks import Bookmarks
import Mime import Mime
import RelLib import gen.lib
from Editors import EditMedia, DeleteMediaQuery from Editors import EditMedia, DeleteMediaQuery
import Errors import Errors
@ -187,7 +187,7 @@ class MediaView(PageView.ListView):
mime = Mime.get_type(name) mime = Mime.get_type(name)
if not Mime.is_valid_type(mime): if not Mime.is_valid_type(mime):
return return
photo = RelLib.MediaObject() photo = gen.lib.MediaObject()
photo.set_path(name) photo.set_path(name)
photo.set_mime_type(mime) photo.set_mime_type(mime)
basename = os.path.basename(name) basename = os.path.basename(name)

2
src/DataViews/_NoteView.py
View File

@ -45,7 +45,7 @@ import Errors
import Bookmarks import Bookmarks
import Config import Config
import ColumnOrder import ColumnOrder
from RelLib import Note from gen.lib import Note
from DdTargets import DdTargets from DdTargets import DdTargets
from QuestionDialog import QuestionDialog, ErrorDialog from QuestionDialog import QuestionDialog, ErrorDialog
from Filters.SideBar import NoteSidebarFilter from Filters.SideBar import NoteSidebarFilter

44
src/DataViews/_PedigreeView.py
View File

@ -49,7 +49,7 @@ except:
# Gramps Modules # Gramps Modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import PageView import PageView
from BasicUtils import name_displayer from BasicUtils import name_displayer
import Utils import Utils
@ -81,9 +81,9 @@ class PersonBoxWidget_old( gtk.Button):
if person: if person:
gtk.Button.__init__(self, fh.format_person(person, maxlines)) gtk.Button.__init__(self, fh.format_person(person, maxlines))
gender = person.get_gender() 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")) 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")) self.modify_bg( gtk.STATE_NORMAL, self.get_colormap().alloc_color("#FFF5FF"))
else: else:
self.modify_bg( gtk.STATE_NORMAL, self.get_colormap().alloc_color("#FFFFF5")) 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 = "" self.text = ""
if self.person: if self.person:
self.text = self.fh.format_person(self.person,self.maxlines,True) 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.bgcolor = (185/256.0, 207/256.0, 231/256.0)
self.bordercolor = (32/256.0, 74/256.0, 135/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.bgcolor = (255/256.0, 205/256.0, 241/256.0)
self.bordercolor = (135/256.0, 32/256.0, 106/256.0) self.bordercolor = (135/256.0, 32/256.0, 106/256.0)
elif alive: elif alive:
self.bgcolor = (244/256.0, 220/256.0, 183/256.0) self.bgcolor = (244/256.0, 220/256.0, 183/256.0)
self.bordercolor = (143/256.0, 89/256.0, 2/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.bgcolor = (185/256.0, 207/256.0, 231/256.0)
self.bordercolor = (0,0,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.bgcolor = (255/256.0, 205/256.0, 241/256.0)
self.bordercolor = (0,0,0) self.bordercolor = (0,0,0)
else: else:
@ -305,16 +305,16 @@ class PersonBoxWidget( gtk.DrawingArea, _PersonWidget_base):
self.shadow_gc.line_style = gtk.gdk.LINE_SOLID self.shadow_gc.line_style = gtk.gdk.LINE_SOLID
self.shadow_gc.line_width = 4 self.shadow_gc.line_width = 4
if self.person: 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.bg_gc.set_foreground( self.get_colormap().alloc_color("#b9cfe7"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#204a87")) 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.bg_gc.set_foreground( self.get_colormap().alloc_color("#b9cfe7"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#000000")) 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.bg_gc.set_foreground( self.get_colormap().alloc_color("#ffcdf1"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#87206a")) 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.bg_gc.set_foreground( self.get_colormap().alloc_color("#ffcdf1"))
self.border_gc.set_foreground( self.get_colormap().alloc_color("#000000")) self.border_gc.set_foreground( self.get_colormap().alloc_color("#000000"))
elif self.alive: elif self.alive:
@ -358,7 +358,7 @@ class FormattingHelper:
text = "" text = ""
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = self.dbstate.db.get_event_from_handle(event_ref.ref) 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: if line_count < 3:
return DateHandler.get_date(event) return DateHandler.get_date(event)
name = str(event.get_type()) name = str(event.get_type())
@ -402,7 +402,7 @@ class FormattingHelper:
text = name text = name
if line_count >= 3: if line_count >= 3:
birth = ReportUtils.get_birth_or_fallback(self.dbstate.db, person) 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)) bdate = "<i>%s</i>" % escape(DateHandler.get_date(birth))
bplace = "<i>%s</i>" % escape(self.get_place_name(birth.get_place_handle())) bplace = "<i>%s</i>" % escape(self.get_place_name(birth.get_place_handle()))
elif birth and use_markup: elif birth and use_markup:
@ -415,7 +415,7 @@ class FormattingHelper:
bdate = "" bdate = ""
bplace = "" bplace = ""
death = ReportUtils.get_death_or_fallback(self.dbstate.db, person) 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)) ddate = "<i>%s</i>" % escape(DateHandler.get_date(death))
dplace = "<i>%s</i>" % escape(self.get_place_name(death.get_place_handle())) dplace = "<i>%s</i>" % escape(self.get_place_name(death.get_place_handle()))
elif death and use_markup: elif death and use_markup:
@ -1111,8 +1111,8 @@ class PedigreeView(PageView.PersonNavView):
if family_handle: # one parent already exists -> Edit current family if family_handle: # one parent already exists -> Edit current family
family = self.dbstate.db.get_family_from_handle(family_handle) family = self.dbstate.db.get_family_from_handle(family_handle)
else: # no parents -> create new family else: # no parents -> create new family
family = RelLib.Family() family = gen.lib.Family()
childref = RelLib.ChildRef() childref = gen.lib.ChildRef()
childref.set_reference_handle(person_handle) childref.set_reference_handle(person_handle)
family.add_child_ref(childref) family.add_child_ref(childref)
try: try:
@ -1274,8 +1274,8 @@ class PedigreeView(PageView.PersonNavView):
if family != None: if family != None:
for child_ref in family.get_child_ref_list(): for child_ref in family.get_child_ref_list():
if child_ref.ref == person.handle: if child_ref.ref == person.handle:
mrel = child_ref.mrel == RelLib.ChildRefType.BIRTH mrel = child_ref.mrel == gen.lib.ChildRefType.BIRTH
frel = child_ref.frel == RelLib.ChildRefType.BIRTH frel = child_ref.frel == gen.lib.ChildRefType.BIRTH
lst[index] = (person,val,family,alive) lst[index] = (person,val,family,alive)
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
@ -1777,10 +1777,10 @@ def build_detail_string(db,person):
else: else:
for event_ref in person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
event = db.get_event_from_handle(event_ref.ref) 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) detail_text += format_event(db, _BAPT, event)
break 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) detail_text += format_event(db, _CHRI, event)
break break
@ -1791,10 +1791,10 @@ def build_detail_string(db,person):
else: else:
for event_ref in person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
event = db.get_event_from_handle(event_ref.ref) 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) detail_text += format_event(db, _BURI, event)
break 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) detail_text += format_event(db, _CREM, event)
break break

4
src/DataViews/_PersonView.py
View File

@ -50,7 +50,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
from DisplayModels import PeopleModel from DisplayModels import PeopleModel
import PageView import PageView
from BasicUtils import name_displayer from BasicUtils import name_displayer
@ -551,7 +551,7 @@ class PersonView(PageView.PersonNavView):
self.dirty = True self.dirty = True
def add(self, obj): def add(self, obj):
person = RelLib.Person() person = gen.lib.Person()
# attempt to get the current surname # attempt to get the current surname

4
src/DataViews/_PlaceView.py
View File

@ -38,7 +38,7 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import PageView import PageView
import DisplayModels import DisplayModels
import Utils import Utils
@ -227,7 +227,7 @@ class PlaceView(PageView.ListView):
def add(self, obj): def add(self, obj):
try: try:
EditPlace(self.dbstate, self.uistate, [], RelLib.Place()) EditPlace(self.dbstate, self.uistate, [], gen.lib.Place())
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass

34
src/DataViews/_RelationView.py
View File

@ -46,7 +46,7 @@ import gtk
# Gramps Modules # Gramps Modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import PageView import PageView
from BasicUtils import name_displayer from BasicUtils import name_displayer
import DateHandler import DateHandler
@ -59,9 +59,9 @@ import gen.utils
from ReportBase import ReportUtils from ReportBase import ReportUtils
_GenderCode = { _GenderCode = {
RelLib.Person.MALE : u'\u2642', gen.lib.Person.MALE : u'\u2642',
RelLib.Person.FEMALE : u'\u2640', gen.lib.Person.FEMALE : u'\u2640',
RelLib.Person.UNKNOWN : u'\u2650', gen.lib.Person.UNKNOWN : u'\u2650',
} }
_NAME_START = 0 _NAME_START = 0
@ -745,9 +745,9 @@ class RelationshipView(PageView.PersonNavView):
elif count == 1 : elif count == 1 :
gender = self.dbstate.db.get_person_from_handle(\ gender = self.dbstate.db.get_person_from_handle(\
child_list[0]).gender child_list[0]).gender
if gender == RelLib.Person.MALE : if gender == gen.lib.Person.MALE :
childmsg = _(" (1 brother)") childmsg = _(" (1 brother)")
elif gender == RelLib.Person.FEMALE : elif gender == gen.lib.Person.FEMALE :
childmsg = _(" (1 sister)") childmsg = _(" (1 sister)")
else : else :
childmsg = _(" (1 sibling)") childmsg = _(" (1 sibling)")
@ -934,7 +934,7 @@ class RelationshipView(PageView.PersonNavView):
return None return None
birth = ReportUtils.get_birth_or_fallback(self.dbstate.db, child) 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)) bdate = "<i>%s</i>" % cgi.escape(DateHandler.get_date(birth))
elif birth: elif birth:
bdate = cgi.escape(DateHandler.get_date(birth)) bdate = cgi.escape(DateHandler.get_date(birth))
@ -942,7 +942,7 @@ class RelationshipView(PageView.PersonNavView):
bdate = "" bdate = ""
death = ReportUtils.get_death_or_fallback(self.dbstate.db, child) 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)) ddate = "<i>%s</i>" % cgi.escape(DateHandler.get_date(death))
elif death: elif death:
ddate = cgi.escape(DateHandler.get_date(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(): for event_ref in family.get_event_ref_list():
handle = event_ref.ref handle = event_ref.ref
event = self.dbstate.db.get_event_from_handle(handle) 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) self.write_event_ref(vbox, _('Marriage'), event)
value = True value = True
return value return value
@ -1172,12 +1172,12 @@ class RelationshipView(PageView.PersonNavView):
def add_family(self, obj, event, handle): def add_family(self, obj, event, handle):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
from Editors import EditFamily from Editors import EditFamily
family = RelLib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
if not person: if not person:
return return
if person.gender == RelLib.Person.MALE: if person.gender == gen.lib.Person.MALE:
family.set_father_handle(person.handle) family.set_father_handle(person.handle)
else: else:
family.set_mother_handle(person.handle) family.set_mother_handle(person.handle)
@ -1189,13 +1189,13 @@ class RelationshipView(PageView.PersonNavView):
def add_spouse(self, obj): def add_spouse(self, obj):
from Editors import EditFamily from Editors import EditFamily
family = RelLib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
if not person: if not person:
return return
if person.gender == RelLib.Person.MALE: if person.gender == gen.lib.Person.MALE:
family.set_father_handle(person.handle) family.set_father_handle(person.handle)
else: else:
family.set_mother_handle(person.handle) family.set_mother_handle(person.handle)
@ -1253,13 +1253,13 @@ class RelationshipView(PageView.PersonNavView):
def add_parents(self, obj): def add_parents(self, obj):
from Editors import EditFamily from Editors import EditFamily
family = RelLib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
if not person: if not person:
return return
ref = RelLib.ChildRef() ref = gen.lib.ChildRef()
ref.ref = person.handle ref.ref = person.handle
family.add_child_ref(ref) family.add_child_ref(ref)
@ -1271,10 +1271,10 @@ class RelationshipView(PageView.PersonNavView):
def add_parent_family(self, obj, event, handle): def add_parent_family(self, obj, event, handle):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
from Editors import EditFamily from Editors import EditFamily
family = RelLib.Family() family = gen.lib.Family()
person = self.dbstate.active person = self.dbstate.active
ref = RelLib.ChildRef() ref = gen.lib.ChildRef()
ref.ref = person.handle ref.ref = person.handle
family.add_child_ref(ref) family.add_child_ref(ref)

4
src/DataViews/_RepositoryView.py
View File

@ -38,7 +38,7 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import PageView import PageView
import DisplayModels import DisplayModels
import Utils import Utils
@ -190,7 +190,7 @@ class RepositoryView(PageView.ListView):
pass pass
def add(self, obj): def add(self, obj):
EditRepository(self.dbstate, self.uistate, [], RelLib.Repository()) EditRepository(self.dbstate, self.uistate, [], gen.lib.Repository())
def remove(self, obj): def remove(self, obj):
db = self.dbstate.db db = self.dbstate.db

4
src/DataViews/_SourceView.py
View File

@ -38,7 +38,7 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Config import Config
import PageView import PageView
import DisplayModels import DisplayModels
@ -189,7 +189,7 @@ class SourceView(PageView.ListView):
pass pass
def add(self, obj): def add(self, obj):
EditSource(self.dbstate, self.uistate, [], RelLib.Source()) EditSource(self.dbstate, self.uistate, [], gen.lib.Source())
def remove(self, obj): def remove(self, obj):
for source_handle in self.selected_handles(): for source_handle in self.selected_handles():

2
src/Date.py
View File

@ -26,4 +26,4 @@ this module is only needed to to enable db upgrade
""" """
from RelLib import Date from gen.lib import Date

2
src/DateEdit.py
View File

@ -63,7 +63,7 @@ import gtk
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
import DateHandler import DateHandler
import const import const
import GrampsDisplay import GrampsDisplay

2
src/DateHandler/_DateDisplay.py
View File

@ -41,7 +41,7 @@ log = logging.getLogger(".DateDisplay")
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
import GrampsLocale import GrampsLocale
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/DateHandler/_DateParser.py
View File

@ -51,7 +51,7 @@ log = logging.getLogger(".DateParser")
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date, DateError from gen.lib import Date, DateError
import GrampsLocale import GrampsLocale
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/DateHandler/_Date_de.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_es.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_fi.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_fr.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_lt.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_nl.py
View File

@ -43,7 +43,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_pl.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_ru.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_sk.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

2
src/DateHandler/_Date_sv.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import Date from gen.lib import Date
from _DateParser import DateParser from _DateParser import DateParser
from _DateDisplay import DateDisplay from _DateDisplay import DateDisplay
from _DateHandler import register_datehandler from _DateHandler import register_datehandler

8
src/DisplayModels/_EventModel.py
View File

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

14
src/DisplayModels/_FamilyModel.py
View File

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

6
src/DisplayModels/_MediaModel.py
View File

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

12
src/DisplayModels/_NoteModel.py
View File

@ -45,7 +45,7 @@ import const
import ToolTips import ToolTips
import GrampsLocale import GrampsLocale
from _BaseModel import BaseModel from _BaseModel import BaseModel
import RelLib import gen.lib
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -146,12 +146,12 @@ class NoteModel(BaseModel):
return unicode(data[1]) return unicode(data[1])
def column_type(self,data): def column_type(self,data):
temp = RelLib.NoteType() temp = gen.lib.NoteType()
temp.set(data[4]) temp.set(data[4])
return unicode(str(temp)) return unicode(str(temp))
def column_marker(self, data): def column_marker(self, data):
temp = RelLib.MarkerType() temp = gen.lib.MarkerType()
temp.set(data[6]) temp.set(data[6])
return unicode(str(temp)) return unicode(str(temp))
@ -170,11 +170,11 @@ class NoteModel(BaseModel):
def column_marker_color(self, data): def column_marker_color(self, data):
try: try:
col = data[NoteModel._MARKER_COL][0] col = data[NoteModel._MARKER_COL][0]
if col == RelLib.MarkerType.COMPLETE: if col == gen.lib.MarkerType.COMPLETE:
return self.complete_color return self.complete_color
elif col == RelLib.MarkerType.TODO_TYPE: elif col == gen.lib.MarkerType.TODO_TYPE:
return self.todo_color return self.todo_color
elif col == RelLib.MarkerType.CUSTOM: elif col == gen.lib.MarkerType.CUSTOM:
return self.custom_color return self.custom_color
except IndexError: except IndexError:
pass pass

2
src/DisplayModels/_PeopleModel.py
View File

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

30
src/DisplayModels/_RepositoryModel.py
View File

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

4
src/DisplayTabs/_AddrEmbedList.py
View File

@ -36,7 +36,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _AddressModel import AddressModel from _AddressModel import AddressModel
@ -94,7 +94,7 @@ class AddrEmbedList(EmbeddedList):
already exists (Errors.WindowActiveError), we ignore it. This prevents already exists (Errors.WindowActiveError), we ignore it. This prevents
the dialog from coming up twice on the same object. the dialog from coming up twice on the same object.
""" """
addr = RelLib.Address() addr = gen.lib.Address()
try: try:
from Editors import EditAddress from Editors import EditAddress

4
src/DisplayTabs/_AttrEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _AttrModel import AttrModel from _AttrModel import AttrModel
@ -76,7 +76,7 @@ class AttrEmbedList(EmbeddedList):
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
pname = '' pname = ''
attr = RelLib.Attribute() attr = gen.lib.Attribute()
try: try:
self.get_editor()( self.get_editor()(
self.dbstate, self.uistate, self.track, attr, self.dbstate, self.uistate, self.track, attr,

16
src/DisplayTabs/_EventEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _EmbeddedList import EmbeddedList from _EmbeddedList import EmbeddedList
@ -84,15 +84,15 @@ class EventEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5)) return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5))
def default_type(self): def default_type(self):
return RelLib.EventType(RelLib.EventType.MARRIAGE) return gen.lib.EventType(gen.lib.EventType.MARRIAGE)
def default_role(self): def default_role(self):
return RelLib.EventRoleType(RelLib.EventRoleType.FAMILY) return gen.lib.EventRoleType(gen.lib.EventRoleType.FAMILY)
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
try: try:
ref = RelLib.EventRef() ref = gen.lib.EventRef()
event = RelLib.Event() event = gen.lib.Event()
ref.set_role(self.default_role()) ref.set_role(self.default_role())
event.set_type(self.default_type()) event.set_type(self.default_type())
self.get_ref_editor()( self.get_ref_editor()(
@ -109,7 +109,7 @@ class EventEmbedList(EmbeddedList):
event = sel.run() event = sel.run()
if event: if event:
try: try:
ref = RelLib.EventRef() ref = gen.lib.EventRef()
ref.set_role(self.default_role()) ref.set_role(self.default_role())
self.get_ref_editor()( self.get_ref_editor()(
self.dbstate, self.uistate, self.track, self.dbstate, self.uistate, self.track,
@ -151,7 +151,7 @@ class EventEmbedList(EmbeddedList):
And event reference that is from a drag and drop has And event reference that is from a drag and drop has
an unknown event reference type an unknown event reference type
""" """
from RelLib import EventRoleType from gen.lib import EventRoleType
obj.set_role((EventRoleType.UNKNOWN,'')) obj.set_role((EventRoleType.UNKNOWN,''))
EmbeddedList._handle_drag(self, row, obj) EmbeddedList._handle_drag(self, row, obj)
@ -163,7 +163,7 @@ class EventEmbedList(EmbeddedList):
def handle_extra_type(self, objtype, obj): def handle_extra_type(self, objtype, obj):
try: try:
ref = RelLib.EventRef() ref = gen.lib.EventRef()
event = self.dbstate.db.get_event_from_handle(obj) event = self.dbstate.db.get_event_from_handle(obj)
ref.set_role(self.default_role()) ref.set_role(self.default_role())
self.get_ref_editor()( self.get_ref_editor()(

6
src/DisplayTabs/_FamilyLdsEmbedList.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from _LdsEmbedList import LdsEmbedList from _LdsEmbedList import LdsEmbedList
import RelLib import gen.lib
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -61,6 +61,6 @@ class FamilyLdsEmbedList(LdsEmbedList):
return EditFamilyLdsOrd return EditFamilyLdsOrd
def new_data(self): def new_data(self):
lds = RelLib.LdsOrd() lds = gen.lib.LdsOrd()
lds.set_type(RelLib.LdsOrd.SEAL_TO_SPOUSE) lds.set_type(gen.lib.LdsOrd.SEAL_TO_SPOUSE)
return lds return lds

16
src/DisplayTabs/_GalleryTab.py
View File

@ -43,7 +43,7 @@ import os
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Utils import Utils
import ThumbNails import ThumbNails
import Errors import Errors
@ -243,7 +243,7 @@ class GalleryTab(ButtonTab):
src = am.object src = am.object
if src: if src:
sref = RelLib.MediaRef() sref = gen.lib.MediaRef()
try: try:
from Editors import EditMediaRef from Editors import EditMediaRef
@ -269,7 +269,7 @@ class GalleryTab(ButtonTab):
sel = SelectObject(self.dbstate,self.uistate,self.track) sel = SelectObject(self.dbstate,self.uistate,self.track)
src = sel.run() src = sel.run()
if src: if src:
sref = RelLib.MediaRef() sref = gen.lib.MediaRef()
try: try:
from Editors import EditMediaRef from Editors import EditMediaRef
@ -410,7 +410,7 @@ class GalleryTab(ButtonTab):
self._handle_drag(row, obj) self._handle_drag(row, obj)
self.rebuild() self.rebuild()
elif mytype == DdTargets.MEDIAOBJ.drag_type: elif mytype == DdTargets.MEDIAOBJ.drag_type:
oref = RelLib.MediaRef() oref = gen.lib.MediaRef()
oref.set_reference_handle(obj) oref.set_reference_handle(obj)
self.get_data().append(oref) self.get_data().append(oref)
self.changed = True self.changed = True
@ -425,7 +425,7 @@ class GalleryTab(ButtonTab):
mime = Mime.get_type(name) mime = Mime.get_type(name)
if not Mime.is_valid_type(mime): if not Mime.is_valid_type(mime):
return return
photo = RelLib.MediaObject() photo = gen.lib.MediaObject()
photo.set_path(name) photo.set_path(name)
photo.set_mime_type(mime) photo.set_mime_type(mime)
basename = os.path.basename(name) basename = os.path.basename(name)
@ -433,7 +433,7 @@ class GalleryTab(ButtonTab):
photo.set_description(root) photo.set_description(root)
trans = self.dbstate.db.transaction_begin() trans = self.dbstate.db.transaction_begin()
self.dbstate.db.add_object(photo, trans) self.dbstate.db.add_object(photo, trans)
oref = RelLib.MediaRef() oref = gen.lib.MediaRef()
oref.set_reference_handle(photo.get_handle()) oref.set_reference_handle(photo.get_handle())
self.get_data().append(oref) self.get_data().append(oref)
self.changed = True self.changed = True
@ -452,14 +452,14 @@ class GalleryTab(ButtonTab):
# return # return
# tfile = Utils.fix_encoding(tfile) # tfile = Utils.fix_encoding(tfile)
# mime = GrampsMime.get_type(tfile) # mime = GrampsMime.get_type(tfile)
# photo = RelLib.MediaObject() # photo = gen.lib.MediaObject()
# photo.set_mime_type(mime) # photo.set_mime_type(mime)
# photo.set_description(d) # photo.set_description(d)
# photo.set_path(tfile) # photo.set_path(tfile)
# trans = self.db.transaction_begin() # trans = self.db.transaction_begin()
# self.db.add_object(photo,trans) # self.db.add_object(photo,trans)
# self.db.transaction_commit(trans,_("Drag Media Object")) # self.db.transaction_commit(trans,_("Drag Media Object"))
# oref = RelLib.MediaRef() # oref = gen.lib.MediaRef()
# oref.set_reference_handle(photo.get_handle()) # oref.set_reference_handle(photo.get_handle())
# self.dataobj.add_media_reference(oref) # self.dataobj.add_media_reference(oref)
# self.add_thumbnail(oref) # self.add_thumbnail(oref)

4
src/DisplayTabs/_LdsEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from _LdsModel import LdsModel from _LdsModel import LdsModel
from _EmbeddedList import EmbeddedList from _EmbeddedList import EmbeddedList
@ -65,7 +65,7 @@ class LdsEmbedList(EmbeddedList):
return EditLdsOrd return EditLdsOrd
def new_data(self): def new_data(self):
return RelLib.LdsOrd() return gen.lib.LdsOrd()
def get_data(self): def get_data(self):
return self.data return self.data

4
src/DisplayTabs/_LocationEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _LocationModel import LocationModel from _LocationModel import LocationModel
@ -68,7 +68,7 @@ class LocationEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4)) return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
loc = RelLib.Location() loc = gen.lib.Location()
try: try:
from Editors import EditLocation from Editors import EditLocation

4
src/DisplayTabs/_NameEmbedList.py
View File

@ -39,7 +39,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _NameModel import NameModel from _NameModel import NameModel
@ -93,7 +93,7 @@ class NameEmbedList(EmbeddedList):
self.callback() self.callback()
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
name = RelLib.Name() name = gen.lib.Name()
try: try:
from Editors import EditName from Editors import EditName

4
src/DisplayTabs/_NoteTab.py
View File

@ -42,7 +42,7 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import Spell import Spell
import Errors import Errors
import RelLib import gen.lib
from DisplayTabs import log from DisplayTabs import log
from _NoteModel import NoteModel from _NoteModel import NoteModel
from _EmbeddedList import EmbeddedList from _EmbeddedList import EmbeddedList
@ -104,7 +104,7 @@ class NoteTab(EmbeddedList):
return ((1, 0), (1, 1)) return ((1, 0), (1, 1))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
note = RelLib.Note() note = gen.lib.Note()
if self.notetype : if self.notetype :
note.set_type(self.notetype) note.set_type(self.notetype)
try: try:

12
src/DisplayTabs/_PersonEventEmbedList.py
View File

@ -25,12 +25,12 @@
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
from _EventEmbedList import EventEmbedList from _EventEmbedList import EventEmbedList
_std_types = [ _std_types = [
RelLib.EventType(RelLib.EventType.BIRTH), gen.lib.EventType(gen.lib.EventType.BIRTH),
RelLib.EventType(RelLib.EventType.DEATH), gen.lib.EventType(gen.lib.EventType.DEATH),
] ]
@ -48,7 +48,7 @@ class PersonEventEmbedList(EventEmbedList):
return self.obj.get_event_ref_list() return self.obj.get_event_ref_list()
def default_role(self): def default_role(self):
return RelLib.EventRoleType(RelLib.EventRoleType.PRIMARY) return gen.lib.EventRoleType(gen.lib.EventRoleType.PRIMARY)
def default_type(self): def default_type(self):
type_list = [] type_list = []
@ -62,8 +62,8 @@ class PersonEventEmbedList(EventEmbedList):
for etype in _std_types: for etype in _std_types:
if etype not in type_list: if etype not in type_list:
return RelLib.EventType(etype) return gen.lib.EventType(etype)
return RelLib.EventType(RelLib.EventType.BIRTH) return gen.lib.EventType(gen.lib.EventType.BIRTH)
def get_ref_editor(self): def get_ref_editor(self):
from Editors import EditEventRef from Editors import EditEventRef

6
src/DisplayTabs/_PersonRefEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _PersonRefModel import PersonRefModel from _PersonRefModel import PersonRefModel
@ -73,7 +73,7 @@ class PersonRefEmbedList(EmbeddedList):
from Editors import EditPersonRef from Editors import EditPersonRef
try: try:
ref = RelLib.PersonRef() ref = gen.lib.PersonRef()
ref.rel = _('Godfather') ref.rel = _('Godfather')
EditPersonRef( EditPersonRef(
self.dbstate, self.uistate, self.track, self.dbstate, self.uistate, self.track,
@ -106,7 +106,7 @@ class PersonRefEmbedList(EmbeddedList):
""" """
try: try:
from Editors import EditPersonRef from Editors import EditPersonRef
ref = RelLib.PersonRef(obj) ref = gen.lib.PersonRef(obj)
ref.rel = _('Unknown') ref.rel = _('Unknown')
EditPersonRef( EditPersonRef(
self.dbstate, self.uistate, self.track, self.dbstate, self.uistate, self.track,

10
src/DisplayTabs/_RepoEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _RepoRefModel import RepoRefModel from _RepoRefModel import RepoRefModel
@ -81,7 +81,7 @@ class RepoEmbedList(EmbeddedList):
try: try:
from Editors import EditRepoRef from Editors import EditRepoRef
ref = RelLib.RepoRef() ref = gen.lib.RepoRef()
repo = self.dbstate.db.get_repository_from_handle(obj) repo = self.dbstate.db.get_repository_from_handle(obj)
EditRepoRef( EditRepoRef(
self.dbstate, self.uistate, self.track, self.dbstate, self.uistate, self.track,
@ -90,8 +90,8 @@ class RepoEmbedList(EmbeddedList):
pass pass
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
ref = RelLib.RepoRef() ref = gen.lib.RepoRef()
repo = RelLib.Repository() repo = gen.lib.Repository()
try: try:
from Editors import EditRepoRef from Editors import EditRepoRef
@ -116,7 +116,7 @@ class RepoEmbedList(EmbeddedList):
try: try:
from Editors import EditRepoRef from Editors import EditRepoRef
ref = RelLib.RepoRef() ref = gen.lib.RepoRef()
EditRepoRef(self.dbstate, EditRepoRef(self.dbstate,
self.uistate, self.uistate,
self.track, self.track,

10
src/DisplayTabs/_SourceEmbedList.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _SourceRefModel import SourceRefModel from _SourceRefModel import SourceRefModel
@ -81,8 +81,8 @@ class SourceEmbedList(EmbeddedList):
try: try:
from Editors import EditSourceRef from Editors import EditSourceRef
sref = RelLib.SourceRef() sref = gen.lib.SourceRef()
src = RelLib.Source() src = gen.lib.Source()
EditSourceRef( EditSourceRef(
self.dbstate, self.dbstate,
self.uistate, self.uistate,
@ -103,7 +103,7 @@ class SourceEmbedList(EmbeddedList):
try: try:
from Editors import EditSourceRef from Editors import EditSourceRef
ref = RelLib.SourceRef() ref = gen.lib.SourceRef()
EditSourceRef(self.dbstate, EditSourceRef(self.dbstate,
self.uistate, self.uistate,
self.track, self.track,
@ -146,7 +146,7 @@ class SourceEmbedList(EmbeddedList):
self.rebuild() self.rebuild()
def handle_extra_type(self, objtype, obj): def handle_extra_type(self, objtype, obj):
sref = RelLib.SourceRef() sref = gen.lib.SourceRef()
src = self.dbstate.db.get_source_from_handle(obj) src = self.dbstate.db.get_source_from_handle(obj)
try: try:
from Editors import EditSourceRef from Editors import EditSourceRef

4
src/DisplayTabs/_WebEmbedList.py
View File

@ -33,7 +33,7 @@ import gtk
# GRAMPS classes # GRAMPS classes
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
import Errors import Errors
from DdTargets import DdTargets from DdTargets import DdTargets
from _WebModel import WebModel from _WebModel import WebModel
@ -70,7 +70,7 @@ class WebEmbedList(EmbeddedList):
return ((1, 0), (1, 1), (1, 2)) return ((1, 0), (1, 1), (1, 2))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
url = RelLib.Url() url = gen.lib.Url()
try: try:
from Editors import EditUrl from Editors import EditUrl

2
src/Editors/_EditAddress.py
View File

@ -47,7 +47,7 @@ import gtk.glade
import const import const
import Config import Config
from _EditSecondary import EditSecondary from _EditSecondary import EditSecondary
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab
from GrampsWidgets import * from GrampsWidgets import *

2
src/Editors/_EditAttribute.py
View File

@ -50,7 +50,7 @@ import gtk.glade
import const import const
import Config import Config
from _EditSecondary import EditSecondary from _EditSecondary import EditSecondary
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab
from GrampsWidgets import * from GrampsWidgets import *

2
src/Editors/_EditChildRef.py
View File

@ -46,7 +46,7 @@ import gtk.glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
from _EditSecondary import EditSecondary from _EditSecondary import EditSecondary
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab
from GrampsWidgets import * from GrampsWidgets import *

6
src/Editors/_EditEvent.py
View File

@ -41,7 +41,7 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
import GrampsDisplay import GrampsDisplay
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
@ -73,7 +73,7 @@ class EditEvent(EditPrimary):
self.commit_event = self.db.commit_event self.commit_event = self.db.commit_event
def empty_object(self): def empty_object(self):
return RelLib.Event() return gen.lib.Event()
def get_menu_title(self): def get_menu_title(self):
if self.obj.get_handle(): if self.obj.get_handle():
@ -167,7 +167,7 @@ class EditEvent(EditPrimary):
self.note_tab = self._add_tab( self.note_tab = self._add_tab(
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), notetype=RelLib.NoteType.EVENT)) self.obj.get_note_list(), notetype=gen.lib.NoteType.EVENT))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook, notebook,

8
src/Editors/_EditEventRef.py
View File

@ -41,7 +41,7 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
from DisplayTabs import SourceEmbedList,NoteTab,GalleryTab,EventBackRefList,AttrEmbedList from DisplayTabs import SourceEmbedList,NoteTab,GalleryTab,EventBackRefList,AttrEmbedList
from GrampsWidgets import * from GrampsWidgets import *
@ -172,13 +172,13 @@ class EditEventRef(EditReference):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_list(), self.source.get_note_list(),
notetype=RelLib.NoteType.EVENT)) notetype=gen.lib.NoteType.EVENT))
self.note_ref_tab = self._add_tab( self.note_ref_tab = self._add_tab(
notebook_ref, notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_list(), self.source_ref.get_note_list(),
notetype=RelLib.NoteType.EVENTREF)) notetype=gen.lib.NoteType.EVENTREF))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook, notebook,
@ -238,5 +238,5 @@ class EditFamilyEventRef(EditEventRef):
self.add_event = self.db.add_family_event self.add_event = self.db.add_family_event
def get_custom_events(self): def get_custom_events(self):
return [ RelLib.EventType((RelLib.EventType.CUSTOM,val)) \ return [ gen.lib.EventType((gen.lib.EventType.CUSTOM,val)) \
for val in self.dbstate.db.get_family_event_types()] for val in self.dbstate.db.get_family_event_types()]

30
src/Editors/_EditFamily.py
View File

@ -51,7 +51,7 @@ import gtk
import const import const
import Utils import Utils
from BasicUtils import name_displayer from BasicUtils import name_displayer
import RelLib import gen.lib
import Config import Config
import Errors import Errors
@ -197,7 +197,7 @@ class ChildEmbedList(EmbeddedList):
def add_button_clicked(self,obj): def add_button_clicked(self,obj):
from Editors import EditPerson from Editors import EditPerson
person = RelLib.Person() person = gen.lib.Person()
autoname = Config.get(Config.SURNAME_GUESSING) autoname = Config.get(Config.SURNAME_GUESSING)
if autoname == 0: if autoname == 0:
name = self.north_american() name = self.north_american()
@ -212,7 +212,7 @@ class ChildEmbedList(EmbeddedList):
self.new_child_added) self.new_child_added)
def new_child_added(self, person): def new_child_added(self, person):
ref = RelLib.ChildRef() ref = gen.lib.ChildRef()
ref.ref = person.get_handle() ref.ref = person.get_handle()
self.family.add_child_ref(ref) self.family.add_child_ref(ref)
self.rebuild() self.rebuild()
@ -232,7 +232,7 @@ class ChildEmbedList(EmbeddedList):
person = sel.run() person = sel.run()
if person: if person:
ref = RelLib.ChildRef() ref = gen.lib.ChildRef()
ref.ref = person.get_handle() ref.ref = person.get_handle()
self.family.add_child_ref(ref) self.family.add_child_ref(ref)
self.rebuild() self.rebuild()
@ -319,7 +319,7 @@ class ChildEmbedList(EmbeddedList):
self._move(row_from, row, obj) self._move(row_from, row, obj)
else: else:
handle = obj handle = obj
obj = RelLib.ChildRef() obj = gen.lib.ChildRef()
obj.ref = handle obj.ref = handle
self._handle_drag(row, obj) self._handle_drag(row, obj)
self.rebuild() self.rebuild()
@ -363,7 +363,7 @@ class FastMaleFilter:
def match(self, handle): def match(self, handle):
value = self.db.get_raw_person_data(handle) value = self.db.get_raw_person_data(handle)
return value[2] == RelLib.Person.MALE return value[2] == gen.lib.Person.MALE
class FastFemaleFilter: class FastFemaleFilter:
@ -372,7 +372,7 @@ class FastFemaleFilter:
def match(self, handle): def match(self, handle):
value = self.db.get_raw_person_data(handle) value = self.db.get_raw_person_data(handle)
return value[2] == RelLib.Person.FEMALE return value[2] == gen.lib.Person.FEMALE
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -413,7 +413,7 @@ class EditFamily(EditPrimary):
self.add_parent = False self.add_parent = False
def empty_object(self): def empty_object(self):
return RelLib.Family() return gen.lib.Family()
def _local_init(self): def _local_init(self):
self.build_interface() self.build_interface()
@ -581,7 +581,7 @@ class EditFamily(EditPrimary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.get_menu_title(), self.obj.get_note_list(), self.get_menu_title(),
notetype=RelLib.NoteType.FAMILY)) notetype=gen.lib.NoteType.FAMILY))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook, notebook,
@ -612,15 +612,15 @@ class EditFamily(EditPrimary):
def add_mother_clicked(self, obj): def add_mother_clicked(self, obj):
from Editors import EditPerson from Editors import EditPerson
person = RelLib.Person() person = gen.lib.Person()
person.set_gender(RelLib.Person.FEMALE) person.set_gender(gen.lib.Person.FEMALE)
EditPerson(self.dbstate, self.uistate, self.track, person, EditPerson(self.dbstate, self.uistate, self.track, person,
self.new_mother_added) self.new_mother_added)
def add_father_clicked(self, obj): def add_father_clicked(self, obj):
from Editors import EditPerson from Editors import EditPerson
person = RelLib.Person() person = gen.lib.Person()
person.set_gender(RelLib.Person.MALE) person.set_gender(gen.lib.Person.MALE)
EditPerson(self.dbstate, self.uistate, self.track, EditPerson(self.dbstate, self.uistate, self.track,
person, self.new_father_added) person, self.new_father_added)
@ -662,7 +662,7 @@ class EditFamily(EditPrimary):
self.update_mother(person.handle) self.update_mother(person.handle)
def on_change_father(self, selector_window, obj): def on_change_father(self, selector_window, obj):
if obj.__class__ == RelLib.Person: if obj.__class__ == gen.lib.Person:
try: try:
person = obj person = obj
self.obj.set_father_handle(person.get_handle()) self.obj.set_father_handle(person.get_handle())
@ -677,7 +677,7 @@ class EditFamily(EditPrimary):
log.warn( log.warn(
"Object selector returned obj.__class__ = %s, it should " "Object selector returned obj.__class__ = %s, it should "
"have been of type %s." % (obj.__class__.__name__, "have been of type %s." % (obj.__class__.__name__,
RelLib.Person.__name__)) gen.lib.Person.__name__))
selector_window.close() selector_window.close()

142
src/Editors/_EditLdsOrd.py
View File

@ -49,7 +49,7 @@ import gtk.glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
from BasicUtils import name_displayer from BasicUtils import name_displayer
import LdsUtils import LdsUtils
@ -59,65 +59,65 @@ from DisplayTabs import SourceEmbedList,NoteTab
from GrampsWidgets import * from GrampsWidgets import *
_DATA_MAP = { _DATA_MAP = {
RelLib.LdsOrd.BAPTISM : [ gen.lib.LdsOrd.BAPTISM : [
RelLib.LdsOrd.STATUS_NONE, gen.lib.LdsOrd.STATUS_NONE,
RelLib.LdsOrd.STATUS_CHILD, gen.lib.LdsOrd.STATUS_CHILD,
RelLib.LdsOrd.STATUS_CLEARED, gen.lib.LdsOrd.STATUS_CLEARED,
RelLib.LdsOrd.STATUS_COMPLETED, gen.lib.LdsOrd.STATUS_COMPLETED,
RelLib.LdsOrd.STATUS_INFANT, gen.lib.LdsOrd.STATUS_INFANT,
RelLib.LdsOrd.STATUS_PRE_1970, gen.lib.LdsOrd.STATUS_PRE_1970,
RelLib.LdsOrd.STATUS_QUALIFIED, gen.lib.LdsOrd.STATUS_QUALIFIED,
RelLib.LdsOrd.STATUS_STILLBORN, gen.lib.LdsOrd.STATUS_STILLBORN,
RelLib.LdsOrd.STATUS_SUBMITTED, gen.lib.LdsOrd.STATUS_SUBMITTED,
RelLib.LdsOrd.STATUS_UNCLEARED, gen.lib.LdsOrd.STATUS_UNCLEARED,
], ],
RelLib.LdsOrd.CONFIRMATION : [ gen.lib.LdsOrd.CONFIRMATION : [
RelLib.LdsOrd.STATUS_NONE, gen.lib.LdsOrd.STATUS_NONE,
RelLib.LdsOrd.STATUS_CHILD, gen.lib.LdsOrd.STATUS_CHILD,
RelLib.LdsOrd.STATUS_CLEARED, gen.lib.LdsOrd.STATUS_CLEARED,
RelLib.LdsOrd.STATUS_COMPLETED, gen.lib.LdsOrd.STATUS_COMPLETED,
RelLib.LdsOrd.STATUS_INFANT, gen.lib.LdsOrd.STATUS_INFANT,
RelLib.LdsOrd.STATUS_PRE_1970, gen.lib.LdsOrd.STATUS_PRE_1970,
RelLib.LdsOrd.STATUS_QUALIFIED, gen.lib.LdsOrd.STATUS_QUALIFIED,
RelLib.LdsOrd.STATUS_STILLBORN, gen.lib.LdsOrd.STATUS_STILLBORN,
RelLib.LdsOrd.STATUS_SUBMITTED, gen.lib.LdsOrd.STATUS_SUBMITTED,
RelLib.LdsOrd.STATUS_UNCLEARED, gen.lib.LdsOrd.STATUS_UNCLEARED,
], ],
RelLib.LdsOrd.ENDOWMENT: [ gen.lib.LdsOrd.ENDOWMENT: [
RelLib.LdsOrd.STATUS_NONE, gen.lib.LdsOrd.STATUS_NONE,
RelLib.LdsOrd.STATUS_CHILD, gen.lib.LdsOrd.STATUS_CHILD,
RelLib.LdsOrd.STATUS_CLEARED, gen.lib.LdsOrd.STATUS_CLEARED,
RelLib.LdsOrd.STATUS_COMPLETED, gen.lib.LdsOrd.STATUS_COMPLETED,
RelLib.LdsOrd.STATUS_INFANT, gen.lib.LdsOrd.STATUS_INFANT,
RelLib.LdsOrd.STATUS_PRE_1970, gen.lib.LdsOrd.STATUS_PRE_1970,
RelLib.LdsOrd.STATUS_QUALIFIED, gen.lib.LdsOrd.STATUS_QUALIFIED,
RelLib.LdsOrd.STATUS_STILLBORN, gen.lib.LdsOrd.STATUS_STILLBORN,
RelLib.LdsOrd.STATUS_SUBMITTED, gen.lib.LdsOrd.STATUS_SUBMITTED,
RelLib.LdsOrd.STATUS_UNCLEARED, gen.lib.LdsOrd.STATUS_UNCLEARED,
], ],
RelLib.LdsOrd.SEAL_TO_PARENTS:[ gen.lib.LdsOrd.SEAL_TO_PARENTS:[
RelLib.LdsOrd.STATUS_NONE, gen.lib.LdsOrd.STATUS_NONE,
RelLib.LdsOrd.STATUS_BIC, gen.lib.LdsOrd.STATUS_BIC,
RelLib.LdsOrd.STATUS_CLEARED, gen.lib.LdsOrd.STATUS_CLEARED,
RelLib.LdsOrd.STATUS_COMPLETED, gen.lib.LdsOrd.STATUS_COMPLETED,
RelLib.LdsOrd.STATUS_DNS, gen.lib.LdsOrd.STATUS_DNS,
RelLib.LdsOrd.STATUS_PRE_1970, gen.lib.LdsOrd.STATUS_PRE_1970,
RelLib.LdsOrd.STATUS_QUALIFIED, gen.lib.LdsOrd.STATUS_QUALIFIED,
RelLib.LdsOrd.STATUS_STILLBORN, gen.lib.LdsOrd.STATUS_STILLBORN,
RelLib.LdsOrd.STATUS_SUBMITTED, gen.lib.LdsOrd.STATUS_SUBMITTED,
RelLib.LdsOrd.STATUS_UNCLEARED, gen.lib.LdsOrd.STATUS_UNCLEARED,
], ],
RelLib.LdsOrd.SEAL_TO_SPOUSE :[ gen.lib.LdsOrd.SEAL_TO_SPOUSE :[
RelLib.LdsOrd.STATUS_NONE, gen.lib.LdsOrd.STATUS_NONE,
RelLib.LdsOrd.STATUS_CANCELED, gen.lib.LdsOrd.STATUS_CANCELED,
RelLib.LdsOrd.STATUS_CLEARED, gen.lib.LdsOrd.STATUS_CLEARED,
RelLib.LdsOrd.STATUS_COMPLETED, gen.lib.LdsOrd.STATUS_COMPLETED,
RelLib.LdsOrd.STATUS_DNS, gen.lib.LdsOrd.STATUS_DNS,
RelLib.LdsOrd.STATUS_PRE_1970, gen.lib.LdsOrd.STATUS_PRE_1970,
RelLib.LdsOrd.STATUS_QUALIFIED, gen.lib.LdsOrd.STATUS_QUALIFIED,
RelLib.LdsOrd.STATUS_DNS_CAN, gen.lib.LdsOrd.STATUS_DNS_CAN,
RelLib.LdsOrd.STATUS_SUBMITTED, gen.lib.LdsOrd.STATUS_SUBMITTED,
RelLib.LdsOrd.STATUS_UNCLEARED, gen.lib.LdsOrd.STATUS_UNCLEARED,
], ],
} }
@ -160,10 +160,10 @@ class EditLdsOrd(EditSecondary):
self.define_ok_button(self.top.get_widget('ok'),self.save) self.define_ok_button(self.top.get_widget('ok'),self.save)
def _get_types(self): def _get_types(self):
return (RelLib.LdsOrd.BAPTISM, return (gen.lib.LdsOrd.BAPTISM,
RelLib.LdsOrd.ENDOWMENT, gen.lib.LdsOrd.ENDOWMENT,
RelLib.LdsOrd.CONFIRMATION, gen.lib.LdsOrd.CONFIRMATION,
RelLib.LdsOrd.SEAL_TO_PARENTS) gen.lib.LdsOrd.SEAL_TO_PARENTS)
def _setup_fields(self): def _setup_fields(self):
@ -197,7 +197,7 @@ class EditLdsOrd(EditSecondary):
self.top.get_widget('type'), self.top.get_widget('type'),
self.obj.set_type, self.obj.set_type,
self.obj.get_type, self.obj.get_type,
[(item[1],item[0]) for item in RelLib.LdsOrd._TYPE_MAP [(item[1],item[0]) for item in gen.lib.LdsOrd._TYPE_MAP
if item[0] in self._get_types()], if item[0] in self._get_types()],
self.db.readonly, self.db.readonly,
changed=self.ord_type_changed) changed=self.ord_type_changed)
@ -213,7 +213,7 @@ class EditLdsOrd(EditSecondary):
self.top.get_widget('status'), self.top.get_widget('status'),
self.obj.set_status, self.obj.set_status,
self.obj.get_status, self.obj.get_status,
[(item[1],item[0]) for item in RelLib.LdsOrd._STATUS_MAP [(item[1],item[0]) for item in gen.lib.LdsOrd._STATUS_MAP
if item[0] in _DATA_MAP[self.obj.get_type()] ], if item[0] in _DATA_MAP[self.obj.get_type()] ],
self.db.readonly) self.db.readonly)
@ -221,19 +221,19 @@ class EditLdsOrd(EditSecondary):
self.update_parent_label() self.update_parent_label()
def ord_type_changed(self): def ord_type_changed(self):
if self.obj.get_type() == RelLib.LdsOrd.BAPTISM: if self.obj.get_type() == gen.lib.LdsOrd.BAPTISM:
self.parents.hide() self.parents.hide()
self.parents_label.hide() self.parents_label.hide()
self.parents_select.hide() self.parents_select.hide()
elif self.obj.get_type() == RelLib.LdsOrd.ENDOWMENT: elif self.obj.get_type() == gen.lib.LdsOrd.ENDOWMENT:
self.parents.hide() self.parents.hide()
self.parents_label.hide() self.parents_label.hide()
self.parents_select.hide() self.parents_select.hide()
elif self.obj.get_type() == RelLib.LdsOrd.SEAL_TO_PARENTS: elif self.obj.get_type() == gen.lib.LdsOrd.SEAL_TO_PARENTS:
self.parents.show() self.parents.show()
self.parents_label.show() self.parents_label.show()
self.parents_select.show() self.parents_select.show()
new_data = [(item[1],item[0]) for item in RelLib.LdsOrd._STATUS_MAP new_data = [(item[1],item[0]) for item in gen.lib.LdsOrd._STATUS_MAP
if item[0] in _DATA_MAP[self.obj.get_type()] ] if item[0] in _DATA_MAP[self.obj.get_type()] ]
self.status_menu.change_menu(new_data) self.status_menu.change_menu(new_data)
@ -247,7 +247,7 @@ class EditLdsOrd(EditSecondary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.obj.get_note_list(),
notetype=RelLib.NoteType.LDS)) notetype=gen.lib.NoteType.LDS))
self._setup_notebook_tabs( notebook) self._setup_notebook_tabs( notebook)
notebook.show_all() notebook.show_all()
@ -345,7 +345,7 @@ class EditFamilyLdsOrd(EditSecondary):
self.define_ok_button(self.top.get_widget('ok'),self.save) self.define_ok_button(self.top.get_widget('ok'),self.save)
def _get_types(self): def _get_types(self):
return (RelLib.LdsOrd.SEAL_TO_SPOUSE,) return (gen.lib.LdsOrd.SEAL_TO_SPOUSE,)
def _setup_fields(self): def _setup_fields(self):
@ -379,7 +379,7 @@ class EditFamilyLdsOrd(EditSecondary):
self.top.get_widget('type'), self.top.get_widget('type'),
self.obj.set_type, self.obj.set_type,
self.obj.get_type, self.obj.get_type,
[(item[1],item[0]) for item in RelLib.LdsOrd._TYPE_MAP [(item[1],item[0]) for item in gen.lib.LdsOrd._TYPE_MAP
if item[0] in self._get_types()], if item[0] in self._get_types()],
self.db.readonly) self.db.readonly)
@ -394,7 +394,7 @@ class EditFamilyLdsOrd(EditSecondary):
self.top.get_widget('status'), self.top.get_widget('status'),
self.obj.set_status, self.obj.set_status,
self.obj.get_status, self.obj.get_status,
[(item[1],item[0]) for item in RelLib.LdsOrd._STATUS_MAP [(item[1],item[0]) for item in gen.lib.LdsOrd._STATUS_MAP
if item[0] in _DATA_MAP[self.obj.get_type()]], if item[0] in _DATA_MAP[self.obj.get_type()]],
self.db.readonly) self.db.readonly)
@ -408,7 +408,7 @@ class EditFamilyLdsOrd(EditSecondary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.obj.get_note_list(),
notetype=RelLib.NoteType.LDS)) notetype=gen.lib.NoteType.LDS))
notebook.show_all() notebook.show_all()
self.top.get_widget('vbox').pack_start(notebook,True) self.top.get_widget('vbox').pack_start(notebook,True)

8
src/Editors/_EditMedia.py
View File

@ -43,7 +43,7 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
import Mime import Mime
import ThumbNails import ThumbNails
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
@ -64,7 +64,7 @@ class EditMedia(EditPrimary):
state.db.get_object_from_handle) state.db.get_object_from_handle)
def empty_object(self): def empty_object(self):
return RelLib.MediaObject() return gen.lib.MediaObject()
def get_menu_title(self): def get_menu_title(self):
if self.obj.get_handle(): if self.obj.get_handle():
@ -156,13 +156,13 @@ class EditMedia(EditPrimary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.obj.get_note_list(),
notetype=RelLib.NoteType.MEDIA)) notetype=gen.lib.NoteType.MEDIA))
else: else:
self.note_tab = self._add_tab( self.note_tab = self._add_tab(
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.obj.get_note_list(),
notetype=RelLib.NoteType.MEDIA)) notetype=gen.lib.NoteType.MEDIA))
self.src_list = self._add_tab( self.src_list = self._add_tab(
notebook, notebook,

2
src/Editors/_EditMediaRef.py
View File

@ -43,7 +43,7 @@ import const
import Config import Config
import Mime import Mime
import ThumbNails import ThumbNails
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import \ from DisplayTabs import \
SourceEmbedList,AttrEmbedList,MediaBackRefList,NoteTab SourceEmbedList,AttrEmbedList,MediaBackRefList,NoteTab

2
src/Editors/_EditName.py
View File

@ -44,7 +44,7 @@ import Config
import Utils import Utils
from BasicUtils import name_displayer from BasicUtils import name_displayer
from _EditSecondary import EditSecondary from _EditSecondary import EditSecondary
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import SourceEmbedList,NoteTab from DisplayTabs import SourceEmbedList,NoteTab
from GrampsWidgets import * from GrampsWidgets import *

2
src/Editors/_EditNote.py
View File

@ -47,7 +47,7 @@ import GrampsDisplay
import MarkupText import MarkupText
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
from GrampsWidgets import * from GrampsWidgets import *
from RelLib import Note from gen.lib import Note
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

28
src/Editors/_EditPerson.py
View File

@ -51,7 +51,7 @@ import gtk
import const import const
import Utils import Utils
import Mime import Mime
import RelLib import gen.lib
import GrampsWidgets import GrampsWidgets
from BasicUtils import name_displayer from BasicUtils import name_displayer
import Errors import Errors
@ -101,7 +101,7 @@ class EditPerson(EditPrimary):
Returns an empty Person object for comparison for changes. This Returns an empty Person object for comparison for changes. This
is used by the base class (EditPrimary) is used by the base class (EditPrimary)
""" """
return RelLib.Person() return gen.lib.Person()
def get_menu_title(self): def get_menu_title(self):
if self.obj.get_handle(): if self.obj.get_handle():
@ -120,7 +120,7 @@ class EditPerson(EditPrimary):
self.pname = self.obj.get_primary_name() self.pname = self.obj.get_primary_name()
self.should_guess_gender = (not self.obj.get_gramps_id() and self.should_guess_gender = (not self.obj.get_gramps_id() and
self.obj.get_gender () == self.obj.get_gender () ==
RelLib.Person.UNKNOWN) gen.lib.Person.UNKNOWN)
self.load_obj = None self.load_obj = None
self.load_rect = None self.load_rect = None
@ -203,9 +203,9 @@ class EditPerson(EditPrimary):
self.obj.set_gender, self.obj.set_gender,
self.obj.get_gender, self.obj.get_gender,
( (
(_('female'), RelLib.Person.FEMALE), (_('female'), gen.lib.Person.FEMALE),
(_('male'), RelLib.Person.MALE), (_('male'), gen.lib.Person.MALE),
(_('unknown'), RelLib.Person.UNKNOWN) (_('unknown'), gen.lib.Person.UNKNOWN)
), ),
self.db.readonly) self.db.readonly)
@ -315,7 +315,7 @@ class EditPerson(EditPrimary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.get_menu_title(), self.obj.get_note_list(), self.get_menu_title(),
notetype=RelLib.NoteType.PERSON)) notetype=gen.lib.NoteType.PERSON))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook, notebook,
@ -561,7 +561,7 @@ class EditPerson(EditPrimary):
self.obj_photo.hide() self.obj_photo.hide()
def _check_for_unknown_gender(self): def _check_for_unknown_gender(self):
if self.obj.get_gender() == RelLib.Person.UNKNOWN: if self.obj.get_gender() == gen.lib.Person.UNKNOWN:
d = GenderDialog(self.window) d = GenderDialog(self.window)
gender = d.run() gender = d.run()
d.destroy() d.destroy()
@ -604,7 +604,7 @@ class EditPerson(EditPrimary):
if original: if original:
(female, male, unknown) = _select_gender[self.obj.get_gender()] (female, male, unknown) = _select_gender[self.obj.get_gender()]
if male and original.get_gender() != RelLib.Person.MALE: if male and original.get_gender() != gen.lib.Person.MALE:
for tmp_handle in self.obj.get_family_handle_list(): for tmp_handle in self.obj.get_family_handle_list():
temp_family = self.db.get_family_from_handle(tmp_handle) temp_family = self.db.get_family_from_handle(tmp_handle)
if self.obj == temp_family.get_mother_handle(): if self.obj == temp_family.get_mother_handle():
@ -613,7 +613,7 @@ class EditPerson(EditPrimary):
else: else:
temp_family.set_mother_handle(None) temp_family.set_mother_handle(None)
temp_family.set_father_handle(self.obj) temp_family.set_father_handle(self.obj)
elif female and original != RelLib.Person.FEMALE: elif female and original != gen.lib.Person.FEMALE:
for tmp_handle in self.obj.get_family_handle_list(): for tmp_handle in self.obj.get_family_handle_list():
temp_family = self.db.get_family_from_handle(tmp_handle) temp_family = self.db.get_family_from_handle(tmp_handle)
if self.obj == temp_family.get_father_handle(): if self.obj == temp_family.get_father_handle():
@ -622,7 +622,7 @@ class EditPerson(EditPrimary):
else: else:
temp_family.set_father_handle(None) temp_family.set_father_handle(None)
temp_family.set_mother_handle(self.obj) temp_family.set_mother_handle(self.obj)
elif unknown and original.get_gender() != RelLib.Person.UNKNOWN: elif unknown and original.get_gender() != gen.lib.Person.UNKNOWN:
for tmp_handle in self.obj.get_family_handle_list(): for tmp_handle in self.obj.get_family_handle_list():
temp_family = self.db.get_family_from_handle(tmp_handle) temp_family = self.db.get_family_from_handle(tmp_handle)
if self.obj == temp_family.get_father_handle(): if self.obj == temp_family.get_father_handle():
@ -821,6 +821,6 @@ class GenderDialog(gtk.MessageDialog):
_("The gender of the person is currently unknown. " _("The gender of the person is currently unknown. "
"Usually, this is a mistake. Please specify the gender.")) "Usually, this is a mistake. Please specify the gender."))
self.add_button(_('Male'), RelLib.Person.MALE) self.add_button(_('Male'), gen.lib.Person.MALE)
self.add_button(_('Female'), RelLib.Person.FEMALE) self.add_button(_('Female'), gen.lib.Person.FEMALE)
self.add_button(_('Unknown'), RelLib.Person.UNKNOWN) self.add_button(_('Unknown'), gen.lib.Person.UNKNOWN)

2
src/Editors/_EditPersonRef.py
View File

@ -48,7 +48,7 @@ import const
import Config import Config
from BasicUtils import name_displayer from BasicUtils import name_displayer
from _EditSecondary import EditSecondary from _EditSecondary import EditSecondary
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import SourceEmbedList, NoteTab from DisplayTabs import SourceEmbedList, NoteTab
from GrampsWidgets import * from GrampsWidgets import *

6
src/Editors/_EditPlace.py
View File

@ -44,7 +44,7 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
from DisplayTabs import * from DisplayTabs import *
@ -63,7 +63,7 @@ class EditPlace(EditPrimary):
dbstate.db.get_place_from_handle, callback) dbstate.db.get_place_from_handle, callback)
def empty_object(self): def empty_object(self):
return RelLib.Place() return gen.lib.Place()
def _local_init(self): def _local_init(self):
self.top = gtk.glade.XML(const.GLADE_FILE,"place_editor","gramps") self.top = gtk.glade.XML(const.GLADE_FILE,"place_editor","gramps")
@ -180,7 +180,7 @@ class EditPlace(EditPrimary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.get_menu_title(), self.obj.get_note_list(), self.get_menu_title(),
notetype=RelLib.NoteType.PLACE)) notetype=gen.lib.NoteType.PLACE))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook, notebook,

2
src/Editors/_EditRepoRef.py
View File

@ -42,7 +42,7 @@ import gtk
import const import const
import Config import Config
from RelLib import NoteType from gen.lib import NoteType
from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList
from GrampsWidgets import * from GrampsWidgets import *

6
src/Editors/_EditRepository.py
View File

@ -41,7 +41,7 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
from GrampsWidgets import * from GrampsWidgets import *
from DisplayTabs import AddrEmbedList,WebEmbedList,NoteTab,SourceBackRefList from DisplayTabs import AddrEmbedList,WebEmbedList,NoteTab,SourceBackRefList
@ -55,7 +55,7 @@ class EditRepository(EditPrimary):
repository, dbstate.db.get_repository_from_handle) repository, dbstate.db.get_repository_from_handle)
def empty_object(self): def empty_object(self):
return RelLib.Repository() return gen.lib.Repository()
def get_menu_title(self): def get_menu_title(self):
if self.obj.get_handle(): if self.obj.get_handle():
@ -125,7 +125,7 @@ class EditRepository(EditPrimary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.get_menu_title(), self.obj.get_note_list(), self.get_menu_title(),
notetype=RelLib.NoteType.REPO)) notetype=gen.lib.NoteType.REPO))
self.backref_tab = self._add_tab( self.backref_tab = self._add_tab(
notebook, notebook,

6
src/Editors/_EditSource.py
View File

@ -44,7 +44,7 @@ import gtk.glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import Config import Config
import RelLib import gen.lib
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
from DisplayTabs import \ from DisplayTabs import \
@ -64,7 +64,7 @@ class EditSource(EditPrimary):
source, dbstate.db.get_source_from_handle) source, dbstate.db.get_source_from_handle)
def empty_object(self): def empty_object(self):
return RelLib.Source() return gen.lib.Source()
def get_menu_title(self): def get_menu_title(self):
title = self.obj.get_title() title = self.obj.get_title()
@ -131,7 +131,7 @@ class EditSource(EditPrimary):
notebook, notebook,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.obj.get_note_list(), self.get_menu_title(), self.obj.get_note_list(), self.get_menu_title(),
RelLib.NoteType.SOURCE)) gen.lib.NoteType.SOURCE))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook, notebook,

16
src/Editors/_EditSourceRef.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import RelLib import gen.lib
from DisplayTabs import \ from DisplayTabs import \
NoteTab,TextTab,GalleryTab,SourceBackRefList,DataEmbedList,RepoEmbedList NoteTab,TextTab,GalleryTab,SourceBackRefList,DataEmbedList,RepoEmbedList
@ -112,11 +112,11 @@ class EditSourceRef(EditReference):
self.top.get_widget('confidence'), self.top.get_widget('confidence'),
self.source_ref.set_confidence_level, self.source_ref.set_confidence_level,
self.source_ref.get_confidence_level, [ self.source_ref.get_confidence_level, [
(_('Very Low'), RelLib.SourceRef.CONF_VERY_LOW), (_('Very Low'), gen.lib.SourceRef.CONF_VERY_LOW),
(_('Low'), RelLib.SourceRef.CONF_LOW), (_('Low'), gen.lib.SourceRef.CONF_LOW),
(_('Normal'), RelLib.SourceRef.CONF_NORMAL), (_('Normal'), gen.lib.SourceRef.CONF_NORMAL),
(_('High'), RelLib.SourceRef.CONF_HIGH), (_('High'), gen.lib.SourceRef.CONF_HIGH),
(_('Very High'), RelLib.SourceRef.CONF_VERY_HIGH)], (_('Very High'), gen.lib.SourceRef.CONF_VERY_HIGH)],
self.db.readonly) self.db.readonly)
self.date = MonitoredDate( self.date = MonitoredDate(
@ -141,7 +141,7 @@ class EditSourceRef(EditReference):
notebook_src, notebook_src,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_list(), self.source.get_note_list(),
notetype=RelLib.NoteType.SOURCE)) notetype=gen.lib.NoteType.SOURCE))
self.gallery_tab = self._add_tab( self.gallery_tab = self._add_tab(
notebook_src, notebook_src,
@ -173,7 +173,7 @@ class EditSourceRef(EditReference):
notebook_ref, notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track, NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_list(), self.source_ref.get_note_list(),
notetype=RelLib.NoteType.SOURCEREF)) notetype=gen.lib.NoteType.SOURCEREF))
self._setup_notebook_tabs( notebook_src) self._setup_notebook_tabs( notebook_src)
self._setup_notebook_tabs( notebook_ref) self._setup_notebook_tabs( notebook_ref)

18
src/FilterEditor/_EditRule.py
View File

@ -56,7 +56,7 @@ import gobject
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsDisplay import GrampsDisplay
import const import const
import RelLib import gen.lib
from Filters import Rules from Filters import Rules
import AutoComp import AutoComp
from Selectors import selector_factory from Selectors import selector_factory
@ -78,14 +78,14 @@ def by_rule_name(f,s):
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_name2typeclass = { _name2typeclass = {
_('Personal event:') : RelLib.EventType, _('Personal event:') : gen.lib.EventType,
_('Family event:') : RelLib.EventType, _('Family event:') : gen.lib.EventType,
_('Event type:') : RelLib.EventType, _('Event type:') : gen.lib.EventType,
_('Personal attribute:') : RelLib.AttributeType, _('Personal attribute:') : gen.lib.AttributeType,
_('Family attribute:') : RelLib.AttributeType, _('Family attribute:') : gen.lib.AttributeType,
_('Relationship type:') : RelLib.FamilyRelType, _('Relationship type:') : gen.lib.FamilyRelType,
_('Marker type:') : RelLib.MarkerType, _('Marker type:') : gen.lib.MarkerType,
_('Note type:') : RelLib.NoteType, _('Note type:') : gen.lib.NoteType,
} }
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Event/_HasType.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import EventType from gen.lib import EventType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Family/_HasRelType.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import FamilyRelType from gen.lib import FamilyRelType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Note/_HasNote.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import NoteType from gen.lib import NoteType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Person/_HasBirth.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from RelLib import EventType,EventRoleType from gen.lib import EventType,EventRoleType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Person/_HasCompleteRecord.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import MarkerType from gen.lib import MarkerType
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/Filters/Rules/Person/_HasDeath.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from RelLib import EventType,EventRoleType from gen.lib import EventType,EventRoleType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Person/_HasEvent.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import EventRoleType from gen.lib import EventRoleType
from Filters.Rules._HasEventBase import HasEventBase from Filters.Rules._HasEventBase import HasEventBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Person/_HasFamilyEvent.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from RelLib import EventType from gen.lib import EventType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/Person/_HasRelationship.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import FamilyRelType from gen.lib import FamilyRelType
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/Filters/Rules/Person/_HasUnknownGender.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import Person from gen.lib import Person
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/Filters/Rules/Person/_HaveAltFamilies.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import ChildRefType from gen.lib import ChildRefType
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "People who were adopted" # "People who were adopted"

2
src/Filters/Rules/Person/_IsFemale.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import Person from gen.lib import Person
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/Filters/Rules/Person/_IsMale.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import Person from gen.lib import Person
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/Filters/Rules/Person/_IsWitness.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
from RelLib import EventRoleType, EventType from gen.lib import EventRoleType, EventType
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# "Witnesses" # "Witnesses"

2
src/Filters/Rules/Repository/_HasRepo.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import RepositoryType from gen.lib import RepositoryType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/_HasAttributeBase.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import AttributeType from gen.lib import AttributeType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/_HasEventBase.py
View File

@ -33,7 +33,7 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import DateHandler import DateHandler
from RelLib import EventType from gen.lib import EventType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

2
src/Filters/Rules/_HasMarkerBase.py
View File

@ -32,7 +32,7 @@ from gettext import gettext as _
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import MarkerType from gen.lib import MarkerType
from Filters.Rules._Rule import Rule from Filters.Rules._Rule import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

6
src/Filters/SideBar/_EventSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
import RelLib import gen.lib
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules
@ -61,8 +61,8 @@ class EventSidebarFilter(SidebarFilter):
def create_widget(self): def create_widget(self):
self.filter_id = gtk.Entry() self.filter_id = gtk.Entry()
self.filter_desc = gtk.Entry() self.filter_desc = gtk.Entry()
self.filter_event = RelLib.Event() self.filter_event = gen.lib.Event()
self.filter_event.set_type((RelLib.EventType.CUSTOM,u'')) self.filter_event.set_type((gen.lib.EventType.CUSTOM,u''))
self.etype = gtk.ComboBoxEntry() self.etype = gtk.ComboBoxEntry()
self.event_menu = GrampsWidgets.MonitoredDataType( self.event_menu = GrampsWidgets.MonitoredDataType(

14
src/Filters/SideBar/_FamilySidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
import RelLib import gen.lib
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules
@ -64,12 +64,12 @@ class FamilySidebarFilter(SidebarFilter):
self.filter_mother = gtk.Entry() self.filter_mother = gtk.Entry()
self.filter_child = gtk.Entry() self.filter_child = gtk.Entry()
self.filter_event = RelLib.Event() self.filter_event = gen.lib.Event()
self.filter_event.set_type((RelLib.EventType.CUSTOM,u'')) self.filter_event.set_type((gen.lib.EventType.CUSTOM,u''))
self.etype = gtk.ComboBoxEntry() self.etype = gtk.ComboBoxEntry()
self.family_stub = RelLib.Family() self.family_stub = gen.lib.Family()
self.family_stub.set_relationship((RelLib.FamilyRelType.CUSTOM,u'')) self.family_stub.set_relationship((gen.lib.FamilyRelType.CUSTOM,u''))
self.rtype = gtk.ComboBoxEntry() self.rtype = gtk.ComboBoxEntry()
self.event_menu = GrampsWidgets.MonitoredDataType( self.event_menu = GrampsWidgets.MonitoredDataType(
@ -82,8 +82,8 @@ class FamilySidebarFilter(SidebarFilter):
self.family_stub.set_relationship, self.family_stub.set_relationship,
self.family_stub.get_relationship) self.family_stub.get_relationship)
self.filter_marker = RelLib.Family() self.filter_marker = gen.lib.Family()
self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,u'')) self.filter_marker.set_marker((gen.lib.MarkerType.CUSTOM,u''))
self.mtype = gtk.ComboBoxEntry() self.mtype = gtk.ComboBoxEntry()
self.marker_menu = GrampsWidgets.MonitoredDataType( self.marker_menu = GrampsWidgets.MonitoredDataType(
self.mtype, self.mtype,

2
src/Filters/SideBar/_MediaSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
import RelLib import gen.lib
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules

2
src/Filters/SideBar/_NoteSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
from RelLib import Note, NoteType from gen.lib import Note, NoteType
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules

22
src/Filters/SideBar/_PersonSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
import RelLib import gen.lib
import DateHandler import DateHandler
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
@ -72,16 +72,16 @@ class PersonSidebarFilter(SidebarFilter):
self.filter_id = gtk.Entry() self.filter_id = gtk.Entry()
self.filter_birth = gtk.Entry() self.filter_birth = gtk.Entry()
self.filter_death = gtk.Entry() self.filter_death = gtk.Entry()
self.filter_event = RelLib.Event() self.filter_event = gen.lib.Event()
self.filter_event.set_type((RelLib.EventType.CUSTOM, u'')) self.filter_event.set_type((gen.lib.EventType.CUSTOM, u''))
self.etype = gtk.ComboBoxEntry() self.etype = gtk.ComboBoxEntry()
self.event_menu = GrampsWidgets.MonitoredDataType( self.event_menu = GrampsWidgets.MonitoredDataType(
self.etype, self.etype,
self.filter_event.set_type, self.filter_event.set_type,
self.filter_event.get_type) self.filter_event.get_type)
self.filter_marker = RelLib.Person() self.filter_marker = gen.lib.Person()
self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM, u'')) self.filter_marker.set_marker((gen.lib.MarkerType.CUSTOM, u''))
self.mtype = gtk.ComboBoxEntry() self.mtype = gtk.ComboBoxEntry()
self.marker_menu = GrampsWidgets.MonitoredDataType( self.marker_menu = GrampsWidgets.MonitoredDataType(
self.mtype, self.mtype,
@ -102,13 +102,13 @@ class PersonSidebarFilter(SidebarFilter):
self.generic.add_attribute(cell, 'text', 0) self.generic.add_attribute(cell, 'text', 0)
self.on_filters_changed('Person') self.on_filters_changed('Person')
exdate1 = RelLib.Date() exdate1 = gen.lib.Date()
exdate2 = RelLib.Date() exdate2 = gen.lib.Date()
exdate1.set(RelLib.Date.QUAL_NONE, RelLib.Date.MOD_RANGE, exdate1.set(gen.lib.Date.QUAL_NONE, gen.lib.Date.MOD_RANGE,
RelLib.Date.CAL_GREGORIAN, (0, 0, 1800, False, gen.lib.Date.CAL_GREGORIAN, (0, 0, 1800, False,
0, 0, 1900, False)) 0, 0, 1900, False))
exdate2.set(RelLib.Date.QUAL_NONE, RelLib.Date.MOD_BEFORE, exdate2.set(gen.lib.Date.QUAL_NONE, gen.lib.Date.MOD_BEFORE,
RelLib.Date.CAL_GREGORIAN, (0, 0, 1850, False)) gen.lib.Date.CAL_GREGORIAN, (0, 0, 1850, False))
msg1 = DateHandler.displayer.display(exdate1) msg1 = DateHandler.displayer.display(exdate1)
msg2 = DateHandler.displayer.display(exdate2) msg2 = DateHandler.displayer.display(exdate2)

2
src/Filters/SideBar/_PlaceSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
import RelLib import gen.lib
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules

2
src/Filters/SideBar/_RepoSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
from RelLib import Repository, RepositoryType from gen.lib import Repository, RepositoryType
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules

2
src/Filters/SideBar/_SourceSidebarFilter.py
View File

@ -40,7 +40,7 @@ import gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsWidgets import GrampsWidgets
import RelLib import gen.lib
from _SidebarFilter import SidebarFilter from _SidebarFilter import SidebarFilter
from Filters import GenericFilterFactory, build_filter_model, Rules from Filters import GenericFilterFactory, build_filter_model, Rules

18
src/Filters/_GenericFilter.py
View File

@ -24,7 +24,7 @@
Package providing filtering framework for GRAMPS. Package providing filtering framework for GRAMPS.
""" """
import RelLib import gen.lib
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# GenericFilter # GenericFilter
@ -100,7 +100,7 @@ class GenericFilter:
return db.get_person_cursor() return db.get_person_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Person() return gen.lib.Person()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_person_from_handle(handle) return db.get_person_from_handle(handle)
@ -213,7 +213,7 @@ class GenericFamilyFilter(GenericFilter):
return db.get_family_cursor() return db.get_family_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Family() return gen.lib.Family()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_family_from_handle(handle) return db.get_family_from_handle(handle)
@ -227,7 +227,7 @@ class GenericEventFilter(GenericFilter):
return db.get_event_cursor() return db.get_event_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Event() return gen.lib.Event()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_event_from_handle(handle) return db.get_event_from_handle(handle)
@ -241,7 +241,7 @@ class GenericSourceFilter(GenericFilter):
return db.get_source_cursor() return db.get_source_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Source() return gen.lib.Source()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_source_from_handle(handle) return db.get_source_from_handle(handle)
@ -255,7 +255,7 @@ class GenericPlaceFilter(GenericFilter):
return db.get_place_cursor() return db.get_place_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Place() return gen.lib.Place()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_place_from_handle(handle) return db.get_place_from_handle(handle)
@ -269,7 +269,7 @@ class GenericMediaFilter(GenericFilter):
return db.get_media_cursor() return db.get_media_cursor()
def make_obj(self): def make_obj(self):
return RelLib.MediaObject() return gen.lib.MediaObject()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_object_from_handle(handle) return db.get_object_from_handle(handle)
@ -283,7 +283,7 @@ class GenericRepoFilter(GenericFilter):
return db.get_repository_cursor() return db.get_repository_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Repository() return gen.lib.Repository()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_repository_from_handle(handle) return db.get_repository_from_handle(handle)
@ -297,7 +297,7 @@ class GenericNoteFilter(GenericFilter):
return db.get_note_cursor() return db.get_note_cursor()
def make_obj(self): def make_obj(self):
return RelLib.Note() return gen.lib.Note()
def find_from_handle(self, db, handle): def find_from_handle(self, db, handle):
return db.get_note_from_handle(handle) return db.get_note_from_handle(handle)

6
src/GrampsCfg.py
View File

@ -43,7 +43,7 @@ import gtk
import Config import Config
import DateHandler import DateHandler
from BasicUtils import name_displayer as _nd from BasicUtils import name_displayer as _nd
from RelLib import Name from gen.lib import Name
import ManagedWindow import ManagedWindow
from GrampsWidgets import * from GrampsWidgets import *
import QuestionDialog import QuestionDialog
@ -73,7 +73,7 @@ def set_calendar_date_format():
DateHandler.set_format(Config.get_date_format(format_list)) DateHandler.set_format(Config.get_date_format(format_list))
def get_researcher(): def get_researcher():
import RelLib import gen.lib
n = Config.get(Config.RESEARCHER_NAME) n = Config.get(Config.RESEARCHER_NAME)
a = Config.get(Config.RESEARCHER_ADDR) a = Config.get(Config.RESEARCHER_ADDR)
@ -84,7 +84,7 @@ def get_researcher():
ph = Config.get(Config.RESEARCHER_PHONE) ph = Config.get(Config.RESEARCHER_PHONE)
e = Config.get(Config.RESEARCHER_EMAIL) e = Config.get(Config.RESEARCHER_EMAIL)
owner = RelLib.Researcher() owner = gen.lib.Researcher()
owner.set(n, a, c, s, ct, p, ph, e) owner.set(n, a, c, s, ct, p, ph, e)
return owner return owner

2
src/GrampsDb/_GrampsBSDDB.py
View File

@ -44,7 +44,7 @@ __LOG = logging.getLogger(".GrampsDb")
# Gramps modules # Gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import * from gen.lib import *
from gen.db.base import * from gen.db.base import *
from gen.utils import db_copy from gen.utils import db_copy
import gen.db.const as const import gen.db.const as const

24
src/GrampsDb/_GrampsDbWriteXML.py
View File

@ -51,7 +51,7 @@ log = logging.getLogger(".WriteXML")
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import RelLib import gen.lib
from BasicUtils import UpdateCallback from BasicUtils import UpdateCallback
from gen.db.dbconst import \ from gen.db.dbconst import \
@ -443,9 +443,9 @@ class GrampsDbXmlWriter(UpdateCallback):
def write_person(self,person,index=1): def write_person(self,person,index=1):
sp = " "*index sp = " "*index
self.write_primary_tag("person",person,index) self.write_primary_tag("person",person,index)
if person.get_gender() == RelLib.Person.MALE: if person.get_gender() == gen.lib.Person.MALE:
self.write_line("gender","M",index+1) self.write_line("gender","M",index+1)
elif person.get_gender() == RelLib.Person.FEMALE: elif person.get_gender() == gen.lib.Person.FEMALE:
self.write_line("gender","F",index+1) self.write_line("gender","F",index+1)
else: else:
self.write_line("gender","U",index+1) self.write_line("gender","U",index+1)
@ -774,15 +774,15 @@ class GrampsDbXmlWriter(UpdateCallback):
sp = ' '*indent sp = ' '*indent
cal= date.get_calendar() cal= date.get_calendar()
if cal != RelLib.Date.CAL_GREGORIAN: if cal != gen.lib.Date.CAL_GREGORIAN:
calstr = ' cformat="%s"' % RelLib.Date.calendar_names[cal] calstr = ' cformat="%s"' % gen.lib.Date.calendar_names[cal]
else: else:
calstr = '' calstr = ''
qual = date.get_quality() qual = date.get_quality()
if qual == RelLib.Date.QUAL_ESTIMATED: if qual == gen.lib.Date.QUAL_ESTIMATED:
qual_str = ' quality="estimated"' qual_str = ' quality="estimated"'
elif qual == RelLib.Date.QUAL_CALCULATED: elif qual == gen.lib.Date.QUAL_CALCULATED:
qual_str = ' quality="calculated"' qual_str = ' quality="calculated"'
else: else:
qual_str = "" qual_str = ""
@ -790,7 +790,7 @@ class GrampsDbXmlWriter(UpdateCallback):
mode = date.get_modifier() mode = date.get_modifier()
if date.is_compound(): if date.is_compound():
if mode == RelLib.Date.MOD_RANGE: if mode == gen.lib.Date.MOD_RANGE:
tagname = 'daterange' tagname = 'daterange'
else: else:
tagname = 'datespan' tagname = 'datespan'
@ -800,16 +800,16 @@ class GrampsDbXmlWriter(UpdateCallback):
if d1 != "" or d2 != "": if d1 != "" or d2 != "":
self.g.write('%s<%s start="%s" stop="%s"%s%s/>\n' self.g.write('%s<%s start="%s" stop="%s"%s%s/>\n'
% (sp,tagname,d1,d2,qual_str,calstr)) % (sp,tagname,d1,d2,qual_str,calstr))
elif mode != RelLib.Date.MOD_TEXTONLY: elif mode != gen.lib.Date.MOD_TEXTONLY:
date_str = self.get_iso_date(date.get_start_date()) date_str = self.get_iso_date(date.get_start_date())
if date_str == "": if date_str == "":
return return
if mode == RelLib.Date.MOD_BEFORE: if mode == gen.lib.Date.MOD_BEFORE:
mode_str = ' type="before"' mode_str = ' type="before"'
elif mode == RelLib.Date.MOD_AFTER: elif mode == gen.lib.Date.MOD_AFTER:
mode_str = ' type="after"' mode_str = ' type="after"'
elif mode == RelLib.Date.MOD_ABOUT: elif mode == gen.lib.Date.MOD_ABOUT:
mode_str = ' type="about"' mode_str = ' type="about"'
else: else:
mode_str = "" mode_str = ""

2
src/GrampsDb/_GrampsGEDDB.py
View File

@ -25,7 +25,7 @@ Provides the GRAMPS DB interface for supporting in-memory editing
of GEDCOM files. of GEDCOM files.
""" """
from RelLib import * from gen.lib import *
from _GrampsInMemDB import * from _GrampsInMemDB import *
from _GrampsDbExceptions import GrampsDbException from _GrampsDbExceptions import GrampsDbException

2
src/GrampsDb/_GrampsInMemDB.py
View File

@ -37,7 +37,7 @@ import time
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import * from gen.lib import *
from _GrampsDbBase import * from _GrampsDbBase import *
from _GrampsCursor import GrampsCursor from _GrampsCursor import GrampsCursor

2
src/GrampsDb/_GrampsXMLDB.py
View File

@ -28,7 +28,7 @@ of GRAMPS XML format.
import logging import logging
log = logging.getLogger(".GrampsDb") log = logging.getLogger(".GrampsDb")
from RelLib import * from gen.lib import *
from _GrampsInMemDB import * from _GrampsInMemDB import *
from _GrampsDbExceptions import GrampsDbException from _GrampsDbExceptions import GrampsDbException

132
src/GrampsDbUtils/_GedcomInfo.py
View File

@ -32,7 +32,7 @@ import os
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const import const
import RelLib import gen.lib
ADOPT_NONE = 0 ADOPT_NONE = 0
ADOPT_EVENT = 1 ADOPT_EVENT = 1
@ -65,67 +65,67 @@ SOURCE_REFS_YES = 1
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
familyConstantEvents = { familyConstantEvents = {
RelLib.EventType.ANNULMENT : "ANUL", gen.lib.EventType.ANNULMENT : "ANUL",
RelLib.EventType.DIV_FILING : "DIVF", gen.lib.EventType.DIV_FILING : "DIVF",
RelLib.EventType.DIVORCE : "DIV", gen.lib.EventType.DIVORCE : "DIV",
RelLib.EventType.CENSUS : "CENS", gen.lib.EventType.CENSUS : "CENS",
RelLib.EventType.ENGAGEMENT : "ENGA", gen.lib.EventType.ENGAGEMENT : "ENGA",
RelLib.EventType.MARR_BANNS : "MARB", gen.lib.EventType.MARR_BANNS : "MARB",
RelLib.EventType.MARR_CONTR : "MARC", gen.lib.EventType.MARR_CONTR : "MARC",
RelLib.EventType.MARR_LIC : "MARL", gen.lib.EventType.MARR_LIC : "MARL",
RelLib.EventType.MARR_SETTL : "MARS", gen.lib.EventType.MARR_SETTL : "MARS",
RelLib.EventType.MARRIAGE : "MARR" gen.lib.EventType.MARRIAGE : "MARR"
} }
personalConstantEvents = { personalConstantEvents = {
RelLib.EventType.ADOPT : "ADOP", gen.lib.EventType.ADOPT : "ADOP",
RelLib.EventType.ADULT_CHRISTEN : "CHRA", gen.lib.EventType.ADULT_CHRISTEN : "CHRA",
RelLib.EventType.BIRTH : "BIRT", gen.lib.EventType.BIRTH : "BIRT",
RelLib.EventType.DEATH : "DEAT", gen.lib.EventType.DEATH : "DEAT",
RelLib.EventType.BAPTISM : "BAPM", gen.lib.EventType.BAPTISM : "BAPM",
RelLib.EventType.BAR_MITZVAH : "BARM", gen.lib.EventType.BAR_MITZVAH : "BARM",
RelLib.EventType.BAS_MITZVAH : "BASM", gen.lib.EventType.BAS_MITZVAH : "BASM",
RelLib.EventType.BLESS : "BLES", gen.lib.EventType.BLESS : "BLES",
RelLib.EventType.BURIAL : "BURI", gen.lib.EventType.BURIAL : "BURI",
RelLib.EventType.CAUSE_DEATH : "CAUS", gen.lib.EventType.CAUSE_DEATH : "CAUS",
RelLib.EventType.ORDINATION : "ORDN", gen.lib.EventType.ORDINATION : "ORDN",
RelLib.EventType.CENSUS : "CENS", gen.lib.EventType.CENSUS : "CENS",
RelLib.EventType.CHRISTEN : "CHR" , gen.lib.EventType.CHRISTEN : "CHR" ,
RelLib.EventType.CONFIRMATION : "CONF", gen.lib.EventType.CONFIRMATION : "CONF",
RelLib.EventType.CREMATION : "CREM", gen.lib.EventType.CREMATION : "CREM",
RelLib.EventType.DEGREE : "_DEG", gen.lib.EventType.DEGREE : "_DEG",
RelLib.EventType.DIV_FILING : "DIVF", gen.lib.EventType.DIV_FILING : "DIVF",
RelLib.EventType.EDUCATION : "EDUC", gen.lib.EventType.EDUCATION : "EDUC",
RelLib.EventType.ELECTED : "", gen.lib.EventType.ELECTED : "",
RelLib.EventType.EMIGRATION : "EMIG", gen.lib.EventType.EMIGRATION : "EMIG",
RelLib.EventType.FIRST_COMMUN : "FCOM", gen.lib.EventType.FIRST_COMMUN : "FCOM",
RelLib.EventType.GRADUATION : "GRAD", gen.lib.EventType.GRADUATION : "GRAD",
RelLib.EventType.MED_INFO : "_MDCL", gen.lib.EventType.MED_INFO : "_MDCL",
RelLib.EventType.MILITARY_SERV : "_MILT", gen.lib.EventType.MILITARY_SERV : "_MILT",
RelLib.EventType.NATURALIZATION : "NATU", gen.lib.EventType.NATURALIZATION : "NATU",
RelLib.EventType.NOB_TITLE : "TITL", gen.lib.EventType.NOB_TITLE : "TITL",
RelLib.EventType.NUM_MARRIAGES : "NMR", gen.lib.EventType.NUM_MARRIAGES : "NMR",
RelLib.EventType.IMMIGRATION : "IMMI", gen.lib.EventType.IMMIGRATION : "IMMI",
RelLib.EventType.OCCUPATION : "OCCU", gen.lib.EventType.OCCUPATION : "OCCU",
RelLib.EventType.PROBATE : "PROB", gen.lib.EventType.PROBATE : "PROB",
RelLib.EventType.PROPERTY : "PROP", gen.lib.EventType.PROPERTY : "PROP",
RelLib.EventType.RELIGION : "RELI", gen.lib.EventType.RELIGION : "RELI",
RelLib.EventType.RESIDENCE : "RESI", gen.lib.EventType.RESIDENCE : "RESI",
RelLib.EventType.RETIREMENT : "RETI", gen.lib.EventType.RETIREMENT : "RETI",
RelLib.EventType.WILL : "WILL", gen.lib.EventType.WILL : "WILL",
} }
familyConstantAttributes = { familyConstantAttributes = {
RelLib.AttributeType.NUM_CHILD : "NCHI", gen.lib.AttributeType.NUM_CHILD : "NCHI",
} }
personalConstantAttributes = { personalConstantAttributes = {
RelLib.AttributeType.CASTE : "CAST", gen.lib.AttributeType.CASTE : "CAST",
RelLib.AttributeType.DESCRIPTION : "DSCR", gen.lib.AttributeType.DESCRIPTION : "DSCR",
RelLib.AttributeType.ID : "IDNO", gen.lib.AttributeType.ID : "IDNO",
RelLib.AttributeType.NATIONAL : "NATI", gen.lib.AttributeType.NATIONAL : "NATI",
RelLib.AttributeType.NUM_CHILD : "NCHI", gen.lib.AttributeType.NUM_CHILD : "NCHI",
RelLib.AttributeType.SSN : "SSN", gen.lib.AttributeType.SSN : "SSN",
} }
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -134,19 +134,19 @@ personalConstantAttributes = {
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
lds_status = { lds_status = {
"BIC" : RelLib.LdsOrd.STATUS_BIC, "BIC" : gen.lib.LdsOrd.STATUS_BIC,
"CANCELED" : RelLib.LdsOrd.STATUS_CANCELED, "CANCELED" : gen.lib.LdsOrd.STATUS_CANCELED,
"CHILD" : RelLib.LdsOrd.STATUS_CHILD, "CHILD" : gen.lib.LdsOrd.STATUS_CHILD,
"CLEARED" : RelLib.LdsOrd.STATUS_CLEARED, "CLEARED" : gen.lib.LdsOrd.STATUS_CLEARED,
"COMPLETED": RelLib.LdsOrd.STATUS_COMPLETED, "COMPLETED": gen.lib.LdsOrd.STATUS_COMPLETED,
"DNS" : RelLib.LdsOrd.STATUS_DNS, "DNS" : gen.lib.LdsOrd.STATUS_DNS,
"INFANT" : RelLib.LdsOrd.STATUS_INFANT, "INFANT" : gen.lib.LdsOrd.STATUS_INFANT,
"PRE-1970" : RelLib.LdsOrd.STATUS_PRE_1970, "PRE-1970" : gen.lib.LdsOrd.STATUS_PRE_1970,
"QUALIFIED": RelLib.LdsOrd.STATUS_QUALIFIED, "QUALIFIED": gen.lib.LdsOrd.STATUS_QUALIFIED,
"DNS/CAN" : RelLib.LdsOrd.STATUS_DNS_CAN, "DNS/CAN" : gen.lib.LdsOrd.STATUS_DNS_CAN,
"STILLBORN": RelLib.LdsOrd.STATUS_STILLBORN, "STILLBORN": gen.lib.LdsOrd.STATUS_STILLBORN,
"SUBMITTED": RelLib.LdsOrd.STATUS_SUBMITTED, "SUBMITTED": gen.lib.LdsOrd.STATUS_SUBMITTED,
"UNCLEARED": RelLib.LdsOrd.STATUS_UNCLEARED, "UNCLEARED": gen.lib.LdsOrd.STATUS_UNCLEARED,
} }
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More