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

* src/ReadGedcom.py: handle FTM style of child/parent relationship

Browse Source 
translation
* src/gedcomimport.py:


svn: r4385
This commit is contained in:
Don Allingham
2005-04-20 18:41:48 +00:00
parent dc3fb33c1e
commit 2603fb3c21
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gramps2/src/ReadGedcom.py
View File

@@ -89,6 +89,7 @@ rel_types = (RelLib.Person.CHILD_REL_BIRTH,
pedi_type = { pedi_type = {
'birth' : RelLib.Person.CHILD_REL_BIRTH, 'birth' : RelLib.Person.CHILD_REL_BIRTH,
'natural': RelLib.Person.CHILD_REL_BIRTH,
'adopted': RelLib.Person.CHILD_REL_ADOPT, 'adopted': RelLib.Person.CHILD_REL_ADOPT,
'foster' : RelLib.Person.CHILD_REL_FOST, 'foster' : RelLib.Person.CHILD_REL_FOST,
} }
@@ -210,7 +211,8 @@ def import2(database, filename, cb, codeset, use_trans):
DisplayTrace.DisplayTrace() DisplayTrace.DisplayTrace()
return return
statusTop.get_widget("close").set_sensitive(1) statusTop.get_widget("close").set_sensitive(True)
statusWindow.set_modal(False)
if close: if close:
statusWindow.destroy() statusWindow.destroy()
@@ -768,12 +770,10 @@ class GedcomParser:
return (mrel,frel) return (mrel,frel)
# FTW # FTW
elif matches[1] == "_FREL": elif matches[1] == "_FREL":
if matches[2].lower() != "natural": frel = pedi_type.get(matches[2].lower(),RelLib.Person.CHILD_REL_BIRTH)
frel = matches[2].capitalize()
# FTW # FTW
elif matches[1] == "_MREL": elif matches[1] == "_MREL":
if matches[2].lower() != "natural": mrel = pedi_type.get(matches[2].lower(),RelLib.Person.CHILD_REL_BIRTH)
mrel = RelLib.Person.CHILD_REL_BIRTH
elif matches[1] == "ADOP": elif matches[1] == "ADOP":
mrel = RelLib.Person.CHILD_REL_ADOPT mrel = RelLib.Person.CHILD_REL_ADOPT
frel = RelLib.Person.CHILD_REL_ADOPT frel = RelLib.Person.CHILD_REL_ADOPT

2
gramps2/src/gedcomimport.glade
View File

@@ -7,7 +7,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="title" translatable="yes"></property> <property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property> <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property> <property name="modal">True</property>
<property name="default_width">600</property> <property name="default_width">600</property>
<property name="default_height">500</property> <property name="default_height">500</property>