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

Fixed unknown spouse with multiple marriages

Browse Source 
svn: r874
This commit is contained in:
Don Allingham 2002-03-29 06:09:46 +00:00
parent aa73aed965
commit 35e9005c33
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gramps/src/gramps_main.py
View File

@ -1428,13 +1428,13 @@ class Gramps:
sel = c sel = c
mymap[f] = c mymap[f] = c
mynmap[f] = sname mynmap[f] = sname
self.spouse_combo.disable_activate() self.spouse_combo.disable_activate()
self.spouse_combo.list.clear_items(0,-1) self.spouse_combo.list.clear_items(0,-1)
self.spouse_combo.list.append_items(list) self.spouse_combo.list.append_items(list)
self.spouse_combo.list.select_child(sel)
for v in mymap.keys(): for v in mymap.keys():
self.spouse_combo.set_item_string(mymap[v],mynmap[v]) self.spouse_combo.set_item_string(mymap[v],mynmap[v])
self.spouse_combo.list.select_child(sel)
def load_family(self,family=None): def load_family(self,family=None):
if family != None: if family != None:
@ -1495,12 +1495,12 @@ class Gramps:
self.gtop.get_widget('rel_frame').set_label(msg) self.gtop.get_widget('rel_frame').set_label(msg)
if self.active_person != self.active_family.getFather(): if self.active_person != self.active_family.getFather():
spouse = self.active_family.getFather() self.active_spouse = self.active_family.getFather()
else: else:
spouse = self.active_family.getMother() self.active_spouse = self.active_family.getMother()
self.build_spouse_dropdown() self.build_spouse_dropdown()
self.spouse_text.set_text(GrampsCfg.nameof(spouse)) self.spouse_text.set_text(GrampsCfg.nameof(self.active_spouse))
self.spouse_edit.set_sensitive(1) self.spouse_edit.set_sensitive(1)
self.spouse_del.set_sensitive(1) self.spouse_del.set_sensitive(1)
elif number_of_families == 1: elif number_of_families == 1:
@ -1533,6 +1533,7 @@ class Gramps:
else: else:
self.display_marriage(None) self.display_marriage(None)
else: else:
self.active_spouse = None
self.spouse_text.set_text("") self.spouse_text.set_text("")
self.display_marriage(None) self.display_marriage(None)
@ -1628,7 +1629,7 @@ class Gramps:
if family: if family:
flist = self.active_person.getFamilyList() flist = self.active_person.getFamilyList()
if self.active_person.getGender() == Person.male: if self.active_person == family.getFather():
self.active_spouse = family.getMother() self.active_spouse = family.getMother()
else: else:
self.active_spouse = family.getFather() self.active_spouse = family.getFather()
@ -1685,6 +1686,7 @@ class Gramps:
self.child_list.set_data("f",family) self.child_list.set_data("f",family)
self.sort_child_list(self.child_list) self.sort_child_list(self.child_list)
else: else:
self.active_spouse = None
fv_prev.set_sensitive(0) fv_prev.set_sensitive(0)
def load_progress(self,value): def load_progress(self,value):