From 262dae33741038e35d68cf25ce96e437ce456f20 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Sat, 30 Mar 2013 04:33:15 +0000 Subject: [PATCH] 6568: graphic descendant tree report inserts a bogus title svn: r21818 --- gramps/plugins/drawreport/ancestortree.py | 5 ++++- gramps/plugins/drawreport/descendtree.py | 4 ++-- gramps/plugins/lib/libtreebase.py | 6 +----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py index ff7ce1666..a7d99c0ec 100644 --- a/gramps/plugins/drawreport/ancestortree.py +++ b/gramps/plugins/drawreport/ancestortree.py @@ -131,12 +131,15 @@ class FamilyBox(AncestorBoxBase): #------------------------------------------------------------------------ class TitleN(TitleNoDisplay): """No Title class for the report """ + def __init__(self, doc): TitleNoDisplay.__init__(self, doc, "AC2-Title") def calc_title(self, center): """Calculate the title of the report""" - self.text = _("Ancestor Graph") + #we want no text, but need a text for the TOC in a book! + self.mark_text = _("Ancestor Graph") + self.text = '' class TitleA(TitleBox): """Title class for the report """ diff --git a/gramps/plugins/drawreport/descendtree.py b/gramps/plugins/drawreport/descendtree.py index 3ae01d026..91616574a 100644 --- a/gramps/plugins/drawreport/descendtree.py +++ b/gramps/plugins/drawreport/descendtree.py @@ -203,7 +203,7 @@ class DescendantTitleBase(TitleBox): return parents class TitleNone(TitleNoDisplay): - """Family Chart Title class for the report """ + """No Title class for the report """ def __init__(self, dbase, doc): TitleNoDisplay.__init__(self, doc, "CG2-Title") @@ -211,7 +211,7 @@ class TitleNone(TitleNoDisplay): def calc_title(self, persons): """Calculate the title of the report""" #we want no text, but need a text for the TOC in a book! - self.mark_text = 'Descendant Graph' + self.mark_text = _('Descendant Graph') self.text = '' class TitleDPY(DescendantTitleBase): diff --git a/gramps/plugins/lib/libtreebase.py b/gramps/plugins/lib/libtreebase.py index 0229d97da..cd6d9b28a 100644 --- a/gramps/plugins/lib/libtreebase.py +++ b/gramps/plugins/lib/libtreebase.py @@ -36,12 +36,10 @@ from __future__ import division #------------------------------------------------------------------------ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.get_translation().sgettext - from gramps.gen.plug.report import utils as ReportUtils - from gramps.gen.display.name import displayer as name_displayer - from gramps.plugins.lib.libsubstkeyword import SubstKeywords +from gramps.gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) PT2CM = ReportUtils.pt2cm @@ -645,7 +643,6 @@ class TitleNoDisplay(BoxBase): def display(self): """ display the title box. """ #Set up the Table of Contents here - from gramps.gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) # interim, here if self.mark_text is None: mark = IndexMark(self.text, INDEX_TYPE_TOC, 1) else: @@ -687,7 +684,6 @@ class TitleBox(BoxBase): return #Set up the Table of Contents here - from gramps.gen.plug.docgen import (IndexMark, INDEX_TYPE_TOC) # interim, here mark = IndexMark(self.text, INDEX_TYPE_TOC, 1) if self.text: