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

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

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

	* various: gen.utils integration


svn: r9101
This commit is contained in:
Don Allingham 2007-10-08 16:41:39 +00:00
parent 8038bc0dca
commit d58641415d
245 changed files with 2315 additions and 2355 deletions
ChangeLog
src
AddMedia.py
BasicUtils
_NameDisplay.py
DataViews
_EventView.py_FamilyList.py_MediaView.py_NoteView.py_PedigreeView.py_PersonView.py_PlaceView.py_RelationView.py_RepositoryView.py_SourceView.py
Date.pyDateEdit.py
DateHandler
_DateDisplay.py_DateParser.py_Date_de.py_Date_es.py_Date_fi.py_Date_fr.py_Date_lt.py_Date_nl.py_Date_pl.py_Date_ru.py_Date_sk.py_Date_sv.py
DisplayModels
_EventModel.py_FamilyModel.py_MediaModel.py_NoteModel.py_PeopleModel.py_RepositoryModel.py
DisplayTabs
_AddrEmbedList.py_AttrEmbedList.py_EventEmbedList.py_FamilyLdsEmbedList.py_GalleryTab.py_LdsEmbedList.py_LocationEmbedList.py_NameEmbedList.py_NoteTab.py_PersonEventEmbedList.py_PersonRefEmbedList.py_RepoEmbedList.py_SourceEmbedList.py_WebEmbedList.py
Editors
_EditAddress.py_EditAttribute.py_EditChildRef.py_EditEvent.py_EditEventRef.py_EditFamily.py_EditLdsOrd.py_EditMedia.py_EditMediaRef.py_EditName.py_EditNote.py_EditPerson.py_EditPersonRef.py_EditPlace.py_EditRepoRef.py_EditRepository.py_EditSource.py_EditSourceRef.py
FilterEditor
_EditRule.py
Filters
Rules
Event
_HasType.py
Family
_HasRelType.py
Note
_HasNote.py
Person
_HasBirth.py_HasCompleteRecord.py_HasDeath.py_HasEvent.py_HasFamilyEvent.py_HasRelationship.py_HasUnknownGender.py_HaveAltFamilies.py_IsFemale.py_IsMale.py_IsWitness.py
Repository
_HasRepo.py
_HasAttributeBase.py_HasEventBase.py_HasMarkerBase.py
SideBar
_EventSidebarFilter.py_FamilySidebarFilter.py_MediaSidebarFilter.py_NoteSidebarFilter.py_PersonSidebarFilter.py_PlaceSidebarFilter.py_RepoSidebarFilter.py_SourceSidebarFilter.py
_GenericFilter.py
GrampsCfg.py
GrampsDb
_GrampsBSDDB.py_GrampsDbWriteXML.py_GrampsGEDDB.py_GrampsInMemDB.py_GrampsXMLDB.py
GrampsDbUtils
_GedcomInfo.py
Show More

6
ChangeLog

@ -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>
* various: gen.utils integrationk
* various: gen.utils integration
2007-10-07 Gary Burton <gary.burton@zen.co.uk>
* src/DataViews/_RelationView.py: init scroll pos on new person, issue #442

6
src/AddMedia.py

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

26
src/BasicUtils/_NameDisplay.py

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from RelLib import Name
from gen.lib import Name
from Errors import NameDisplayError
try:
@ -455,15 +455,15 @@ class NameDisplay:
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
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
the display.
@type person: L{RelLib.Person}
@returns: Returns the L{RelLib.Person} instance's name
@type person: L{gen.lib.Person}
@returns: Returns the L{gen.lib.Person} instance's name
@rtype: str
"""
name = person.get_primary_name()
@ -499,14 +499,14 @@ class NameDisplay:
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.
@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
the display.
@type person: L{RelLib.Person}
@returns: Returns the L{RelLib.Person} instance's name
@type person: L{gen.lib.Person}
@returns: Returns the L{gen.lib.Person} instance's name
@rtype: str
"""
name = person.get_primary_name()
@ -514,14 +514,14 @@ class NameDisplay:
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.
@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
the display.
@type person: L{RelLib.Person}
@returns: Returns the L{RelLib.Person} instance's name
@type person: L{gen.lib.Person}
@returns: Returns the L{gen.lib.Person} instance's name
@rtype: str
"""
# FIXME: At this time, this is just duplicating display() method

4
src/DataViews/_EventView.py

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

4
src/DataViews/_FamilyList.py

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

4
src/DataViews/_MediaView.py

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

2
src/DataViews/_NoteView.py

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

44
src/DataViews/_PedigreeView.py

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

4
src/DataViews/_PersonView.py

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

4
src/DataViews/_PlaceView.py

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

34
src/DataViews/_RelationView.py

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

4
src/DataViews/_RepositoryView.py

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

4
src/DataViews/_SourceView.py

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

2
src/Date.py

@ -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

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

2
src/DateHandler/_DateDisplay.py

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

2
src/DateHandler/_DateParser.py

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

2
src/DateHandler/_Date_de.py

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

2
src/DateHandler/_Date_es.py

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

2
src/DateHandler/_Date_fi.py

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

2
src/DateHandler/_Date_fr.py

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

2
src/DateHandler/_Date_lt.py

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

2
src/DateHandler/_Date_nl.py

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

2
src/DateHandler/_Date_pl.py

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

2
src/DateHandler/_Date_ru.py

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

2
src/DateHandler/_Date_sk.py

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

2
src/DateHandler/_Date_sv.py

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

8
src/DisplayModels/_EventModel.py

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

14
src/DisplayModels/_FamilyModel.py

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

6
src/DisplayModels/_MediaModel.py

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

12
src/DisplayModels/_NoteModel.py

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

2
src/DisplayModels/_PeopleModel.py

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

30
src/DisplayModels/_RepositoryModel.py

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

4
src/DisplayTabs/_AddrEmbedList.py

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

4
src/DisplayTabs/_AttrEmbedList.py

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

16
src/DisplayTabs/_EventEmbedList.py

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

6
src/DisplayTabs/_FamilyLdsEmbedList.py

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

16
src/DisplayTabs/_GalleryTab.py

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

4
src/DisplayTabs/_LdsEmbedList.py

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

4
src/DisplayTabs/_LocationEmbedList.py

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

4
src/DisplayTabs/_NameEmbedList.py

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

4
src/DisplayTabs/_NoteTab.py

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

12
src/DisplayTabs/_PersonEventEmbedList.py

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

6
src/DisplayTabs/_PersonRefEmbedList.py

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

10
src/DisplayTabs/_RepoEmbedList.py

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

10
src/DisplayTabs/_SourceEmbedList.py

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

4
src/DisplayTabs/_WebEmbedList.py

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

2
src/Editors/_EditAddress.py

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

2
src/Editors/_EditAttribute.py

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

2
src/Editors/_EditChildRef.py

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

6
src/Editors/_EditEvent.py

@ -41,7 +41,7 @@ import gtk
#-------------------------------------------------------------------------
import const
import Config
import RelLib
import gen.lib
import GrampsDisplay
from _EditPrimary import EditPrimary
@ -73,7 +73,7 @@ class EditEvent(EditPrimary):
self.commit_event = self.db.commit_event
def empty_object(self):
return RelLib.Event()
return gen.lib.Event()
def get_menu_title(self):
if self.obj.get_handle():
@ -167,7 +167,7 @@ class EditEvent(EditPrimary):
self.note_tab = self._add_tab(
notebook,
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(
notebook,

8
src/Editors/_EditEventRef.py

@ -41,7 +41,7 @@ import gtk
#-------------------------------------------------------------------------
import const
import Config
import RelLib
import gen.lib
from DisplayTabs import SourceEmbedList,NoteTab,GalleryTab,EventBackRefList,AttrEmbedList
from GrampsWidgets import *
@ -172,13 +172,13 @@ class EditEventRef(EditReference):
notebook,
NoteTab(self.dbstate, self.uistate, self.track,
self.source.get_note_list(),
notetype=RelLib.NoteType.EVENT))
notetype=gen.lib.NoteType.EVENT))
self.note_ref_tab = self._add_tab(
notebook_ref,
NoteTab(self.dbstate, self.uistate, self.track,
self.source_ref.get_note_list(),
notetype=RelLib.NoteType.EVENTREF))
notetype=gen.lib.NoteType.EVENTREF))
self.gallery_tab = self._add_tab(
notebook,
@ -238,5 +238,5 @@ class EditFamilyEventRef(EditEventRef):
self.add_event = self.db.add_family_event
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()]

30
src/Editors/_EditFamily.py

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

142
src/Editors/_EditLdsOrd.py

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

8
src/Editors/_EditMedia.py

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

2
src/Editors/_EditMediaRef.py

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

2
src/Editors/_EditName.py

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

2
src/Editors/_EditNote.py

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

28
src/Editors/_EditPerson.py

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

2
src/Editors/_EditPersonRef.py

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

6
src/Editors/_EditPlace.py

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

2
src/Editors/_EditRepoRef.py

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

6
src/Editors/_EditRepository.py

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

6
src/Editors/_EditSource.py

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

16
src/Editors/_EditSourceRef.py

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

18
src/FilterEditor/_EditRule.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
src/Filters/Rules/_HasAttributeBase.py

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

2
src/Filters/Rules/_HasEventBase.py

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

2
src/Filters/Rules/_HasMarkerBase.py

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

6
src/Filters/SideBar/_EventSidebarFilter.py

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

14
src/Filters/SideBar/_FamilySidebarFilter.py

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

2
src/Filters/SideBar/_MediaSidebarFilter.py

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

2
src/Filters/SideBar/_NoteSidebarFilter.py

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

22
src/Filters/SideBar/_PersonSidebarFilter.py

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

2
src/Filters/SideBar/_PlaceSidebarFilter.py

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

2
src/Filters/SideBar/_RepoSidebarFilter.py

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

2
src/Filters/SideBar/_SourceSidebarFilter.py

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

18
src/Filters/_GenericFilter.py

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

6
src/GrampsCfg.py

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

2
src/GrampsDb/_GrampsBSDDB.py

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

24
src/GrampsDb/_GrampsDbWriteXML.py

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

2
src/GrampsDb/_GrampsGEDDB.py

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

2
src/GrampsDb/_GrampsInMemDB.py

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

2
src/GrampsDb/_GrampsXMLDB.py

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

132
src/GrampsDbUtils/_GedcomInfo.py

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

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