* src/RelLib.py: documentation improvements, move family
relations constants from const.py.in * src/AddSpouse.py: relationship constant changes * src/BaseDoc.py: documentation improvements * src/ChooseParents.py: relationship constant changes * src/Date.py: documentation changes * src/ReadGedcom.py: relationship constant changes, remove unused global * src/ReadXML.py: relationship constant changes * src/SelectChild.py: has_family to get_parent_family * src/const.py.in: moved family relation constants to RelLib * src/plugins/Check.py: relationship constant changes * src/plugins/ImportGeneWeb.py: relationship constant changes * src/plugins/WriteGeneWeb.py: relationship constant changes svn: r3836
This commit is contained in:
@ -66,7 +66,6 @@ ANSEL = 1
|
||||
UNICODE = 2
|
||||
UPDATE = 25
|
||||
|
||||
db = None
|
||||
callback = None
|
||||
|
||||
_title_string = _("GEDCOM")
|
||||
@ -823,7 +822,7 @@ class GedcomParser:
|
||||
except:
|
||||
event.set_name(matches[1])
|
||||
if event.get_name() == "Marriage":
|
||||
self.family.set_relationship(const.FAMILY_MARRIED)
|
||||
self.family.set_relationship(RelLib.Family.MARRIED)
|
||||
self.db.add_event(event,self.trans)
|
||||
self.family.add_event_handle(event.get_handle())
|
||||
self.parse_family_event(event,2)
|
||||
@ -1941,11 +1940,9 @@ def extract_temple(matches):
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def readData(database,active_person,cb):
|
||||
global db
|
||||
global callback
|
||||
global file_topa
|
||||
|
||||
db = database
|
||||
callback = cb
|
||||
|
||||
choose = gtk.FileChooserDialog("%s - GRAMPS" % _title_string,
|
||||
@ -1971,7 +1968,7 @@ def readData(database,active_person,cb):
|
||||
filename = choose.get_filename()
|
||||
choose.destroy()
|
||||
try:
|
||||
importData(db,filename)
|
||||
importData(database,filename)
|
||||
except:
|
||||
import DisplayTrace
|
||||
DisplayTrace.DisplayTrace()
|
||||
|
Reference in New Issue
Block a user