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

* src/ReportBase/_ReportUtils.py: Add function "get_address_str"

Browse Source 
* src/plugins/DetDescendantReport.py: Add addresses (0000791)
* src/plugins/DetAncestralReport.py: Add addresses (0000791)
* src/plugins/IndivComplete.py: Add addresses (0000791)
* src/plugins/NarrativeWeb.py: use "get_address_str"
* src/plugins/FamilyGroup.py: use "get_address_str"

svn: r7956
This commit is contained in:
Brian Matherly
2007-01-23 01:51:33 +00:00
parent c43c32a644
commit 1a57769135
7 changed files with 134 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/DetDescendantReport.py
View File

@@ -116,6 +116,7 @@ class DetDescendantReport(Report):
self.addImages = options_class.handler.options_dict['incphotos']
self.includeNames = options_class.handler.options_dict['incnames']
self.includeEvents = options_class.handler.options_dict['incevents']
self.includeAddr = options_class.handler.options_dict['incaddresses']
self.includeSources= options_class.handler.options_dict['incsources']
self.includeMates = options_class.handler.options_dict['incmates']
@@ -337,6 +338,25 @@ class DetDescendantReport(Report):
first = 0
self.write_event(event_ref)
if self.includeAddr:
for addr in person.get_address_list():
if first:
self.doc.start_paragraph('DDR-MoreHeader')
self.doc.write_text(_('More about %(person_name)s:') % {
'person_name' : name })
self.doc.end_paragraph()
first = False
self.doc.start_paragraph('DDR-MoreDetails')
text = ReportUtils.get_address_str(addr)
date = DateHandler.get_date(addr)
self.doc.write_text(_('Address: '))
if date:
self.doc.write_text( '%s, ' % date )
self.doc.write_text( text )
self.doc.write_text( self.endnotes(addr) )
self.doc.end_paragraph()
return 0 # Not duplicate person
@@ -705,6 +725,7 @@ class DetDescendantOptions(ReportOptions):
'incphotos' : 0,
'incnames' : 0,
'incevents' : 0,
'incaddresses' : 0,
'incsources' : 0,
'incmates' : 1,
}
@@ -745,6 +766,9 @@ class DetDescendantOptions(ReportOptions):
'incevents' : ("=0/1","Whether to include events.",
["Do not include events","Include events"],
True),
'incaddresses': ("=0/1","Whether to include addresses.",
["Do not include addresses","Include addresses"],
True),
'incsources' : ("=0/1","Whether to include source references.",
["Do not include sources","Include sources"],
True),
@@ -916,6 +940,10 @@ class DetDescendantOptions(ReportOptions):
# Print events
self.include_events_option = gtk.CheckButton(_("Include events"))
self.include_events_option.set_active(self.options_dict['incevents'])
# Print addresses
self.include_addresses_option = gtk.CheckButton(_("Include addresses"))
self.include_addresses_option.set_active(self.options_dict['incaddresses'])
# Print sources
self.include_sources_option = gtk.CheckButton(_("Include sources"))
@@ -939,6 +967,7 @@ class DetDescendantOptions(ReportOptions):
dialog.add_frame_option(_('Include'),'',self.include_notes_option)
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_addresses_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)
@@ -961,6 +990,7 @@ class DetDescendantOptions(ReportOptions):
self.options_dict['incphotos'] = int(self.image_option.get_active())
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['incaddresses'] = int(self.include_addresses_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())