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

* src/Makefile.am: export papersize.xml

Browse Source 
* 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 ab503e2158
commit 850b5ad259
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/src/Makefile.am
View File

@ -132,7 +132,7 @@ GRAPHICS = \
tools.png tools.png
# Other stuff that we need to install # 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 EXTRA_DIST = grampslib.i grampslib_wrap.c

3
gramps2/src/RelLib.py
View File

@ -2336,7 +2336,8 @@ class GrampsDB:
if (self.default): if (self.default):
self.default.setAncestor(0) self.default.setAncestor(0)
self.default = person self.default = person
self.default.setAncestor(1) if person:
self.default.setAncestor(1)
def getDefaultPerson(self): def getDefaultPerson(self):
"""returns the default Person of the database""" """returns the default Person of the database"""

11
gramps2/src/gramps_main.py
View File

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