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

5031: Some reports should not register the page orientation to non-default (Landscape)

Browse Source 
svn: r18366
This commit is contained in:
Paul Franklin 2011-10-23 20:38:22 +00:00
parent ca94331a70
commit 22b0f8476c
2 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/gen/plug/report/_options.py
View File

@ -416,33 +416,35 @@ class OptionListCollection(_options.OptionListCollection):
f.write('</last-common>\n') f.write('</last-common>\n')
def write_module_common(self, f, option_list): def write_module_common(self, f, option_list):
if option_list.get_style_name() \ if option_list.get_format_name():
and option_list.get_style_name() != self.default_style_name: f.write(' <format name="%s"/>\n' %
f.write(' <style name="%s"/>\n' % escxml(option_list.get_style_name()) ) escxml(option_list.get_format_name()) )
if option_list.get_paper_metric() \ if option_list.get_format_name() == 'html':
and option_list.get_paper_metric() != self.default_paper_metric: if option_list.get_css_filename():
f.write(' <metric value="%d"/>\n' % option_list.get_paper_metric() ) f.write(' <css name="%s"/>\n' %
if option_list.get_custom_paper_size() \ escxml(option_list.get_css_filename()))
and option_list.get_custom_paper_size() != self.default_custom_paper_size: else: # not HTML format, therefore it's paper
size = self.get_last_custom_paper_size() if option_list.get_paper_name():
f.write(' <size value="%f %f"/>\n' % (size[0], size[1]) ) f.write(' <paper name="%s"/>\n' %
if option_list.get_paper_name() \ escxml(option_list.get_paper_name()) )
and option_list.get_paper_name() != self.default_paper_name: if option_list.get_orientation() is not None: # 0 is legal
f.write(' <paper name="%s"/>\n' % escxml(option_list.get_paper_name()) ) f.write(' <orientation value="%d"/>\n' %
if option_list.get_css_filename() \ option_list.get_orientation() )
and option_list.get_css_filename() != self.default_css_filename: if option_list.get_paper_metric() is not None: # 0 is legal
f.write(' <css name="%s"/>\n' % escxml(option_list.get_css_filename())) f.write(' <metric value="%d"/>\n' %
if option_list.get_format_name() \ option_list.get_paper_metric() )
and option_list.get_format_name() != self.default_format_name: if option_list.get_custom_paper_size():
f.write(' <format name="%s"/>\n' % escxml(option_list.get_format_name()) ) size = self.get_last_custom_paper_size()
if option_list.get_orientation() \ f.write(' <size value="%f %f"/>\n' % (size[0], size[1]) )
and option_list.get_orientation() != self.default_orientation: if option_list.get_margins():
f.write(' <orientation value="%d"/>\n' % option_list.get_orientation() ) margins = option_list.get_margins()
if option_list.get_margins() \ for pos in range(len(margins)):
and option_list.get_margins() != self.default_margins: f.write(' <margin number="%s" value="%f"/>\n' %
margins = option_list.get_margins() (pos, margins[pos]))
for pos in range(len(margins)):
f.write(' <margin number="%s" value="%f"/>\n' % (pos, margins[pos])) if option_list.get_style_name():
f.write(' <style name="%s"/>\n' %
escxml(option_list.get_style_name()) )
def parse(self): def parse(self):
""" """
@ -599,7 +601,7 @@ class OptionHandler(_options.OptionHandler):
def set_common_options(self): def set_common_options(self):
if self.saved_option_list.get_style_name(): if self.saved_option_list.get_style_name():
self.style_name = self.saved_option_list.get_style_name() self.style_name = self.saved_option_list.get_style_name()
if self.saved_option_list.get_orientation(): if self.saved_option_list.get_orientation() is not None: # 0 is legal
self.orientation = self.saved_option_list.get_orientation() self.orientation = self.saved_option_list.get_orientation()
if self.saved_option_list.get_custom_paper_size(): if self.saved_option_list.get_custom_paper_size():
self.custom_paper_size = self.saved_option_list.get_custom_paper_size() self.custom_paper_size = self.saved_option_list.get_custom_paper_size()
@ -607,13 +609,30 @@ class OptionHandler(_options.OptionHandler):
self.margins = self.saved_option_list.get_margins() self.margins = self.saved_option_list.get_margins()
if self.saved_option_list.get_css_filename(): if self.saved_option_list.get_css_filename():
self.css_filename = self.saved_option_list.get_css_filename() self.css_filename = self.saved_option_list.get_css_filename()
if self.saved_option_list.get_paper_metric(): if self.saved_option_list.get_paper_metric() is not None: # 0 is legal
self.paper_metric = self.saved_option_list.get_paper_metric() self.paper_metric = self.saved_option_list.get_paper_metric()
if self.saved_option_list.get_paper_name(): if self.saved_option_list.get_paper_name():
self.paper_name = self.saved_option_list.get_paper_name() self.paper_name = self.saved_option_list.get_paper_name()
if self.saved_option_list.get_format_name(): if self.saved_option_list.get_format_name():
self.format_name = self.saved_option_list.get_format_name() self.format_name = self.saved_option_list.get_format_name()
def save_options(self):
"""
Saves options to file.
"""
# First we save options from options_dict
for option_name, option_data in self.options_dict.iteritems():
self.saved_option_list.set_option(option_name,
self.options_dict[option_name])
# Handle common options
self.save_common_options()
# Finally, save the whole collection into file
self.option_list_collection.save()
def save_common_options(self): def save_common_options(self):
# First we save common options # First we save common options
self.saved_option_list.set_style_name(self.style_name) self.saved_option_list.set_style_name(self.style_name)

1
src/gui/plug/report/_webreportdialog.py
View File

@ -45,6 +45,7 @@ class WebReportDialog(ReportDialog):
self.category = CATEGORY_WEB self.category = CATEGORY_WEB
ReportDialog.__init__(self, dbstate, uistate, option_class, ReportDialog.__init__(self, dbstate, uistate, option_class,
name, trans_name) name, trans_name)
self.options.handler.set_format_name('html')
def setup_init(self): def setup_init(self):
pass pass