* src/Makefile.am: export papersize.xml

* src/RelLib.py: Don't call setAncestor if default person is None
* src/gramps_main.py: remove children out of alternate families
when deleting a person, set default person to None if deleting the
default person.


svn: r2627
This commit is contained in:
Don Allingham 2004-01-12 03:35:02 +00:00
parent 762e7be6db
commit 0e490d6bde
3 changed files with 11 additions and 5 deletions

View File

@ -132,7 +132,7 @@ GRAPHICS = \
tools.png
# Other stuff that we need to install
dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop
dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop papersize.xml
EXTRA_DIST = grampslib.i grampslib_wrap.c

View File

@ -2336,6 +2336,7 @@ class GrampsDB:
if (self.default):
self.default.setAncestor(0)
self.default = person
if person:
self.default.setAncestor(1)
def getDefaultPerson(self):

View File

@ -1283,6 +1283,10 @@ class Gramps:
self.update_display(0)
def delete_person_response(self):
if self.db.getDefaultPerson() == self.active_person:
self.db.setDefaultPerson(None)
for family in self.active_person.getFamilyList():
if not family:
continue
@ -1301,7 +1305,7 @@ class Gramps:
else:
family.setMother(None)
family = self.active_person.getMainParents()
for (family,mrel,frel) in self.active_person.getParentList():
if family:
family.removeChild(self.active_person)
@ -1315,6 +1319,7 @@ class Gramps:
else:
self.change_active_person(None)
self.redraw_histmenu()
Utils.modified()
def merge_update(self,p1,p2,old_id):