Fixed problem with parents
svn: r280
This commit is contained in:
parent
f7998899a5
commit
c6fe293ef1
@ -1054,6 +1054,10 @@ def on_save_parents_clicked(obj):
|
|||||||
frel = family_window.get_widget("frel").get_text()
|
frel = family_window.get_widget("frel").get_text()
|
||||||
type = family_window.get_widget("prel").get_text()
|
type = family_window.get_widget("prel").get_text()
|
||||||
|
|
||||||
|
mrel = const.childRelations[mrel]
|
||||||
|
frel = const.childRelations[frel]
|
||||||
|
type = save_frel(type)
|
||||||
|
|
||||||
if select_father or select_mother:
|
if select_father or select_mother:
|
||||||
if select_mother.getGender() == Person.male and \
|
if select_mother.getGender() == Person.male and \
|
||||||
select_father.getGender() == Person.female:
|
select_father.getGender() == Person.female:
|
||||||
@ -1073,7 +1077,6 @@ def on_save_parents_clicked(obj):
|
|||||||
else:
|
else:
|
||||||
family = None
|
family = None
|
||||||
|
|
||||||
print type,family
|
|
||||||
family.setRelationship(type)
|
family.setRelationship(type)
|
||||||
|
|
||||||
change_family_type(family,mrel,frel)
|
change_family_type(family,mrel,frel)
|
||||||
|
@ -518,6 +518,8 @@ class GedcomParser:
|
|||||||
event.setName(ged2fam[matches[1]])
|
event.setName(ged2fam[matches[1]])
|
||||||
except:
|
except:
|
||||||
event.setName(matches[1])
|
event.setName(matches[1])
|
||||||
|
if event.getName() == "Marriage":
|
||||||
|
self.setRelationship("Married")
|
||||||
self.family.addEvent(event)
|
self.family.addEvent(event)
|
||||||
self.parse_family_event(event,2)
|
self.parse_family_event(event,2)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user