From dfed629290888c50658a2000dfdcdf70ccb2fadc Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 26 Mar 2007 04:13:22 +0000 Subject: [PATCH] Remove get_report_extra_menu_info() from _BareReportDialog as it is not used. svn: r8317 --- ChangeLog | 27 +++++++++++++++----------- src/ReportBase/_BareReportDialog.py | 30 ----------------------------- 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index b23b14d92..04ee3757b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,20 @@ 2007-03-25 Brian Matherly - *src/ReportBase/_ReportUtils.py - *src/ReportBase/_CommandLineReport.py - *src/ReportBase/_BareReportDialog.py - *src/plugins/IndivComplete.py - *src/plugins/NarrativeWeb.py - *src/plugins/TimeLine.py - *src/plugins/GraphViz.py - *src/plugins/EventCmp.py - *src/plugins/StatisticsChart.py - *src/PluginUtils/_Options.py - *src/PluginUtils/_Tool.py + * src/ReportBase/_ReportOptions.py: Remove get_display_format (not used) + * src/ReportBase/_BareReportDialog.py: + Remove get_report_extra_menu_info (not used) + +2007-03-25 Brian Matherly + * src/ReportBase/_ReportUtils.py + * src/ReportBase/_CommandLineReport.py + * src/ReportBase/_BareReportDialog.py + * src/plugins/IndivComplete.py + * src/plugins/NarrativeWeb.py + * src/plugins/TimeLine.py + * src/plugins/GraphViz.py + * src/plugins/EventCmp.py + * src/plugins/StatisticsChart.py + * src/PluginUtils/_Options.py + * src/PluginUtils/_Tool.py Remove get_report_filters() function. Let reports define the filter options themselves. diff --git a/src/ReportBase/_BareReportDialog.py b/src/ReportBase/_BareReportDialog.py index 7510c4d48..538bd8973 100644 --- a/src/ReportBase/_BareReportDialog.py +++ b/src/ReportBase/_BareReportDialog.py @@ -201,17 +201,6 @@ class BareReportDialog(ManagedWindow.ManagedWindow): 'page break between generations' check box""" return (10, 1) - def get_report_extra_menu_info(self): - """Return the data used to fill out the 'extra' option menu in - the report options box. The first value is the string to be - used as the label to the left of the menu. The second 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 third value - is the name of menu item to pre-select, and the final value is - a string to use as the tooltip for the textbox.""" - return (None, None, None, None) - #------------------------------------------------------------------------ # # Functions related to extending the options @@ -389,16 +378,12 @@ class BareReportDialog(ManagedWindow.ManagedWindow): generations fields is used in most (but not all) dialog boxes.""" - (em_label, extra_map, preset, em_tip) = self.get_report_extra_menu_info() - row = 0 max_rows = 0 if self.max_gen: max_rows = max_rows + 2 #if self.page_breaks: # max_rows = max_rows + 1 - if extra_map: - max_rows = max_rows + 1 max_rows = max_rows + len(self.widgets) @@ -440,21 +425,6 @@ class BareReportDialog(ManagedWindow.ManagedWindow): yoptions=gtk.SHRINK) row += 1 - # Now the "extra" option menu - if extra_map: - self.extra_menu_label = gtk.Label("%s:" % em_label) - self.extra_menu_label.set_alignment(0.0,0.5) - self.extra_menu = gtk.OptionMenu() - myMenu = Utils.build_string_optmenu(extra_map, preset) - self.extra_menu.set_menu(myMenu) - self.extra_menu.set_sensitive(len(extra_map) > 1) - self.add_tooltip(self.extra_menu,em_tip) - table.attach(self.extra_menu_label, 1, 2, row, row+1, - gtk.SHRINK|gtk.FILL, gtk.SHRINK) - table.attach(self.extra_menu, 2, 3, row, row+1, - yoptions=gtk.SHRINK) - row += 1 - # Setup requested widgets for (text,widget) in self.widgets: if text: