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

* various: merge changes made in gramps20 up until R2_0_10_real tag.

Browse Source 
* configure.in: Bump up release number.
* Release: Version 2.0.10 "Holy Hand Grenade of Antioch" released.


svn: r6011
This commit is contained in:
Alex Roitman
2006-02-28 19:54:35 +00:00
parent c4010b28a4
commit 2b96e371e1
58 changed files with 43034 additions and 25057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/plugins/DetDescendantReport.py
View File

@@ -2,7 +2,7 @@
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2002 Bruce J. DeGrasse
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -88,6 +88,7 @@ class DetDescendantReport(Report.Report):
firstName - Whether to use first names instead of pronouns.
fullDate - Whether to use full dates instead of just year.
listChildren - Whether to list children.
includeMates - Whether to include information about spouses
includeNotes - Whether to include notes.
blankPlace - Whether to replace missing Places with ___________.
blankDate - Whether to replace missing Dates with ___________.
@@ -116,6 +117,7 @@ class DetDescendantReport(Report.Report):
self.includeNames = options_class.handler.options_dict['incnames']
self.includeEvents = options_class.handler.options_dict['incevents']
self.includeSources= options_class.handler.options_dict['incsources']
self.includeMates = options_class.handler.options_dict['incmates']
self.gen_handles = {}
self.prev_gen_handles= {}
@@ -261,9 +263,10 @@ class DetDescendantReport(Report.Report):
if birth_handle:
self.endnotes(self.database.get_event_from_handle(birth_handle))
first = 0
age,units = self.calc_age(person)
text = ReportUtils.died_str(self.database,person,first,
self.EMPTY_DATE,self.EMPTY_PLACE)
self.EMPTY_DATE,self.EMPTY_PLACE,age,units)
if text:
self.doc.write_text(text)
death_handle = person.get_birth_handle()
@@ -283,7 +286,7 @@ class DetDescendantReport(Report.Report):
self.write_marriage(person)
self.doc.end_paragraph()
if key == 1:
if self.includeMates:
self.write_mate(person)
if person.get_note() != "" and self.includeNotes:
@@ -528,24 +531,28 @@ class DetDescendantReport(Report.Report):
self.doc.start_paragraph('DDR-Endnotes',"%d." % key)
self.doc.write_text(base.get_title())
for item in [ base.get_author(), base.get_publication_info(), base.get_abbreviation(),
_dd.display(srcref.get_date_object()),]:
if item:
self.doc.write_text('; %s' % item)
item = srcref.get_text()
if item:
self.doc.write_text('; ')
self.doc.write_text(_('Text:'))
self.doc.write_text(' ')
self.doc.write_text(item)
item = srcref.get_note()
if item:
self.doc.write_text('; ')
self.doc.write_text(_('Comments:'))
self.doc.write_text(' ')
self.doc.write_text(item)
# Disable writing reference details, because only the details
# the first reference to this source will appear.
# FIXME: need to properly change self.endnotes() to put
# this feature back correclty.
## for item in [ base.get_author(), base.get_publication_info(), base.get_abbreviation(),
## _dd.display(srcref.get_date_object()),]:
## if item:
## self.doc.write_text('; %s' % item)
##
## item = srcref.get_text()
## if item:
## self.doc.write_text('; ')
## self.doc.write_text(_('Text:'))
## self.doc.write_text(' ')
## self.doc.write_text(item)
##
## item = srcref.get_note()
## if item:
## self.doc.write_text('; ')
## self.doc.write_text(_('Comments:'))
## self.doc.write_text(' ')
## self.doc.write_text(item)
self.doc.write_text('.')
self.doc.end_paragraph()
@@ -610,6 +617,7 @@ class DetDescendantOptions(ReportOptions.ReportOptions):
'incnames' : 0,
'incevents' : 0,
'incsources' : 0,
'incmates' : 1,
}
self.options_help = {
'fulldates' : ("=0/1","Whether to use full dates instead of just year.",
@@ -651,6 +659,9 @@ class DetDescendantOptions(ReportOptions.ReportOptions):
'incsources' : ("=0/1","Whether to include source references.",
["Do not include sources","Include sources"],
True),
'incmates' : ("=0/1","Whether to include detailed spouse information.",
["Do not include spouse info","Include spouse info"],
True),
}
def enable_options(self):
@@ -820,6 +831,10 @@ class DetDescendantOptions(ReportOptions.ReportOptions):
self.include_sources_option = gtk.CheckButton(_("Include sources"))
self.include_sources_option.set_active(self.options_dict['incsources'])
# Print Spouses
self.include_spouses_option = gtk.CheckButton(_("Include spouses"))
self.include_spouses_option.set_active(self.options_dict['incmates'])
# Add new options. The first argument is the tab name for grouping options.
# if you want to put everyting in the generic "Options" category, use
# self.add_option(text,widget) instead of self.add_frame_option(category,text,widget)
@@ -834,6 +849,7 @@ class DetDescendantOptions(ReportOptions.ReportOptions):
dialog.add_frame_option(_('Include'),'',self.include_names_option)
dialog.add_frame_option(_('Include'),'',self.include_events_option)
dialog.add_frame_option(_('Include'),'',self.include_sources_option)
dialog.add_frame_option(_('Include'),'',self.include_spouses_option)
dialog.add_frame_option(_('Missing information'),'',self.place_option)
dialog.add_frame_option(_('Missing information'),'',self.date_option)
@@ -854,6 +870,7 @@ class DetDescendantOptions(ReportOptions.ReportOptions):
self.options_dict['incnames'] = int(self.include_names_option.get_active())
self.options_dict['incevents'] = int(self.include_events_option.get_active())
self.options_dict['incsources'] = int(self.include_sources_option.get_active())
self.options_dict['incmates'] = int(self.include_spouses_option.get_active())
#------------------------------------------------------------------------
#