2007-11-29 Douglas S.Blank <dblank@cs.brynmawr.edu>

* src/ReportBase/__init__.py: import MenuReportOptions
	* src/ReportBase/_ReportOptions.py: import MenuOptions and
	  define MenuReportOptions
	* src/plugins/Calendar.py: get MenuReportOptions from ReportOptions
	* src/plugins/DescendChart.py: ditto
	* src/plugins/AncestorChart.py: ditto
	* src/plugins/GVHourGlass.py: ditto
	* src/plugins/FanChart.py: ditto
	* src/PluginUtils/__init__.py: define MenuToolOptions
	* src/PluginUtils/_MenuOptions.py: Remove circular dependancies



svn: r9433

src/ReportBase/_ReportOptions.py

@@ -54,7 +54,7 @@ except:
 import const
 import Config
 import BaseDoc
-from PluginUtils import _Options
+from PluginUtils import _Options, MenuOptions
 
 #-------------------------------------------------------------------------
 #
@@ -541,3 +541,25 @@ class ReportOptions(_Options.Options):
         This method MUST NOT be overridden by subclasses.
         """
         self.handler.output = val
+
+#-------------------------------------------------------------------------
+#
+# MenuReportOptions
+#
+#-------------------------------------------------------------------------
+class MenuReportOptions(MenuOptions,ReportOptions):
+    """
+
+    The MenuReportOptions class implementes the ReportOptions
+    functionality in a generic way so that the user does not need to
+    be concerned with the graphical representation of the options.
+    
+    The user should inherit the MenuReportOptions class and override the 
+    add_menu_options function. The user can add options to the menu and the 
+    MenuReportOptions class will worry about setting up the GUI.
+
+    """
+    def __init__(self,name,person_id=None):
+        MenuOptions.__init__(self)
+        ReportOptions.__init__(self,name, person_id)
+

src/ReportBase/_ReportUtils.py

@@ -2457,3 +2457,4 @@ def get_person_filters(person, include_single=True):
         the_filters = [all, des, df, ans, com]
     the_filters.extend(CustomFilters.get_filters('Person'))
     return the_filters
+

src/ReportBase/__init__.py

@@ -36,7 +36,7 @@ from _CommandLineReport import cl_report
 from _DrawReportDialog import DrawReportDialog
 from _TextReportDialog import TextReportDialog
 
-from _ReportOptions import ReportOptions
+from _ReportOptions import ReportOptions, MenuReportOptions
 import _ReportUtils as ReportUtils
 
 from _Bibliography import Bibliography, Citation