From ec9371d3b112a7dc7c36bd3831e2cef8e41c66b0 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 5 Sep 2015 17:26:44 +0100 Subject: [PATCH] Revert workaround for bug #8833 This reverts commit 20a57037f79ebbe33b0af220ee81227fdb956bab. --- gramps/gen/plug/docgen/graphdoc.py | 4 +--- gramps/plugins/drawreport/ancestortree.py | 4 +--- gramps/plugins/drawreport/descendtree.py | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gramps/gen/plug/docgen/graphdoc.py b/gramps/gen/plug/docgen/graphdoc.py index f7b8cc3ee..97c4b846c 100644 --- a/gramps/gen/plug/docgen/graphdoc.py +++ b/gramps/gen/plug/docgen/graphdoc.py @@ -244,9 +244,7 @@ class GVOptions(): category = _("Note") ################################ - # workaround for bug 8833 - lines = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" - note = TextOption(_("Note to add to the graph") + lines, + note = TextOption(_("Note to add to the graph"), [""] ) note.set_help(_("This text will be added to the graph.")) menu.add_option(category, "note", note) diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py index 5642b308c..9a06dfc58 100644 --- a/gramps/plugins/drawreport/ancestortree.py +++ b/gramps/plugins/drawreport/ancestortree.py @@ -927,10 +927,8 @@ class AncestorTreeOptions(MenuReportOptions): ################## category_name = _("Replace") - # workaround for bug 8833 - lines = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" repldisp = TextOption( - _("Replace Display Format:\n'Replace this'/' with this'") + lines, + _("Replace Display Format:\n'Replace this'/' with this'"), []) repldisp.set_help(_("i.e.\nUnited States of America/U.S.A")) menu.add_option(category_name, "replace_list", repldisp) diff --git a/gramps/plugins/drawreport/descendtree.py b/gramps/plugins/drawreport/descendtree.py index 548406184..0f7463c5a 100644 --- a/gramps/plugins/drawreport/descendtree.py +++ b/gramps/plugins/drawreport/descendtree.py @@ -1578,10 +1578,8 @@ class DescendTreeOptions(MenuReportOptions): ################## category_name = _("Replace") - # workaround for bug 8833 - lines = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" repldisp = TextOption( - _("Replace Display Format:\n'Replace this'/' with this'") + lines, + _("Replace Display Format:\n'Replace this'/' with this'"), []) repldisp.set_help(_("i.e.\nUnited States of America/U.S.A")) menu.add_option(category_name, "replace_list", repldisp)