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

2003-12-17 Tim Waugh <twaugh@redhat.com>

Browse Source 
* src/plugins/Ancestors.py
        (ComprehensiveAncestorsReport.write_report): No need for separate
        clauses when using write_note, since output is not delayed here.
        (ComprehensiveAncestorsReport.long_notes): Handle pre-formatted
        notes on events.


svn: r2535
This commit is contained in:
Tim Waugh
2003-12-17 11:24:23 +00:00
parent 49512e683c
commit d4bdb508d0
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2003-12-17 Tim Waugh <twaugh@redhat.com>
* src/plugins/Ancestors.py
(ComprehensiveAncestorsReport.write_report): No need for separate
clauses when using write_note, since output is not delayed here.
(ComprehensiveAncestorsReport.long_notes): Handle pre-formatted
notes on events.
2003-12-16 Don Allingham <dallingham@users.sourceforge.net>
* src/PlaceView.py: Make sure to add new place after edit
* src/AddMedia.py: unicode conversion from gtk.Entry

23
src/plugins/Ancestors.py
View File

@@ -152,12 +152,7 @@ class ComprehensiveAncestorsReport (Report.Report):
note = source.getNote ()
format = source.getNoteFormat ()
if note:
if format == 0:
self.doc.start_paragraph ("AR-Details")
self.doc.write_text (note)
self.doc.end_paragraph ()
else:
self.doc.write_note (note, format, "AR-Details")
self.doc.write_note (note, format, "AR-Details")
i += 1
@@ -439,7 +434,9 @@ class ComprehensiveAncestorsReport (Report.Report):
if placename:
info += _(' in %(place)s') % {'place': placename}
note = event.getNote ()
if note or description:
note_format = event.getNoteFormat ()
inline_note = note and (note_format == 0)
if inline_note or description:
info += ' ('
if description:
info += description
@@ -747,10 +744,22 @@ class ComprehensiveAncestorsReport (Report.Report):
': ' + name.getRegularName ()]))
paras.append ((self.doc.end_paragraph, []))
for event in [person.getBirth (), person.getDeath ()]:
note = event.getNote ()
note_format = event.getNoteFormat ()
if note and (note_format != 0):
paras.append ((self.doc.write_note, [note, format,
'AR-Details']))
for event in events:
paras.append ((self.doc.start_paragraph, ['AR-Details']))
paras.append ((self.doc.write_text, [self.event_info (event)]))
paras.append ((self.doc.end_paragraph, []))
note = event.getNote ()
note_format = event.getNoteFormat ()
if note and (note_format != 0):
paras.append ((self.doc.write_note, [note, format,
'AR-Details']))
for address in addresses:
paras.append ((self.doc.start_paragraph, ['AR-Details']))