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

Remove the "pagecount" option from the paper menu in the reports. It is not used.

Browse Source 
svn: r8325
This commit is contained in:
Brian Matherly 2007-03-27 12:04:07 +00:00
parent 51de7f3399
commit 2151ad9780
3 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-03-27 Brian Matherly <brian@gramps-project.org>
* src/ReportBase/_ReportDialog.py
* src/ReportBase/_BareReportDialog.py
Remove the "pagecount" option from the paper menu in the reports. It is not
used.
2007-03-27 Don Allingham <don@gramps-project.org> 2007-03-27 Don Allingham <don@gramps-project.org>
* src/DbManager.py (DbManager.populate): make default directory if it * src/DbManager.py (DbManager.populate): make default directory if it
does not exist does not exist

3
src/ReportBase/_BareReportDialog.py
View File

@ -102,9 +102,6 @@ class BareReportDialog(ManagedWindow.ManagedWindow):
return (_("Configuration"),self.report_name) return (_("Configuration"),self.report_name)
def init_interface(self): def init_interface(self):
#self.output_notebook = None
#self.notebook_page = 1
self.pagecount_menu = None
self.extra_menu = None self.extra_menu = None
self.extra_textbox = None self.extra_textbox = None
self.widgets = [] self.widgets = []

42
src/ReportBase/_ReportDialog.py
View File

@ -133,15 +133,6 @@ class ReportDialog(BareReportDialog):
spath = self.options.handler.get_stylesheet_savefile() spath = self.options.handler.get_stylesheet_savefile()
return spath.split('.')[0] return spath.split('.')[0]
def get_print_pagecount_map(self):
"""Return the data used to fill out the 'pagecount' option
menu in the print options box. The first value is a mapping
of string:value pairs. The strings will be used to label
individual menu items, and the values are what will be
returned if a given menu item is selected. The second value
is the name of menu item to pre-select."""
return (None, None)
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# Functions related getting/setting the default directory for a dialog. # Functions related getting/setting the default directory for a dialog.
@ -348,17 +339,9 @@ class ReportDialog(BareReportDialog):
self.pheight.set_text("%.2f" % paper.get_height_inches()) self.pheight.set_text("%.2f" % paper.get_height_inches())
def setup_paper_frame(self): def setup_paper_frame(self):
"""Set up the paper selection frame of the dialog. This """Set up the paper selection frame of the dialog."""
function relies on a paper_xxx() customization functions to
determine whether the pagecount menu should appear and what
its strings should be."""
(pagecount_map, start_text) = self.get_print_pagecount_map() self.paper_table = gtk.Table(4,6)
if pagecount_map:
self.paper_table = gtk.Table(3,6)
else:
self.paper_table = gtk.Table(4,6)
self.paper_table.set_col_spacings(12) self.paper_table.set_col_spacings(12)
self.paper_table.set_row_spacings(6) self.paper_table.set_row_spacings(6)
self.paper_table.set_border_width(6) self.paper_table.set_border_width(6)
@ -411,16 +394,6 @@ class ReportDialog(BareReportDialog):
self.orientation_menu.set(self.options.handler.get_orientation()) self.orientation_menu.set(self.options.handler.get_orientation())
self.metric.set_active(1) self.metric.set_active(1)
# The optional pagecount stuff.
if pagecount_map:
self.pagecount_menu = gtk.OptionMenu()
myMenu = Utils.build_string_optmenu(pagecount_map, start_text)
self.pagecount_menu.set_menu(myMenu)
l = gtk.Label("%s:" % _("Page Count"))
l.set_alignment(0.0,0.5)
self.paper_table.attach(l,1,2,3,4,gtk.SHRINK|gtk.FILL)
self.paper_table.attach(self.pagecount_menu,2,3,3,4)
def html_file_enable(self,obj): def html_file_enable(self,obj):
active = obj.get_active() active = obj.get_active()
text = unicode(obj.get_model()[active][0]) text = unicode(obj.get_model()[active][0])
@ -557,10 +530,7 @@ class ReportDialog(BareReportDialog):
def parse_paper_frame(self): def parse_paper_frame(self):
"""Parse the paper frame of the dialog. Save the user """Parse the paper frame of the dialog. Save the user
selected choices for later use. Note that this routine selected choices for later use."""
retrieves a value from the pagecount menu, whether or not it
is displayed on the screen. The subclass will know which ones
it has enabled. This is for simplicity of programming."""
(self.paper,paper_name) = self.papersize_menu.get_value() (self.paper,paper_name) = self.papersize_menu.get_value()
@ -590,12 +560,6 @@ class ReportDialog(BareReportDialog):
self.orien = self.orientation_menu.get_value() self.orien = self.orientation_menu.get_value()
self.options.handler.set_orientation(self.orien) self.options.handler.set_orientation(self.orien)
if self.pagecount_menu == None:
self.pagecount = 0
else:
self.pagecount = \
self.pagecount_menu.get_menu().get_active().get_data("d")
def parse_html_frame(self): def parse_html_frame(self):
"""Parse the html frame of the dialog. Save the user selected """Parse the html frame of the dialog. Save the user selected
html template name for later use. Note that this routine html template name for later use. Note that this routine