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

fixes:

Browse Source 
http://www.gramps-project.org/bugs/view.php?id=4603#c18711
http://www.gramps-project.org/bugs/view.php?id=4767#c18712

This could well be final.


svn: r17073
This commit is contained in:
Craig J. Anderson 2011-04-07 16:56:02 +00:00
parent f6120d11b5
commit 64ef3c4ccb
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/drawreport/AncestorTree.py
View File

@ -940,7 +940,7 @@ class AncestorTreeOptions(MenuReportOptions):
menu.add_option(category_name, "marr_disp", marrdisp) menu.add_option(category_name, "marr_disp", marrdisp)
################## ##################
category_name = _("Sizes") category_name = _("Size")
self.scale = EnumeratedListOption(_("Scale tree to fit"), 0) self.scale = EnumeratedListOption(_("Scale tree to fit"), 0)
self.scale.add_item( 0, _("Do not scale tree")) self.scale.add_item( 0, _("Do not scale tree"))
@ -955,7 +955,13 @@ class AncestorTreeOptions(MenuReportOptions):
if "BKI" not in self.name.split(","): if "BKI" not in self.name.split(","):
self.__onepage = BooleanOption(_("Resize Page to Fit Tree size\n" self.__onepage = BooleanOption(_("Resize Page to Fit Tree size\n"
"\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" "\n"
"With this option selected, the following will happen:\n" "With this option selected, the following will happen:\n"
"\n" "\n"
@ -967,12 +973,6 @@ class AncestorTreeOptions(MenuReportOptions):
"\n" "\n"
"With 'Scale tree to fit the size of the page' the page\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" " 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) menu.add_option(category_name, "resize_page", self.__onepage)
self.__onepage.connect('value-changed', self.__check_blank) self.__onepage.connect('value-changed', self.__check_blank)

20
src/plugins/drawreport/DescendTree.py
View File

@ -503,7 +503,6 @@ class RecurseDown:
marr = None marr = None
spouse = None spouse = None
first = 1
if s_level == 1: if s_level == 1:
tmp_bold = self.bold_now tmp_bold = self.bold_now
@ -541,13 +540,10 @@ class RecurseDown:
for child_ref in mykids: for child_ref in mykids:
if self.inlc_marr and self.max_spouses > 0: if self.inlc_marr and self.max_spouses > 0:
_child_recurse(marr) _child_recurse(marr)
elif first == 1 and s_level == 0:
_child_recurse(myself)
elif spouse: elif spouse:
_child_recurse(spouse) _child_recurse(spouse)
else: else:
_child_recurse(myself) _child_recurse(myself)
first = 0
if self.max_spouses > s_level and \ if self.max_spouses > s_level and \
spouse_handle not in self.famalies_seen: spouse_handle not in self.famalies_seen:
@ -1545,7 +1541,7 @@ class DescendTreeOptions(MenuReportOptions):
menu.add_option(category_name, "replace_list", repldisp) menu.add_option(category_name, "replace_list", repldisp)
################## ##################
category_name = _("Sizes") category_name = _("Size")
self.scale = EnumeratedListOption(_("Scale tree to fit"), 0) self.scale = EnumeratedListOption(_("Scale tree to fit"), 0)
self.scale.add_item( 0, _("Do not scale tree")) self.scale.add_item( 0, _("Do not scale tree"))
@ -1560,7 +1556,13 @@ class DescendTreeOptions(MenuReportOptions):
if "BKI" not in self.name.split(","): if "BKI" not in self.name.split(","):
self.__onepage = BooleanOption(_("Resize Page to Fit Tree size\n" self.__onepage = BooleanOption(_("Resize Page to Fit Tree size\n"
"\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" "\n"
"With this option selected, the following will happen:\n" "With this option selected, the following will happen:\n"
"\n" "\n"
@ -1572,12 +1574,6 @@ class DescendTreeOptions(MenuReportOptions):
"\n" "\n"
"With 'Scale tree to fit the size of the page' the page\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" " 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) menu.add_option(category_name, "resize_page", self.__onepage)
self.__onepage.connect('value-changed', self.__check_blank) self.__onepage.connect('value-changed', self.__check_blank)