From 2b2f7cc7ca050312dd75521ee73131fe1eff9562 Mon Sep 17 00:00:00 2001 From: "Craig J. Anderson" Date: Thu, 7 Apr 2011 16:58:02 +0000 Subject: [PATCH] fixes: http://www.gramps-project.org/bugs/view.php?id=4767#c18712 http://www.gramps-project.org/bugs/view.php?id=4603#c18711 this could well be final for these two reports. svn: r17074 --- src/plugins/drawreport/AncestorTree.py | 16 ++++++++-------- src/plugins/drawreport/DescendTree.py | 20 ++++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/plugins/drawreport/AncestorTree.py b/src/plugins/drawreport/AncestorTree.py index 54e898b1b..34feea76f 100644 --- a/src/plugins/drawreport/AncestorTree.py +++ b/src/plugins/drawreport/AncestorTree.py @@ -940,7 +940,7 @@ class AncestorTreeOptions(MenuReportOptions): menu.add_option(category_name, "marr_disp", marrdisp) ################## - category_name = _("Sizes") + category_name = _("Size") self.scale = EnumeratedListOption(_("Scale tree to fit"), 0) self.scale.add_item( 0, _("Do not scale tree")) @@ -955,7 +955,13 @@ class AncestorTreeOptions(MenuReportOptions): if "BKI" not in self.name.split(","): self.__onepage = BooleanOption(_("Resize Page to Fit Tree size\n" "\n" - "Note: Overrides options in the 'Paper Option' tab\n" + "Note: Overrides options in the 'Paper Option' tab" + ), + False) + self.__onepage.set_help( + _("Whether to resize the page to fit the size \n" + "of the tree. Note: the page will have a \n" + "non standard size.\n" "\n" "With this option selected, the following will happen:\n" "\n" @@ -967,12 +973,6 @@ class AncestorTreeOptions(MenuReportOptions): "\n" "With 'Scale tree to fit the size of the page' the page\n" " is resized to remove any gap in either height or width" - ), - False) - self.__onepage.set_help( - _("Whether to resize the page to fit the size \n" - "of the tree. Note: the page will have a \n" - "non standard size." )) menu.add_option(category_name, "resize_page", self.__onepage) self.__onepage.connect('value-changed', self.__check_blank) diff --git a/src/plugins/drawreport/DescendTree.py b/src/plugins/drawreport/DescendTree.py index 0cce31ec7..e4e6a8c56 100644 --- a/src/plugins/drawreport/DescendTree.py +++ b/src/plugins/drawreport/DescendTree.py @@ -503,7 +503,6 @@ class RecurseDown: marr = None spouse = None - first = 1 if s_level == 1: tmp_bold = self.bold_now @@ -541,13 +540,10 @@ class RecurseDown: for child_ref in mykids: if self.inlc_marr and self.max_spouses > 0: _child_recurse(marr) - elif first == 1 and s_level == 0: - _child_recurse(myself) elif spouse: _child_recurse(spouse) else: _child_recurse(myself) - first = 0 if self.max_spouses > s_level and \ spouse_handle not in self.famalies_seen: @@ -1545,7 +1541,7 @@ class DescendTreeOptions(MenuReportOptions): menu.add_option(category_name, "replace_list", repldisp) ################## - category_name = _("Sizes") + category_name = _("Size") self.scale = EnumeratedListOption(_("Scale tree to fit"), 0) self.scale.add_item( 0, _("Do not scale tree")) @@ -1560,7 +1556,13 @@ class DescendTreeOptions(MenuReportOptions): if "BKI" not in self.name.split(","): self.__onepage = BooleanOption(_("Resize Page to Fit Tree size\n" "\n" - "Note: Overrides options in the 'Paper Option' tab\n" + "Note: Overrides options in the 'Paper Option' tab" + ), + False) + self.__onepage.set_help( + _("Whether to resize the page to fit the size \n" + "of the tree. Note: the page will have a \n" + "non standard size.\n" "\n" "With this option selected, the following will happen:\n" "\n" @@ -1572,12 +1574,6 @@ class DescendTreeOptions(MenuReportOptions): "\n" "With 'Scale tree to fit the size of the page' the page\n" " is resized to remove any gap in either height or width" - ), - False) - self.__onepage.set_help( - _("Whether to resize the page to fit the size \n" - "of the tree. Note: the page will have a \n" - "non standard size." )) menu.add_option(category_name, "resize_page", self.__onepage) self.__onepage.connect('value-changed', self.__check_blank)