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

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

Browse Source 
* src/plugins/Aneestors.py: Use write_note() when appropriate.


svn: r2532
This commit is contained in:
Tim Waugh 2003-12-16 17:06:52 +00:00
parent b60316634d
commit 92af879c15
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2003-12-16 Tim Waugh <twaugh@redhat.com>
* src/plugins/Aneestors.py: Use write_note() when appropriate.
2003-12-15 Don Allingham <dallingham@users.sourceforge.net> 2003-12-15 Don Allingham <dallingham@users.sourceforge.net>
* src/GrampsCfg.py: change the default prefixes so that they * src/GrampsCfg.py: change the default prefixes so that they
sort nicely numerically. sort nicely numerically.

20
src/plugins/Ancestors.py
View File

@ -150,10 +150,14 @@ class ComprehensiveAncestorsReport (Report.Report):
self.doc.end_paragraph () self.doc.end_paragraph ()
note = source.getNote () note = source.getNote ()
format = source.getNoteFormat ()
if note: if note:
self.doc.start_paragraph ("AR-Details") if format == 0:
self.doc.write_text (note) self.doc.start_paragraph ("AR-Details")
self.doc.end_paragraph () self.doc.write_text (note)
self.doc.end_paragraph ()
else:
self.doc.write_note (note, format, "AR-Details")
i += 1 i += 1
@ -697,7 +701,8 @@ class ComprehensiveAncestorsReport (Report.Report):
if not (name_note == '' or name_note.find ('\n') != -1): if not (name_note == '' or name_note.find ('\n') != -1):
return _(' Note about their name: ') + name_note return _(' Note about their name: ') + name_note
note = person.getNote () note = person.getNote ()
if not (note == '' or note.find ('\n') != -1): if not (person.getNoteFormat () != 0 or
note == '' or note.find ('\n') != -1):
return ' ' + note return ' ' + note
return '' return ''
@ -706,7 +711,7 @@ class ComprehensiveAncestorsReport (Report.Report):
para_end = note.find ('\n') para_end = note.find ('\n')
if para_end != -1: if para_end != -1:
paras = self.long_details (note[note.find ('\n') + 1:], paras) paras = self.long_details (note[note.find ('\n') + 1:], paras)
else: else:
para_end = len (note) para_end = len (note)
paras.insert (0, (self.doc.end_paragraph, [])) paras.insert (0, (self.doc.end_paragraph, []))
@ -717,7 +722,10 @@ class ComprehensiveAncestorsReport (Report.Report):
def long_notes (self, person, suppress_children = 0, def long_notes (self, person, suppress_children = 0,
already_described = []): already_described = []):
note = person.getNote () note = person.getNote ()
if note != '' and note.find ('\n') != -1: format = person.getNoteFormat ()
if format != 0:
paras = [ (self.doc.write_note, [note, format, 'AR-Details']) ]
elif note != '' and note.find ('\n') != -1:
paras = self.long_details (note, []) paras = self.long_details (note, [])
else: else:
paras = [] paras = []