Fixed issue 4670.

'one_page' option in the Ancestor/Descendant graphical repororts did not 
change the page type to 'custom'.
also landscape orientation did not switch the page.height and page.width
properties which made items print outside the page and give infinate loop
errors.



svn: r16708
This commit is contained in:
Craig J. Anderson 2011-02-24 17:11:35 +00:00
parent fd4c68835d
commit 1a3a101420
2 changed files with 7 additions and 2 deletions

View File

@ -136,8 +136,12 @@ def paperstyle_to_pagesetup(paper_style):
paper_size = gtk.PaperSize(gramps_to_gtk[gramps_paper_name]) paper_size = gtk.PaperSize(gramps_to_gtk[gramps_paper_name])
log.debug("Selected paper size: %s" % gramps_to_gtk[gramps_paper_name]) log.debug("Selected paper size: %s" % gramps_to_gtk[gramps_paper_name])
else: else:
paper_width = gramps_paper_size.get_width() * 10 if paper_style.get_orientation() == PAPER_PORTRAIT:
paper_height = gramps_paper_size.get_height() * 10 paper_width = gramps_paper_size.get_width() * 10
paper_height = gramps_paper_size.get_height() * 10
else:
paper_width = gramps_paper_size.get_height() * 10
paper_height = gramps_paper_size.get_width() * 10
paper_size = gtk.paper_size_new_custom("custom", paper_size = gtk.paper_size_new_custom("custom",
"Custom Size", "Custom Size",
paper_width, paper_width,

View File

@ -338,6 +338,7 @@ class Canvas(Page):
#user wants PAGE to be the size of the report. #user wants PAGE to be the size of the report.
size = self.doc.paper.get_size() size = self.doc.paper.get_size()
size.name = 'custom'
max_width, max_height = \ max_width, max_height = \
self.canvas.get_report_height_width() self.canvas.get_report_height_width()