From 3a7c5469171ca676e7bfa360314e7106d228a831 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 28 Nov 2007 22:21:18 +0000 Subject: [PATCH] 2007-11-28 Douglas S.Blank * src/ReportBase/_MenuOptions.py: removed global need for gtk here svn: r9422 --- ChangeLog | 3 +++ src/ReportBase/_MenuOptions.py | 24 +++++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index caa520de4..c9097d4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-11-28 Douglas S.Blank + * src/ReportBase/_MenuOptions.py: removed global need for gtk here + 2007-11-28 Benny Malengier * example/gramps/example.gramps: correct 3.0 example.gramps, stext is no longer used, xml no longer sorted on id on ouput. diff --git a/src/ReportBase/_MenuOptions.py b/src/ReportBase/_MenuOptions.py index 7e7f1970a..c3654bbe8 100644 --- a/src/ReportBase/_MenuOptions.py +++ b/src/ReportBase/_MenuOptions.py @@ -22,13 +22,6 @@ """ Abstracted option handling. """ -#------------------------------------------------------------------------ -# -# gtk -# -#------------------------------------------------------------------------ -import gtk - #------------------------------------------------------------------------- # # gramps modules @@ -154,7 +147,7 @@ class StringOption(Option): """ Option.__init__(self,label,value) - def make_gui_obj(self, dialog): + def make_gui_obj(self, gtk, dialog): """ Add a StringOption (single line text) to the dialog. """ @@ -214,7 +207,7 @@ class NumberOption(Option): """ return self.__max - def make_gui_obj(self, dialog): + def make_gui_obj(self, gtk, dialog): """ Add a NumberOption to the dialog. """ @@ -251,7 +244,7 @@ class TextOption(Option): """ Option.__init__(self,label,value) - def make_gui_obj(self, dialog): + def make_gui_obj(self, gtk, dialog): """ Add a TextOption to the dialog. """ @@ -298,7 +291,7 @@ class BooleanOption(Option): """ Option.__init__(self,label,value) - def make_gui_obj(self, dialog): + def make_gui_obj(self, gtk, dialog): """ Add a BooleanOption to the dialog. """ @@ -357,7 +350,7 @@ class EnumeratedListOption(Option): """ return self.__items - def make_gui_obj(self, dialog): + def make_gui_obj(self, gtk, dialog): """ Add an EnumeratedListOption to the dialog. """ @@ -441,7 +434,7 @@ class FilterListOption(Option): """ return self.__filters - def make_gui_obj(self, dialog): + def make_gui_obj(self, gtk, dialog): """ Add an FilterListOption to the dialog. """ @@ -609,15 +602,16 @@ class MenuOptions(ReportOptions): """ raise NotImplementedError - def add_user_options(self,dialog): + def add_user_options(self, dialog): """ Generic method to add user options to the gui. """ + import gtk self.tooltips = gtk.Tooltips() for category in self.menu.get_categories(): for name in self.menu.get_option_names(category): option = self.menu.get_option(category,name) - option.make_gui_obj(dialog) + option.make_gui_obj(gtk, dialog) option.add_dialog_category(dialog, category) option.add_tooltip(self.tooltips)