diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index af67d29f6..3ba544c60 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2006-03-10 Alex Roitman + * src/Plugins.py, src/PluginMgr.py: Move to ReportUtils. + * various: use ReportUtils instead of PluginMgr. + 2006-03-10 Don Allingham * src/Mime/PythonMime.py: import gtk * src/DataViews/_FamilyList.py: family_add explict function added, diff --git a/gramps2/src/ArgHandler.py b/gramps2/src/ArgHandler.py index e732d566a..b319a1811 100644 --- a/gramps2/src/ArgHandler.py +++ b/gramps2/src/ArgHandler.py @@ -46,8 +46,7 @@ import Mime import QuestionDialog import Config import RecentFiles -import PluginMgr -from PluginUtils import Report, Tool +from PluginUtils import Report, Tool, cl_list, cli_tool_list #------------------------------------------------------------------------- # @@ -595,7 +594,7 @@ class ArgHandler: print "Report name not given. Please use name=reportname" os._exit(1) - for item in PluginMgr.cl_list: + for item in cl_list: if name == item[0]: category = item[1] report_class = item[2] @@ -611,7 +610,7 @@ class ArgHandler: return print "Unknown report name. Available names are:" - for item in PluginMgr.cl_list: + for item in cl_list: print " %s" % item[0] elif action == "tool": try: @@ -626,7 +625,7 @@ class ArgHandler: print "Tool name not given. Please use name=toolname" os._exit(1) - for item in PluginMgr.cli_tool_list: + for item in cli_tool_list: if name == item[0]: category = item[1] tool_class = item[2] @@ -636,7 +635,7 @@ class ArgHandler: return print "Unknown tool name. Available names are:" - for item in PluginMgr.cli_tool_list: + for item in cli_tool_list: print " %s" % item[0] else: print "Unknown action: %s." % action diff --git a/gramps2/src/DateHandler/__init__.py b/gramps2/src/DateHandler/__init__.py index 5a82e6559..23b6c4b72 100644 --- a/gramps2/src/DateHandler/__init__.py +++ b/gramps2/src/DateHandler/__init__.py @@ -114,7 +114,7 @@ def register_datehandler(locales,parse_class,display_class): # Import localized date classes # #------------------------------------------------------------------------- -from PluginMgr import load_plugins +from PluginUtils import load_plugins from const import datesDir load_plugins(datesDir) diff --git a/gramps2/src/Exporter.py b/gramps2/src/Exporter.py index 18896b9e7..751078073 100644 --- a/gramps2/src/Exporter.py +++ b/gramps2/src/Exporter.py @@ -52,7 +52,7 @@ import gtk #------------------------------------------------------------------------- import const import Utils -import PluginMgr +from PluginUtils import export_list import QuestionDialog import Config import GrampsDisplay @@ -368,4 +368,4 @@ class Exporter: native_description, native_config, native_ext)] - self.exports = self.exports + [item for item in PluginMgr.export_list] + self.exports = self.exports + [item for item in export_list] diff --git a/gramps2/src/GrampsDb/_WriteGedcom.py b/gramps2/src/GrampsDb/_WriteGedcom.py index d373ae877..7498fe691 100644 --- a/gramps2/src/GrampsDb/_WriteGedcom.py +++ b/gramps2/src/GrampsDb/_WriteGedcom.py @@ -1368,5 +1368,5 @@ _description = _('GEDCOM is used to transfer data between genealogy programs. ' _config = (_('GEDCOM export options'),GedcomWriterOptionBox) _filename = 'ged' -from PluginMgr import register_export +from PluginUtils import register_export register_export(exportData,_title,_description,_config,_filename) diff --git a/gramps2/src/GrampsDb/_WriteXML.py b/gramps2/src/GrampsDb/_WriteXML.py index 496637b41..7109709b7 100644 --- a/gramps2/src/GrampsDb/_WriteXML.py +++ b/gramps2/src/GrampsDb/_WriteXML.py @@ -997,5 +997,5 @@ _description = _('The GRAMPS XML database is a format used by older ' _config = None _filename = 'gramps' -from PluginMgr import register_export +from PluginUtils import register_export register_export(exportData,_title,_description,_config,_filename) diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index f731e1e52..2f10bc3ad 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -75,8 +75,6 @@ gdir_PYTHON = \ PageView.py\ PaperMenu.py\ PeopleModel.py\ - PluginMgr.py\ - Plugins.py\ QuestionDialog.py\ RecentFiles.py\ Relationship.py\ diff --git a/gramps2/src/PluginUtils/Makefile.am b/gramps2/src/PluginUtils/Makefile.am index 74430f097..2f8d77136 100644 --- a/gramps2/src/PluginUtils/Makefile.am +++ b/gramps2/src/PluginUtils/Makefile.am @@ -11,7 +11,9 @@ pkgdata_PYTHON = \ _ReportOptions.py\ _Report.py\ _ReportUtils.py\ - _Tool.py + _Tool.py\ + _PluginMgr.py\ + _Plugins.py pkgpyexecdir = @pkgpyexecdir@/PluginUtils pkgpythondir = @pkgpythondir@/PluginUtils diff --git a/gramps2/src/PluginMgr.py b/gramps2/src/PluginUtils/_PluginMgr.py similarity index 97% rename from gramps2/src/PluginMgr.py rename to gramps2/src/PluginUtils/_PluginMgr.py index 590708078..1318580f4 100644 --- a/gramps2/src/PluginMgr.py +++ b/gramps2/src/PluginUtils/_PluginMgr.py @@ -195,14 +195,14 @@ def register_tool( them as needed. """ - from PluginUtils import Tool - (junk,gui_task) = divmod(modes,2**Tool.MODE_GUI) + import _Tool + (junk,gui_task) = divmod(modes,2**_Tool.MODE_GUI) if gui_task: _register_gui_tool(tool_class,options_class,translated_name, name,category,description, status,author_name,author_email,unsupported) - (junk,cli_task) = divmod(modes-gui_task,2**Tool.MODE_CLI) + (junk,cli_task) = divmod(modes-gui_task,2**_Tool.MODE_CLI) if cli_task: _register_cli_tool(name,category,tool_class,options_class, translated_name,unsupported) @@ -263,21 +263,21 @@ def register_report( The low-level functions (starting with '_') should not be used on their own. Instead, this function will call them as needed. """ - from PluginUtils import Report - (junk,standalone_task) = divmod(modes,2**Report.MODE_GUI) + import _Report + (junk,standalone_task) = divmod(modes,2**_Report.MODE_GUI) if standalone_task: _register_standalone(report_class,options_class,translated_name, name,category,description, status,author_name,author_email,unsupported) - (junk,book_item_task) = divmod(modes-standalone_task,2**Report.MODE_BKI) + (junk,book_item_task) = divmod(modes-standalone_task,2**_Report.MODE_BKI) if book_item_task: - book_item_category = Report.book_categories[category] + book_item_category = _Report.book_categories[category] register_book_item(translated_name,book_item_category, report_class,options_class,name,unsupported) (junk,command_line_task) = divmod(modes-standalone_task-book_item_task, - 2**Report.MODE_CLI) + 2**_Report.MODE_CLI) if command_line_task: _register_cl_report(name,category,report_class,options_class, translated_name,unsupported) diff --git a/gramps2/src/Plugins.py b/gramps2/src/PluginUtils/_Plugins.py similarity index 87% rename from gramps2/src/Plugins.py rename to gramps2/src/PluginUtils/_Plugins.py index 4497947fb..e5dfa1c4d 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/PluginUtils/_Plugins.py @@ -57,8 +57,9 @@ import const import Utils import Config import Errors -from PluginUtils import Report, Tool -import PluginMgr +import _Report +import _Tool +import _PluginMgr import GrampsDisplay import DisplayState @@ -158,10 +159,10 @@ class PluginDialog(DisplayState.ManagedWindow): (item_class,options_class,title,category,name) = self.item if self.content == REPORTS: - Report.report(self.state.db,self.state.active, + _Report.report(self.state.db,self.state.active, item_class,options_class,title,name,category) else: - Tool.gui_tool(self.state.db,self.state.active, + _Tool.gui_tool(self.state.db,self.state.active, item_class,options_class,title,name,category, self.state.db.request_rebuild,self.parent) @@ -266,8 +267,8 @@ class ReportPlugins(PluginDialog): dbstate, uistate, track, - PluginMgr.report_list, - Report.standalone_categories, + _PluginMgr.report_list, + _Report.standalone_categories, _("Report Selection"), _("Select a report from those available on the left."), _("_Generate"), _("Generate selected report"), @@ -292,8 +293,8 @@ class ToolPlugins(PluginDialog): dbstate, uistate, track, - PluginMgr.tool_list, - Tool.tool_categories, + _PluginMgr.tool_list, + _Tool.tool_categories, _("Tool Selection"), _("Select a tool from those available on the left."), _("_Run"), @@ -335,16 +336,16 @@ class PluginStatus(DisplayState.ManagedWindow): info = cStringIO.StringIO() - if len(PluginMgr.expect_list) + len(PluginMgr.failmsg_list) == 0: + if len(_PluginMgr.expect_list) + len(_PluginMgr.failmsg_list) == 0: window.get_buffer().set_text(_('All modules were successfully loaded.')) else: info.write(_("The following modules could not be loaded:")) info.write("\n\n") - for (filename,msg) in PluginMgr.expect_list: + for (filename,msg) in _PluginMgr.expect_list: info.write("%s: %s\n\n" % (filename,msg)) - for (filename,msgs) in PluginMgr.failmsg_list: + for (filename,msgs) in _PluginMgr.failmsg_list: error = str(msgs[0]) if error[0:11] == "exceptions.": error = error[11:] @@ -373,15 +374,15 @@ class PluginStatus(DisplayState.ManagedWindow): # #------------------------------------------------------------------------- def build_tools_menu(top_menu,callback): - build_plugin_menu(PluginMgr.tool_list, - Tool.tool_categories, - Tool.gui_tool, + build_plugin_menu(_PluginMgr.tool_list, + _Tool.tool_categories, + _Tool.gui_tool, top_menu,callback) def build_report_menu(top_menu,callback): - build_plugin_menu(PluginMgr.report_list, - Report.standalone_categories, - Report.report, + build_plugin_menu(_PluginMgr.report_list, + _Report.standalone_categories, + _Report.report, top_menu,callback) def build_plugin_menu(item_list,categories,func,top_menu,callback): @@ -452,9 +453,9 @@ def by_menu_name(a,b): # Reload plugins # #------------------------------------------------------------------------- -class Reload(Tool.Tool): +class Reload(_Tool.Tool): def __init__(self,db,person,options_class,name,callback=None,parent=None): - Tool.Tool.__init__(self,db,person,options_class,name) + _Tool.Tool.__init__(self,db,person,options_class,name) """ Treated as a callback, causes all plugins to get reloaded. @@ -463,42 +464,42 @@ class Reload(Tool.Tool): pymod = re.compile(r"^(.*)\.py$") - oldfailmsg = PluginMgr.failmsg_list[:] - PluginMgr.failmsg_list = [] + oldfailmsg = _PluginMgr.failmsg_list[:] + _PluginMgr.failmsg_list = [] # attempt to reload all plugins that have succeeded in the past - for plugin in PluginMgr._success_list: + for plugin in _PluginMgr._success_list: filename = os.path.basename(plugin.__file__) filename = filename.replace('pyc','py') filename = filename.replace('pyo','py') try: reload(plugin) except: - PluginMgr.failmsg_list.append((filename,sys.exc_info())) + _PluginMgr.failmsg_list.append((filename,sys.exc_info())) # Remove previously good plugins that are now bad # from the registered lists - (PluginMgr.export_list, - PluginMgr.import_list, - PluginMgr.tool_list, - PluginMgr.cli_tool_list, - PluginMgr.report_list, - PluginMgr.bkitems_list, - PluginMgr.cl_list, - PluginMgr.textdoc_list, - PluginMgr.bookdoc_list, - PluginMgr.drawdoc_list) = PluginMgr.purge_failed( - PluginMgr.failmsg_list, - PluginMgr.export_list, - PluginMgr.import_list, - PluginMgr.tool_list, - PluginMgr.cli_tool_list, - PluginMgr.report_list, - PluginMgr.bkitems_list, - PluginMgr.cl_list, - PluginMgr.textdoc_list, - PluginMgr.bookdoc_list, - PluginMgr.drawdoc_list) + (_PluginMgr.export_list, + _PluginMgr.import_list, + _PluginMgr.tool_list, + _PluginMgr.cli_tool_list, + _PluginMgr.report_list, + _PluginMgr.bkitems_list, + _PluginMgr.cl_list, + _PluginMgr.textdoc_list, + _PluginMgr.bookdoc_list, + _PluginMgr.drawdoc_list) = _PluginMgr.purge_failed( + _PluginMgr.failmsg_list, + _PluginMgr.export_list, + _PluginMgr.import_list, + _PluginMgr.tool_list, + _PluginMgr.cli_tool_list, + _PluginMgr.report_list, + _PluginMgr.bkitems_list, + _PluginMgr.cl_list, + _PluginMgr.textdoc_list, + _PluginMgr.bookdoc_list, + _PluginMgr.drawdoc_list) # attempt to load the plugins that have failed in the past for (filename,message) in oldfailmsg: @@ -506,7 +507,7 @@ class Reload(Tool.Tool): match = pymod.match(name[1]) if not match: continue - PluginMgr.attempt_list.append(filename) + _PluginMgr.attempt_list.append(filename) plugin = match.groups()[0] try: # For some strange reason second importing of a failed plugin @@ -514,29 +515,29 @@ class Reload(Tool.Tool): # Looks like a bug in Python. a = __import__(plugin) reload(a) - PluginMgr._success_list.append(a) + _PluginMgr._success_list.append(a) except: - PluginMgr.failmsg_list.append((filename,sys.exc_info())) + _PluginMgr.failmsg_list.append((filename,sys.exc_info())) # attempt to load any new files found - for directory in PluginMgr.loaddir_list: + for directory in _PluginMgr.loaddir_list: for filename in os.listdir(directory): name = os.path.split(filename) match = pymod.match(name[1]) if not match: continue - if filename in PluginMgr.attempt_list: + if filename in _PluginMgr.attempt_list: continue - PluginMgr.attempt_list.append(filename) + _PluginMgr.attempt_list.append(filename) plugin = match.groups()[0] try: a = __import__(plugin) - if a not in PluginMgr._success_list: - PluginMgr._success_list.append(a) + if a not in _PluginMgr._success_list: + _PluginMgr._success_list.append(a) except: - PluginMgr.failmsg_list.append((filename,sys.exc_info())) + _PluginMgr.failmsg_list.append((filename,sys.exc_info())) - if Config.get_pop_plugin_status() and len(PluginMgr.failmsg_list): + if Config.get_pop_plugin_status() and len(_PluginMgr.failmsg_list): PluginStatus() else: global status_up @@ -547,13 +548,13 @@ class Reload(Tool.Tool): # Re-generate tool and report menus parent.build_plugin_menus(rebuild=True) -class ReloadOptions(Tool.ToolOptions): +class ReloadOptions(_Tool.ToolOptions): """ Defines options and provides handling interface. """ def __init__(self,name,person_id=None): - Tool.ToolOptions.__init__(self,name,person_id) + _Tool.ToolOptions.__init__(self,name,person_id) #------------------------------------------------------------------------- # @@ -562,12 +563,12 @@ class ReloadOptions(Tool.ToolOptions): #------------------------------------------------------------------------- if __debug__: - PluginMgr.register_tool( + _PluginMgr.register_tool( name = 'reload', - category = Tool.TOOL_DEBUG, + category = _Tool.TOOL_DEBUG, tool_class = Reload, options_class = ReloadOptions, - modes = Tool.MODE_GUI, + modes = _Tool.MODE_GUI, translated_name = _("Reload plugins"), description=_("Attempt to reload plugins. " "Note: This tool itself is not reloaded!"), diff --git a/gramps2/src/PluginUtils/_Report.py b/gramps2/src/PluginUtils/_Report.py index db5a744a7..a7c5ef127 100644 --- a/gramps2/src/PluginUtils/_Report.py +++ b/gramps2/src/PluginUtils/_Report.py @@ -52,7 +52,7 @@ import gtk #------------------------------------------------------------------------- import const import Utils -import PluginMgr +import _PluginMgr import BaseDoc from _StyleEditor import StyleListDisplay import Config @@ -1769,27 +1769,27 @@ class CommandLineReport: self.options_help['of'].append(os.path.expanduser("~/whatever_name")) if self.category == CATEGORY_TEXT: - for item in PluginMgr.textdoc_list: + for item in _PluginMgr.textdoc_list: if item[7] == self.options_dict['off']: self.format = item[1] self.options_help['off'].append( - [ item[7] for item in PluginMgr.textdoc_list ] + [ item[7] for item in _PluginMgr.textdoc_list ] ) self.options_help['off'].append(False) elif self.category == CATEGORY_DRAW: - for item in PluginMgr.drawdoc_list: + for item in _PluginMgr.drawdoc_list: if item[6] == self.options_dict['off']: self.format = item[1] self.options_help['off'].append( - [ item[6] for item in PluginMgr.drawdoc_list ] + [ item[6] for item in _PluginMgr.drawdoc_list ] ) self.options_help['off'].append(False) elif self.category == CATEGORY_BOOK: - for item in PluginMgr.bookdoc_list: + for item in _PluginMgr.bookdoc_list: if item[6] == self.options_dict['off']: self.format = item[1] self.options_help['off'].append( - [ item[6] for item in PluginMgr.bookdoc_list ] + [ item[6] for item in _PluginMgr.bookdoc_list ] ) self.options_help['off'].append(False) else: @@ -1956,9 +1956,9 @@ class GrampsTextFormatComboBox(gtk.ComboBox): out_pref = Config.get_output_preference() index = 0 - PluginMgr.textdoc_list.sort() + _PluginMgr.textdoc_list.sort() active_index = 0 - for item in PluginMgr.textdoc_list: + for item in _PluginMgr.textdoc_list: if tables and item[2] == 0: continue name = item[0] @@ -1973,25 +1973,25 @@ class GrampsTextFormatComboBox(gtk.ComboBox): self.set_active(active_index) def get_label(self): - return PluginMgr.textdoc_list[self.get_active()][0] + return _PluginMgr.textdoc_list[self.get_active()][0] def get_reference(self): - return PluginMgr.textdoc_list[self.get_active()][1] + return _PluginMgr.textdoc_list[self.get_active()][1] def get_paper(self): - return PluginMgr.textdoc_list[self.get_active()][3] + return _PluginMgr.textdoc_list[self.get_active()][3] def get_styles(self): - return PluginMgr.textdoc_list[self.get_active()][4] + return _PluginMgr.textdoc_list[self.get_active()][4] def get_ext(self): - return PluginMgr.textdoc_list[self.get_active()][5] + return _PluginMgr.textdoc_list[self.get_active()][5] def get_printable(self): - return PluginMgr.textdoc_list[self.get_active()][6] + return _PluginMgr.textdoc_list[self.get_active()][6] def get_clname(self): - return PluginMgr.textdoc_list[self.get_active()][7] + return _PluginMgr.textdoc_list[self.get_active()][7] class GrampsDrawFormatComboBox(gtk.ComboBox): @@ -2004,9 +2004,9 @@ class GrampsDrawFormatComboBox(gtk.ComboBox): out_pref = Config.get_output_preference() index = 0 - PluginMgr.drawdoc_list.sort() + _PluginMgr.drawdoc_list.sort() active_index = 0 - for item in PluginMgr.drawdoc_list: + for item in _PluginMgr.drawdoc_list: if tables and item[2] == 0: continue name = item[0] @@ -2021,25 +2021,25 @@ class GrampsDrawFormatComboBox(gtk.ComboBox): self.set_active(active_index) def get_reference(self): - return PluginMgr.drawdoc_list[self.get_active()][1] + return _PluginMgr.drawdoc_list[self.get_active()][1] def get_label(self): - return PluginMgr.drawdoc_list[self.get_active()][0] + return _PluginMgr.drawdoc_list[self.get_active()][0] def get_paper(self): - return PluginMgr.drawdoc_list[self.get_active()][2] + return _PluginMgr.drawdoc_list[self.get_active()][2] def get_styles(self): - return PluginMgr.drawdoc_list[self.get_active()][3] + return _PluginMgr.drawdoc_list[self.get_active()][3] def get_ext(self): - return PluginMgr.drawdoc_list[self.get_active()][4] + return _PluginMgr.drawdoc_list[self.get_active()][4] def get_printable(self): - return PluginMgr.drawdoc_list[self.get_active()][5] + return _PluginMgr.drawdoc_list[self.get_active()][5] def get_clname(self): - return PluginMgr.drawdoc_list[self.get_active()][6] + return _PluginMgr.drawdoc_list[self.get_active()][6] class GrampsBookFormatComboBox(gtk.ComboBox): @@ -2052,10 +2052,10 @@ class GrampsBookFormatComboBox(gtk.ComboBox): out_pref = Config.get_output_preference() index = 0 - PluginMgr.drawdoc_list.sort() + _PluginMgr.drawdoc_list.sort() active_index = 0 self.data = [] - for item in PluginMgr.bookdoc_list: + for item in _PluginMgr.bookdoc_list: if tables and item[2] == 0: continue self.data.append(item) diff --git a/gramps2/src/PluginUtils/__init__.py b/gramps2/src/PluginUtils/__init__.py index 6c10aed7c..acd0431a1 100644 --- a/gramps2/src/PluginUtils/__init__.py +++ b/gramps2/src/PluginUtils/__init__.py @@ -20,7 +20,16 @@ # $Id: Report.py 6044 2006-03-03 00:10:52Z rshura $ +from _PluginMgr import \ + register_export, register_import, \ + register_tool, register_report, \ + register_relcalc, relationship_class, \ + textdoc_list, drawdoc_list, bookdoc_list, \ + bkitems_list, cl_list, cli_tool_list, \ + load_plugins + import _Report as Report import _ReportOptions as ReportOptions import _ReportUtils as ReportUtils import _Tool as Tool +import _Plugins as Plugins diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py index 409ced275..3ec288917 100644 --- a/gramps2/src/ViewManager.py +++ b/gramps2/src/ViewManager.py @@ -52,8 +52,6 @@ import gtk #------------------------------------------------------------------------- import DisplayState import const -import PluginMgr -import Plugins import Config import GrampsDb import GrampsCfg @@ -66,7 +64,9 @@ import TipOfDay import Bookmarks import RecentFiles import NameDisplay -from PluginUtils import Report, Tool +from PluginUtils import Plugins, Report, Tool, \ + relationship_class, load_plugins, \ + import_list, tool_list, report_list import Mime import Config import GrampsWidgets @@ -182,7 +182,7 @@ class ViewManager: self.statusbar = gtk.Statusbar() - self.RelClass = PluginMgr.relationship_class + self.RelClass = relationship_class vbox = gtk.VBox() self.window.add(vbox) @@ -264,19 +264,19 @@ class ViewManager: self.change_page(None,None) self.actiongroup.set_visible(False) self.fileactions.set_sensitive(False) - self.load_plugins() + self.do_load_plugins() self.build_tools_menu() self.build_report_menu() self.fileactions.set_sensitive(True) self.uistate.widget.set_sensitive(True) - def load_plugins(self): + def do_load_plugins(self): self.uistate.status_text(_('Loading document formats...')) - error = PluginMgr.load_plugins(const.docgenDir) - error |= PluginMgr.load_plugins(os.path.expanduser("~/.gramps/docgen")) + error = load_plugins(const.docgenDir) + error |= load_plugins(os.path.expanduser("~/.gramps/docgen")) self.uistate.status_text(_('Loading plugins...')) - error |= PluginMgr.load_plugins(const.pluginsDir) - error |= PluginMgr.load_plugins(os.path.expanduser("~/.gramps/plugins")) + error |= load_plugins(const.pluginsDir) + error |= load_plugins(os.path.expanduser("~/.gramps/plugins")) if Config.get_pop_plugin_status() and error: Plugins.PluginStatus(self) self.uistate.push_message(_('Ready')) @@ -546,7 +546,7 @@ class ViewManager: format_list = [const.app_gramps,const.app_gramps_xml,const.app_gedcom] # Add more data type selections if opening existing db - for data in PluginMgr.import_list: + for data in import_list: mime_filter = data[1] mime_type = data[2] native_format = data[2] @@ -597,7 +597,7 @@ class ViewManager: # The above native formats did not work, so we need to # look up the importer for this format # and create an empty native database to import data in -# for (importData,mime_filter,mime_type,native_format,format_name) in PluginMgr.import_list: +# for (importData,mime_filter,mime_type,native_format,format_name) in import_list: # if filetype == mime_type or the_file == mime_type: # QuestionDialog.OkDialog( # _("Opening non-native format"), @@ -903,7 +903,7 @@ class ViewManager: format_list = [const.app_gramps,const.app_gramps_xml,const.app_gedcom] # Add more data type selections if opening existing db - for data in PluginMgr.import_list: + for data in import_list: mime_filter = data[1] mime_type = data[2] native_format = data[3] @@ -955,7 +955,7 @@ class ViewManager: (the_path,the_file) = os.path.split(filename) Config.save_last_import_dir(the_path) for (importData,mime_filter,mime_type, - native_format,format_name) in PluginMgr.import_list: + native_format,format_name) in import_list: if filetype == mime_type or the_file == mime_type: self._do_import(choose,importData,filename) return True @@ -982,7 +982,7 @@ class ViewManager: def build_tools_menu(self): self.toolactions = gtk.ActionGroup('ToolWindow') (ui,actions) = self.build_plugin_menu('ToolsMenu', - PluginMgr.tool_list, + tool_list, Tool.tool_categories, make_tool_callback) self.toolactions.add_actions(actions) @@ -992,7 +992,7 @@ class ViewManager: def build_report_menu(self): self.reportactions = gtk.ActionGroup('ReportWindow') (ui,actions) = self.build_plugin_menu('ReportsMenu', - PluginMgr.report_list, + report_list, Report.standalone_categories, make_report_callback) self.reportactions.add_actions(actions) diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 47350b91e..77bad3394 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,21 +26,25 @@ Provides a BaseDoc based interface to the AbiWord document format. #------------------------------------------------------------------------- # -# Imported Modules +# Python Modules # #------------------------------------------------------------------------- import base64 import os +from gettext import gettext as _ +#------------------------------------------------------------------------- +# +# Gramps Modules +# +#------------------------------------------------------------------------- import BaseDoc import Errors -import PluginMgr +from PluginUtils import register_text_doc import ImgManip import Mime import Utils -from gettext import gettext as _ - #------------------------------------------------------------------------- # # Class Definitions @@ -333,6 +337,6 @@ try: print_label=_("Open in %s") % prog[1] else: print_label=None - PluginMgr.register_text_doc(mtype,AbiWordDoc,1,1,1,".abw", print_label) + register_text_doc(mtype,AbiWordDoc,1,1,1,".abw", print_label) except: - PluginMgr.register_text_doc(_('AbiWord document'),AbiWordDoc,1,1,1,".abw", None) + register_text_doc(_('AbiWord document'),AbiWordDoc,1,1,1,".abw", None) diff --git a/gramps2/src/docgen/AsciiDoc.py b/gramps2/src/docgen/AsciiDoc.py index b62fdf45a..ef0ddfa38 100644 --- a/gramps2/src/docgen/AsciiDoc.py +++ b/gramps2/src/docgen/AsciiDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -import PluginMgr +from PluginUtils import register_text_doc import Errors import Mime @@ -391,7 +391,7 @@ try: else: print_label=None - PluginMgr.register_text_doc(mtype,AsciiDoc,1,1,1,".txt", print_label) + register_text_doc(mtype,AsciiDoc,1,1,1,".txt", print_label) except: - PluginMgr.register_text_doc(_("Plain Text"),AsciiDoc,1,1,1,".txt", None) + register_text_doc(_("Plain Text"),AsciiDoc,1,1,1,".txt", None) diff --git a/gramps2/src/docgen/HtmlDoc.py b/gramps2/src/docgen/HtmlDoc.py index 355200ee5..0edb718ac 100644 --- a/gramps2/src/docgen/HtmlDoc.py +++ b/gramps2/src/docgen/HtmlDoc.py @@ -35,7 +35,7 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -import PluginMgr +from PluginUtils import register_text_doc import ImgManip import tarfile import const @@ -506,6 +506,6 @@ try: print_label=_("Open in %s") % prog[1] else: print_label=None - PluginMgr.register_text_doc(mtype,HtmlDoc,1,0,1,".html", print_label) + register_text_doc(mtype,HtmlDoc,1,0,1,".html", print_label) except: - PluginMgr.register_text_doc(_('HTML'),HtmlDoc,1,0,1,".html", None) + register_text_doc(_('HTML'),HtmlDoc,1,0,1,".html", None) diff --git a/gramps2/src/docgen/KwordDoc.py b/gramps2/src/docgen/KwordDoc.py index 6148961a7..563f7181b 100644 --- a/gramps2/src/docgen/KwordDoc.py +++ b/gramps2/src/docgen/KwordDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,21 +20,34 @@ # $Id$ -import BaseDoc - +#------------------------------------------------------------------------ +# +# Python modules +# +#------------------------------------------------------------------------ import time import cStringIO import gzip import os +from gettext import gettext as _ +#------------------------------------------------------------------------ +# +# Gramps modules +# +#------------------------------------------------------------------------ +import BaseDoc import Errors from TarFile import TarFile -import PluginMgr +from PluginUtils import register_text_doc import ImgManip import Mime -from gettext import gettext as _ - +#------------------------------------------------------------------------ +# +# +# +#------------------------------------------------------------------------ def points(val): inch = float(val)/2.54 return (int(inch*72)) @@ -495,6 +508,6 @@ try: print_label=_("Open in %s") % prog[1] else: print_label=None - PluginMgr.register_text_doc(mtype, KwordDoc, 1, 1, 1, ".kwd", print_label) + register_text_doc(mtype, KwordDoc, 1, 1, 1, ".kwd", print_label) except: - PluginMgr.register_text_doc(_('KWord'), KwordDoc, 1, 1, 1, ".kwd", print_label) + register_text_doc(_('KWord'), KwordDoc, 1, 1, 1, ".kwd", print_label) diff --git a/gramps2/src/docgen/LPRDoc.py b/gramps2/src/docgen/LPRDoc.py index 75586e4f1..3b7070af7 100644 --- a/gramps2/src/docgen/LPRDoc.py +++ b/gramps2/src/docgen/LPRDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # Modifications and feature additions: # 2002 Donald A. Peterson @@ -61,8 +61,9 @@ else: # #------------------------------------------------------------------------ import BaseDoc -import PluginMgr -from ReportUtils import rgb_color +from PluginUtils import ReportUtils, \ + register_text_doc, register_draw_doc, register_book_doc +rgb_color = ReportUtils.rgb_color #------------------------------------------------------------------------ # @@ -1245,7 +1246,7 @@ class LPRDoc(BaseDoc.BaseDoc): # Register the document generator with the system # #------------------------------------------------------------------------ -PluginMgr.register_text_doc( +register_text_doc( name=_("Print..."), classref=LPRDoc, table=1, @@ -1255,7 +1256,7 @@ PluginMgr.register_text_doc( print_report_label=None, clname='print') -PluginMgr.register_book_doc( +register_book_doc( _("Print..."), LPRDoc, 1, @@ -1264,7 +1265,7 @@ PluginMgr.register_book_doc( "", 'print') -PluginMgr.register_draw_doc( +register_draw_doc( _("Print..."), LPRDoc, 1, diff --git a/gramps2/src/docgen/LaTeXDoc.py b/gramps2/src/docgen/LaTeXDoc.py index 104b95977..be725d0f5 100644 --- a/gramps2/src/docgen/LaTeXDoc.py +++ b/gramps2/src/docgen/LaTeXDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # Modifications and feature additions: # 2002-2003 Donald A. Peterson @@ -41,7 +41,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -import PluginMgr +from PluginUtils import register_text_doc import ImgManip import Errors @@ -501,7 +501,7 @@ class LaTeXDoc(BaseDoc.BaseDoc): # Register the document generator with the system # #------------------------------------------------------------------------ -PluginMgr.register_text_doc( +register_text_doc( name=_("LaTeX"), classref=LaTeXDoc, table=1, diff --git a/gramps2/src/docgen/ODFDoc.py b/gramps2/src/docgen/ODFDoc.py index ececa5687..29a7d0e00 100644 --- a/gramps2/src/docgen/ODFDoc.py +++ b/gramps2/src/docgen/ODFDoc.py @@ -41,11 +41,12 @@ from math import pi, cos, sin, fabs import Errors import BaseDoc import const -import PluginMgr +import PluginUtils import ReportUtils, \ + register_text_doc, register_draw_doc, register_book_doc +pt2cm = ReportUtils.pt2cm import ImgManip import FontScale import Mime -from ReportUtils import pt2cm #------------------------------------------------------------------------- # @@ -1141,13 +1142,10 @@ try: else: print_label = None - PluginMgr.register_text_doc(mtype,ODFDoc,1,1,1,".odt",print_label) - PluginMgr.register_book_doc(mtype,ODFDoc,1,1,1,".odt") - PluginMgr.register_draw_doc(mtype,ODFDoc,1,1, ".odt",print_label); + register_text_doc(mtype,ODFDoc,1,1,1,".odt",print_label) + register_book_doc(mtype,ODFDoc,1,1,1,".odt") + register_draw_doc(mtype,ODFDoc,1,1, ".odt",print_label); except: - PluginMgr.register_text_doc(_('Open Document Text'), - ODFDoc,1,1,1,".odt", None) - PluginMgr.register_book_doc(_("Open Document Text"), - ODFDoc,1,1,1,".odt") - PluginMgr.register_draw_doc(_("Open Document Text"), - ODFDoc,1,1,".odt",None); + register_text_doc(_('Open Document Text'),ODFDoc,1,1,1,".odt", None) + register_book_doc(_("Open Document Text"),ODFDoc,1,1,1,".odt") + register_draw_doc(_("Open Document Text"),ODFDoc,1,1,".odt",None); diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py index b61184eb2..29946caa3 100644 --- a/gramps2/src/docgen/OpenOfficeDoc.py +++ b/gramps2/src/docgen/OpenOfficeDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,6 +31,8 @@ import time import locale from cStringIO import StringIO from math import pi, cos, sin, fabs +from gettext import gettext as _ +from xml.sax.saxutils import escape #------------------------------------------------------------------------- # @@ -40,21 +42,19 @@ from math import pi, cos, sin, fabs import Errors import BaseDoc import const -import PluginMgr +from PluginUtils import ReportUtils, \ + register_text_doc, register_draw_doc, register_book_doc +pt2cm = ReportUtils.pt2cm import ImgManip import FontScale import Mime import Utils -from ReportUtils import pt2cm #------------------------------------------------------------------------- # -# internationalization +# constants # #------------------------------------------------------------------------- -from gettext import gettext as _ -from xml.sax.saxutils import escape - _apptype = 'application/vnd.sun.xml.writer' _esc_map = { @@ -1003,10 +1003,12 @@ try: else: print_label = None - PluginMgr.register_text_doc(mtype,OpenOfficeDoc,1,1,1,".sxw",print_label) - PluginMgr.register_book_doc(mtype,OpenOfficeDoc,1,1,1,".sxw") - PluginMgr.register_draw_doc(mtype,OpenOfficeDoc,1,1, ".sxw",print_label); + register_text_doc(mtype,OpenOfficeDoc,1,1,1,".sxw",print_label) + register_book_doc(mtype,OpenOfficeDoc,1,1,1,".sxw") + register_draw_doc(mtype,OpenOfficeDoc,1,1, ".sxw",print_label); except: - PluginMgr.register_text_doc(_('OpenOffice.org Writer'), OpenOfficeDoc,1,1,1,".sxw", None) - PluginMgr.register_book_doc(_("OpenOffice.org Writer"), OpenOfficeDoc,1,1,1,".sxw") - PluginMgr.register_draw_doc(_("OpenOffice.org Writer"), OpenOfficeDoc,1,1,".sxw",None); + register_text_doc(_('OpenOffice.org Writer'), + OpenOfficeDoc,1,1,1,".sxw", None) + register_book_doc(_("OpenOffice.org Writer"), OpenOfficeDoc,1,1,1,".sxw") + register_draw_doc(_("OpenOffice.org Writer"), + OpenOfficeDoc,1,1,".sxw",None); diff --git a/gramps2/src/docgen/PSDrawDoc.py b/gramps2/src/docgen/PSDrawDoc.py index 63ca56122..bcc03016b 100644 --- a/gramps2/src/docgen/PSDrawDoc.py +++ b/gramps2/src/docgen/PSDrawDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,11 +33,10 @@ from gettext import gettext as _ # Gramps modules # #------------------------------------------------------------------------- -import PluginMgr +from PluginUtils import register_draw_doc, ReportUtils, Report +pt2cm, rgb_color = ReportUtils.pt2cm, ReportUtils.rgb_color import Errors import BaseDoc -from Report import run_print_dialog -from ReportUtils import pt2cm, rgb_color from Utils import gformat def lrgb(grp): @@ -137,7 +136,7 @@ class PSDrawDoc(BaseDoc.BaseDoc): self.f.write('%%EOF\n') self.f.close() if self.print_req: - run_print_dialog (self.filename) + Report.run_print_dialog (self.filename) def write_text(self,text): pass @@ -420,5 +419,5 @@ class PSDrawDoc(BaseDoc.BaseDoc): self.f.write("(%s) show\n" % lines[i]) self.f.write('grestore\n') -PluginMgr.register_draw_doc(_("PostScript"),PSDrawDoc,1,1,".ps", +register_draw_doc(_("PostScript"),PSDrawDoc,1,1,".ps", _("Print a copy")); diff --git a/gramps2/src/docgen/PdfDoc.py b/gramps2/src/docgen/PdfDoc.py index 57fd343a7..0c63449f0 100644 --- a/gramps2/src/docgen/PdfDoc.py +++ b/gramps2/src/docgen/PdfDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -import PluginMgr +from PluginUtils import register_text_doc, register_draw_doc, register_book_doc import Errors import ImgManip import Mime @@ -643,14 +643,12 @@ try: print_label=_("Open in %s") % mprog[1] else: print_label=None - PluginMgr.register_text_doc(mtype, PdfDoc, 1, 1, 1, ".pdf", print_label) - PluginMgr.register_draw_doc(mtype, PdfDoc, 1, 1, ".pdf", print_label) - PluginMgr.register_book_doc(mtype,classref=PdfDoc, - table=1,paper=1,style=1,ext=".pdf") + register_text_doc(mtype, PdfDoc, 1, 1, 1, ".pdf", print_label) + register_draw_doc(mtype, PdfDoc, 1, 1, ".pdf", print_label) + register_book_doc(mtype,classref=PdfDoc, + table=1,paper=1,style=1,ext=".pdf") except: - PluginMgr.register_text_doc(_('PDF document'), PdfDoc, - 1, 1, 1,".pdf", None) - PluginMgr.register_draw_doc(_('PDF document'), PdfDoc, - 1, 1, ".pdf", None) - PluginMgr.register_book_doc(name=_("PDF document"),classref=PdfDoc, - table=1,paper=1,style=1,ext=".pdf") + register_text_doc(_('PDF document'), PdfDoc,1, 1, 1,".pdf", None) + register_draw_doc(_('PDF document'), PdfDoc,1, 1, ".pdf", None) + register_book_doc(name=_("PDF document"),classref=PdfDoc, + table=1,paper=1,style=1,ext=".pdf") diff --git a/gramps2/src/docgen/RTFDoc.py b/gramps2/src/docgen/RTFDoc.py index f6ec1d78e..abd4cbd2d 100644 --- a/gramps2/src/docgen/RTFDoc.py +++ b/gramps2/src/docgen/RTFDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -import PluginMgr +from PluginUtils import register_text_doc import ImgManip import Errors import Mime @@ -427,6 +427,6 @@ try: print_label=_("Open in %s") % mprog[1] else: print_label=None - PluginMgr.register_text_doc(mtype, RTFDoc, 1, 1, 1, ".rtf", print_label) + register_text_doc(mtype, RTFDoc, 1, 1, 1, ".rtf", print_label) except: - PluginMgr.register_text_doc(_('RTF document'), RTFDoc, 1, 1, 1, ".rtf", None) + register_text_doc(_('RTF document'), RTFDoc, 1, 1, 1, ".rtf", None) diff --git a/gramps2/src/SpreadSheetDoc.py b/gramps2/src/docgen/SpreadSheetDoc.py similarity index 100% rename from gramps2/src/SpreadSheetDoc.py rename to gramps2/src/docgen/SpreadSheetDoc.py diff --git a/gramps2/src/docgen/SvgDrawDoc.py b/gramps2/src/docgen/SvgDrawDoc.py index 0ef145767..007ff5a34 100644 --- a/gramps2/src/docgen/SvgDrawDoc.py +++ b/gramps2/src/docgen/SvgDrawDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2004 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,16 +25,15 @@ # python modules # #------------------------------------------------------------------------- -import string from math import pi, cos, sin, fabs +from gettext import gettext as _ #------------------------------------------------------------------------- # # Gramps modules # #------------------------------------------------------------------------- -import PluginMgr -from gettext import gettext as _ +from PluginUtils import register_draw_doc import BaseDoc import Errors @@ -200,7 +199,7 @@ class SvgDrawDoc(BaseDoc.BaseDoc): if text != "": font = p.get_font() font_size = font.get_size() - lines = string.split(text,'\n') + lines = text.split('\n') nlines = len(lines) mar = 10/28.35 fs = (font_size/28.35) * 1.2 @@ -261,4 +260,4 @@ def units(val): # Register document generator # #------------------------------------------------------------------------- -PluginMgr.register_draw_doc(_("SVG (Scalable Vector Graphics)"),SvgDrawDoc,1,1,".svg"); +register_draw_doc(_("SVG (Scalable Vector Graphics)"),SvgDrawDoc,1,1,".svg"); diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 02ad89aaf..891588a09 100644 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -44,10 +44,8 @@ import Config import GrampsCfg import const import Errors -import PluginMgr import TipOfDay import DataViews - from Mime import mime_type_is_defined from QuestionDialog import ErrorDialog diff --git a/gramps2/src/plugins/AncestorChart.py b/gramps2/src/plugins/AncestorChart.py index 6ada15abc..c8698fb58 100644 --- a/gramps2/src/plugins/AncestorChart.py +++ b/gramps2/src/plugins/AncestorChart.py @@ -42,7 +42,7 @@ import gtk # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report from SubstKeywords import SubstKeywords pt2cm = ReportUtils.pt2cm @@ -260,7 +260,6 @@ class AncestorChartOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'ancestor_chart', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/AncestorChart2.py b/gramps2/src/plugins/AncestorChart2.py index 4c154cea4..60e88467c 100644 --- a/gramps2/src/plugins/AncestorChart2.py +++ b/gramps2/src/plugins/AncestorChart2.py @@ -44,7 +44,7 @@ import gtk #------------------------------------------------------------------------ import BaseDoc from SubstKeywords import SubstKeywords -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report pt2cm = ReportUtils.pt2cm cm2pt = ReportUtils.cm2pt @@ -512,7 +512,6 @@ class AncestorChartOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'ancestor_chart2', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index c8ebd4846..41fa8832a 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -35,7 +35,7 @@ from gettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportUtils, ReportOptions +from PluginUtils import Report, ReportUtils, ReportOptions, register_report import BaseDoc import Errors import NameDisplay @@ -191,7 +191,6 @@ class AncestorOptions(ReportOptions.ReportOptions): # Register the plugin # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'ancestor_report', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index a07ea3a9b..de52c8bed 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -42,10 +42,10 @@ import gtk # #------------------------------------------------------------------------ import const -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, \ + register_report, relationship_class import BaseDoc import RelLib -import PluginMgr from DateHandler import displayer as _dd from NameDisplay import displayer as _nd @@ -84,7 +84,7 @@ class ComprehensiveAncestorsReport (Report.Report): self.sources = [] self.sourcerefs = [] - self.RelClass = PluginMgr.relationship_class + self.RelClass = relationship_class self.relationship = self.RelClass(database) def define_table_styles(self): @@ -957,7 +957,7 @@ class ComprehensiveAncestorsOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -PluginMgr.register_report( +register_report( name = 'ancestors_report', category = Report.CATEGORY_TEXT, report_class = ComprehensiveAncestorsReport, diff --git a/gramps2/src/plugins/BookReport.py b/gramps2/src/plugins/BookReport.py index 711c73f69..ea2a9dd7b 100644 --- a/gramps2/src/plugins/BookReport.py +++ b/gramps2/src/plugins/BookReport.py @@ -66,8 +66,7 @@ from RelLib import Person import Utils import ListModel -import PluginMgr -from PluginUtils import Report, ReportOptions +from PluginUtils import Report, ReportOptions, bkitems_list, register_report import BaseDoc from QuestionDialog import WarningDialog import Plugins @@ -118,7 +117,7 @@ class BookItem: """ self.clear() - for item in PluginMgr.bkitems_list: + for item in bkitems_list: if item[4] == name: self.translated_name = item[0] if item[5]: @@ -660,10 +659,10 @@ class BookReportSelector: The selections are read from the book item registry. """ - if not PluginMgr.bkitems_list: + if not bkitems_list: return - for book_item in PluginMgr.bkitems_list: + for book_item in bkitems_list: if book_item[5]: category = Plugins.UNSUPPORTED else: @@ -1118,7 +1117,7 @@ def cl_report(database,name,category,options_str_dict): # # #------------------------------------------------------------------------ -PluginMgr.register_report( +register_report( name = 'book', category = Report.CATEGORY_BOOK, report_class = BookReportSelector, diff --git a/gramps2/src/plugins/Calendar.py b/gramps2/src/plugins/Calendar.py index 26ddc73f5..bae3fe7d4 100644 --- a/gramps2/src/plugins/Calendar.py +++ b/gramps2/src/plugins/Calendar.py @@ -38,7 +38,7 @@ import locale # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report pt2cm = ReportUtils.pt2cm import GenericFilter from DateHandler import DateDisplay @@ -927,7 +927,6 @@ class Holidays: # Register this plugin # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'calendar', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/ChangeNames.py b/gramps2/src/plugins/ChangeNames.py index 185e41ae6..21f91eaeb 100644 --- a/gramps2/src/plugins/ChangeNames.py +++ b/gramps2/src/plugins/ChangeNames.py @@ -39,7 +39,6 @@ from gettext import gettext as _ import gobject import gtk import gtk.glade -import GrampsDisplay #------------------------------------------------------------------------- # @@ -48,7 +47,8 @@ import GrampsDisplay #------------------------------------------------------------------------- import Utils from QuestionDialog import OkDialog -import Tool +import GrampsDisplay +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -204,8 +204,6 @@ class ChangeNamesOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_tool - register_tool( name = 'chname', category = Tool.TOOL_DBPROC, diff --git a/gramps2/src/plugins/ChangeTypes.py b/gramps2/src/plugins/ChangeTypes.py index 62c082a6f..c412a71ed 100644 --- a/gramps2/src/plugins/ChangeTypes.py +++ b/gramps2/src/plugins/ChangeTypes.py @@ -47,7 +47,7 @@ import const import Utils from QuestionDialog import OkDialog import AutoComp -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -209,7 +209,6 @@ class ChangeTypesOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_tool register_tool( name = 'chtype', category = Tool.TOOL_DBPROC, diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py index 897c520f5..4329d2088 100644 --- a/gramps2/src/plugins/Check.py +++ b/gramps2/src/plugins/Check.py @@ -56,7 +56,7 @@ import gtk.glade import RelLib import Utils import const -import Tool +from PluginUtils import Tool, register_tool from QuestionDialog import OkDialog, MissingMediaDialog @@ -938,8 +938,6 @@ class CheckOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_tool - register_tool( name = 'check', category = Tool.TOOL_DBFIX, diff --git a/gramps2/src/plugins/Checkpoint.py b/gramps2/src/plugins/Checkpoint.py index 9ab8b2a94..db8c9c576 100644 --- a/gramps2/src/plugins/Checkpoint.py +++ b/gramps2/src/plugins/Checkpoint.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ import gtk.glade #------------------------------------------------------------------------- from QuestionDialog import OkDialog, ErrorDialog import WriteXML -import Tool +from PluginUtils import Tool, register_tool import Utils import GrampsDisplay @@ -418,8 +418,6 @@ class CheckpointOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_tool - register_tool( name = 'chkpoint', category = Tool.TOOL_REVCTL, diff --git a/gramps2/src/plugins/CmdRef.py b/gramps2/src/plugins/CmdRef.py index c78cb86b5..1bba732d1 100644 --- a/gramps2/src/plugins/CmdRef.py +++ b/gramps2/src/plugins/CmdRef.py @@ -37,9 +37,8 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from PluginUtils import Tool, Report +from PluginUtils import Tool, Report, cl_list, cli_tool_list, register_tool import Utils -import PluginMgr #------------------------------------------------------------------------- # @@ -95,12 +94,12 @@ class CmdRef(Tool.Tool): f.write(' Reports\n') # Common report options - item = PluginMgr.cl_list[0] + item = cl_list[0] clr = Report.CommandLineReport(db,item[0],item[1],item[3],{},True) self.write_ref(f,clr,level+2,id_counter,True) id_counter = id_counter + 1 - for item in PluginMgr.cl_list: + for item in cl_list: category = item[1] if category in (Report.CATEGORY_BOOK, Report.CATEGORY_CODE, @@ -116,12 +115,12 @@ class CmdRef(Tool.Tool): f.write(' Tools\n') # Common tool options - item = PluginMgr.cli_tool_list[0] + item = cli_tool_list[0] clr = Tool.CommandLineTool(db,item[0],item[1],item[3],{},True) self.write_ref(f,clr,level+2,id_counter,True) id_counter = id_counter + 1 - for item in PluginMgr.cli_tool_list: + for item in cli_tool_list: self.write_ref(f,item,level+2,id_counter) id_counter = id_counter + 1 f.write(' \n' % _tags[level+1] ) @@ -244,8 +243,6 @@ class CmdRefOptions(Tool.ToolOptions): if __debug__: - from PluginMgr import register_tool - register_tool( name = 'cmdref', category = Tool.TOOL_DEBUG, diff --git a/gramps2/src/plugins/CountAncestors.py b/gramps2/src/plugins/CountAncestors.py index 3bbcb7ec2..b1bfc3938 100644 --- a/gramps2/src/plugins/CountAncestors.py +++ b/gramps2/src/plugins/CountAncestors.py @@ -45,7 +45,7 @@ import gtk.glade # #------------------------------------------------------------------------ import Utils -from PluginUtils import Report +from PluginUtils import Report, register_report #------------------------------------------------------------------------ # @@ -110,7 +110,6 @@ class CountAncestors: # # #------------------------------------------------------------------------- -from PluginMgr import register_report register_report( name = 'count_ancestors', category = Report.CATEGORY_VIEW, diff --git a/gramps2/src/plugins/CustomBookText.py b/gramps2/src/plugins/CustomBookText.py index 0f57ca1bb..fd2ce03ca 100644 --- a/gramps2/src/plugins/CustomBookText.py +++ b/gramps2/src/plugins/CustomBookText.py @@ -41,7 +41,7 @@ import gtk # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions +from PluginUtils import Report, ReportOptions, register_report import BaseDoc #------------------------------------------------------------------------ @@ -208,7 +208,6 @@ class CustomTextOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'custom_text', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/DesGraph.py b/gramps2/src/plugins/DesGraph.py index 771cec293..468f20489 100644 --- a/gramps2/src/plugins/DesGraph.py +++ b/gramps2/src/plugins/DesGraph.py @@ -41,7 +41,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report pt2cm = ReportUtils.pt2cm import BaseDoc from SubstKeywords import SubstKeywords @@ -399,7 +399,6 @@ class DescendantGraphOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'descendant_graph', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/Desbrowser.py b/gramps2/src/plugins/Desbrowser.py index ced34720b..0352b5eff 100644 --- a/gramps2/src/plugins/Desbrowser.py +++ b/gramps2/src/plugins/Desbrowser.py @@ -37,7 +37,7 @@ from gettext import gettext as _ #------------------------------------------------------------------------ import Utils import NameDisplay -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------ # @@ -167,8 +167,6 @@ class DesBrowseOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_tool - register_tool( name = 'dbrowse', category = Tool.TOOL_ANAL, diff --git a/gramps2/src/plugins/DescendChart.py b/gramps2/src/plugins/DescendChart.py index 6bdef37d8..2aa7797d5 100644 --- a/gramps2/src/plugins/DescendChart.py +++ b/gramps2/src/plugins/DescendChart.py @@ -43,7 +43,7 @@ import gtk # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report pt2cm = ReportUtils.pt2cm cm2pt = ReportUtils.cm2pt from SubstKeywords import SubstKeywords @@ -463,7 +463,6 @@ class DescendChartOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'descend_chart2', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index 8801a03f1..245c778f3 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -35,7 +35,7 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report import BaseDoc import Errors import Sort @@ -246,7 +246,6 @@ class DescendantOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'descend_report', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index bc1cbde85..9946d5850 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -44,7 +44,7 @@ import gtk # #------------------------------------------------------------------------ import RelLib -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report import BaseDoc import const from QuestionDialog import ErrorDialog @@ -839,7 +839,6 @@ class DetAncestorOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'det_ancestor_report', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index f61217cf6..11e6dfe21 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -45,7 +45,7 @@ import gtk #------------------------------------------------------------------------ import RelLib import Errors -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report import BaseDoc import const from DateHandler import displayer as _dd @@ -874,7 +874,6 @@ class DetDescendantOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'det_descendant_report', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/DumpGenderStats.py b/gramps2/src/plugins/DumpGenderStats.py index 499305540..71bebd738 100644 --- a/gramps2/src/plugins/DumpGenderStats.py +++ b/gramps2/src/plugins/DumpGenderStats.py @@ -24,7 +24,7 @@ import gtk import ListModel -import Tool +from PluginUtils import Tool, register_tool _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ] #------------------------------------------------------------------------- @@ -91,8 +91,6 @@ class DumpGenderStatsOptions(Tool.ToolOptions): if __debug__: - from PluginMgr import register_tool - register_tool( name = 'dgenstats', category = Tool.TOOL_DEBUG, diff --git a/gramps2/src/plugins/Eval.py b/gramps2/src/plugins/Eval.py index 65563fe7b..f74b1becd 100644 --- a/gramps2/src/plugins/Eval.py +++ b/gramps2/src/plugins/Eval.py @@ -47,7 +47,7 @@ import gtk.glade # #------------------------------------------------------------------------ import Utils -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -146,8 +146,6 @@ class EvalOptions(Tool.ToolOptions): #------------------------------------------------------------------------ if __debug__: - from PluginMgr import register_tool - register_tool( name = 'eval', category = Tool.TOOL_DEBUG, diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py index 7d2fe53ba..ca5cb621e 100644 --- a/gramps2/src/plugins/EventCmp.py +++ b/gramps2/src/plugins/EventCmp.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ import OpenSpreadSheet import const import DateHandler from QuestionDialog import WarningDialog -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------ # @@ -477,8 +477,6 @@ class EventComparisonOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'eventcmp', category = Tool.TOOL_ANAL, diff --git a/gramps2/src/plugins/ExportVCalendar.py b/gramps2/src/plugins/ExportVCalendar.py index ecd4ef3df..88364d129 100644 --- a/gramps2/src/plugins/ExportVCalendar.py +++ b/gramps2/src/plugins/ExportVCalendar.py @@ -58,6 +58,7 @@ from RelLib import Date import Errors from gettext import gettext as _ from QuestionDialog import ErrorDialog +from PluginUtils import register_export #------------------------------------------------------------------------- # @@ -323,5 +324,4 @@ _description = _('vCalendar is used in many calendaring and pim applications.') _config = (_('vCalendar export options'),CalendarWriterOptionBox) _filename = 'vcs' -from PluginMgr import register_export register_export(exportData,_title,_description,_config,_filename) diff --git a/gramps2/src/plugins/ExportVCard.py b/gramps2/src/plugins/ExportVCard.py index acc5808ae..7b00d8ddf 100644 --- a/gramps2/src/plugins/ExportVCard.py +++ b/gramps2/src/plugins/ExportVCard.py @@ -56,6 +56,7 @@ from RelLib import Date import Errors from gettext import gettext as _ from QuestionDialog import ErrorDialog +from PluginUtils import register_export #------------------------------------------------------------------------- # @@ -242,5 +243,4 @@ _description = _('vCard is used in many addressbook and pim applications.') _config = (_('vCard export options'),CardWriterOptionBox) _filename = 'vcf' -from PluginMgr import register_export register_export(exportData,_title,_description,_config,_filename) diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index c3ec79da3..d35cb5373 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -42,7 +42,7 @@ import gtk # #------------------------------------------------------------------------ import RelLib -from PluginUtils import Report, ReportOptions +from PluginUtils import Report, ReportOptions, register_report import BaseDoc import const import DateHandler @@ -737,7 +737,6 @@ class FamilyGroupOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'family_group', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/FanChart.py b/gramps2/src/plugins/FanChart.py index cd21cca0e..b9a1cbc6f 100644 --- a/gramps2/src/plugins/FanChart.py +++ b/gramps2/src/plugins/FanChart.py @@ -40,7 +40,7 @@ import gtk # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report from SubstKeywords import SubstKeywords pt2cm = ReportUtils.pt2cm @@ -312,7 +312,6 @@ class FanChartOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'fan_chart', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py index 231a43860..76a1290c9 100644 --- a/gramps2/src/plugins/FilterEditor.py +++ b/gramps2/src/plugins/FilterEditor.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ import AutoComp import ListModel import Utils import SelectPerson -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -961,8 +961,6 @@ class FilterEditorOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'cfilted', category = Tool.TOOL_UTILS, diff --git a/gramps2/src/plugins/FtmStyleAncestors.py b/gramps2/src/plugins/FtmStyleAncestors.py index 5a3fd11f1..7a3a15f03 100644 --- a/gramps2/src/plugins/FtmStyleAncestors.py +++ b/gramps2/src/plugins/FtmStyleAncestors.py @@ -38,7 +38,7 @@ import BaseDoc import RelLib import DateHandler import const -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report #------------------------------------------------------------------------ # @@ -411,8 +411,6 @@ class FtmAncestorOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report - register_report( name = 'ftm_ancestor_report', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/FtmStyleDescendants.py b/gramps2/src/plugins/FtmStyleDescendants.py index 17e42cba3..8aff65523 100644 --- a/gramps2/src/plugins/FtmStyleDescendants.py +++ b/gramps2/src/plugins/FtmStyleDescendants.py @@ -37,7 +37,7 @@ from gettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report import BaseDoc import RelLib import DateHandler @@ -560,7 +560,6 @@ class FtmDescendantOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'ftm_descendant_report', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py index d8f438f41..0c24ded8e 100644 --- a/gramps2/src/plugins/GraphViz.py +++ b/gramps2/src/plugins/GraphViz.py @@ -52,7 +52,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions +from PluginUtils import Report, ReportOptions, register_report import GenericFilter import RelLib import DateHandler @@ -961,7 +961,6 @@ def get_description_graphics(): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'rel_graph', category = Report.CATEGORY_CODE, diff --git a/gramps2/src/plugins/ImportGeneWeb.py b/gramps2/src/plugins/ImportGeneWeb.py index 185c4d13b..27665d37c 100644 --- a/gramps2/src/plugins/ImportGeneWeb.py +++ b/gramps2/src/plugins/ImportGeneWeb.py @@ -57,6 +57,7 @@ import RelLib import const from QuestionDialog import ErrorDialog from DateHandler import parser as _dp +from PluginUtils import register_import from htmlentitydefs import name2codepoint _date_parse = re.compile('([~?<>]+)?([0-9/]+)([J|H|F])?(\.\.)?([0-9/]+)?([J|H|F])?') @@ -775,5 +776,4 @@ _filter.set_name(_('GeneWeb files')) _filter.add_mime_type(_mime_type) _format_name = _('GeneWeb') -from PluginMgr import register_import register_import(importData,_filter,_mime_type,0,_format_name) diff --git a/gramps2/src/plugins/ImportvCard.py b/gramps2/src/plugins/ImportvCard.py index 120dcba0b..b3477cfed 100644 --- a/gramps2/src/plugins/ImportvCard.py +++ b/gramps2/src/plugins/ImportvCard.py @@ -56,6 +56,7 @@ import Errors import RelLib import const from QuestionDialog import ErrorDialog +from PluginUtils import register_import #------------------------------------------------------------------------- # @@ -219,7 +220,6 @@ class VCardParser: # # #------------------------------------------------------------------------- -from PluginMgr import register_import _mime_type = const.app_vcard for mime in _mime_type: _filter = gtk.FileFilter() diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index b5ccad143..32adce33a 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -45,7 +45,7 @@ import const import BaseDoc import GenericFilter import DateHandler -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report #------------------------------------------------------------------------ # @@ -600,8 +600,6 @@ class IndivCompleteOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report - register_report( name = 'indiv_complete', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index bff9c3eb5..f07243d88 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -45,7 +45,7 @@ import gtk import RelLib import const import BaseDoc -from PluginUtils import Report, ReportOptions +from PluginUtils import Report, ReportOptions, register_report import DateHandler #------------------------------------------------------------------------ @@ -378,8 +378,6 @@ class IndivSummaryOptions(ReportOptions.ReportOptions): # Register plugins # #------------------------------------------------------------------------ -from PluginMgr import register_report - register_report( name = 'individual_summary', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/Leak.py b/gramps2/src/plugins/Leak.py index 6b0a5cbae..29f946561 100644 --- a/gramps2/src/plugins/Leak.py +++ b/gramps2/src/plugins/Leak.py @@ -48,7 +48,7 @@ import gc # #------------------------------------------------------------------------ import Utils -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -148,8 +148,6 @@ class LeakOptions(Tool.ToolOptions): #------------------------------------------------------------------------ if __debug__: - from PluginMgr import register_tool - register_tool( name = 'eval', category = Tool.TOOL_DEBUG, diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/Merge.py index f8e8d2f30..2a3f28063 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/Merge.py @@ -50,7 +50,7 @@ import soundex import NameDisplay import ListModel import MergePeople -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -676,8 +676,6 @@ class MergeOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'dupfind', category = Tool.TOOL_DBPROC, diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py index 3b0222157..1d4747533 100644 --- a/gramps2/src/plugins/NavWebPage.py +++ b/gramps2/src/plugins/NavWebPage.py @@ -69,7 +69,7 @@ import const from GrampsCfg import get_researcher import GenericFilter import Sort -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report import Errors import Utils import ImgManip @@ -2871,7 +2871,6 @@ def sort_nameof(person, private): # # #------------------------------------------------------------------------- -from PluginMgr import register_report register_report( name = 'navwebpage', category = Report.CATEGORY_WEB, diff --git a/gramps2/src/plugins/PHPGedViewConnector.py b/gramps2/src/plugins/PHPGedViewConnector.py index 000733611..6675deb81 100644 --- a/gramps2/src/plugins/PHPGedViewConnector.py +++ b/gramps2/src/plugins/PHPGedViewConnector.py @@ -32,7 +32,7 @@ from random import randint from tempfile import NamedTemporaryFile from tempfile import mkstemp from gettext import gettext as _ - +from PluginUtils import register_tool # # Interface to phpGedView # @@ -425,8 +425,6 @@ else: # # #------------------------------------------------------------------------- - from PluginMgr import register_tool - def phpGedViewImporterCaller(database,active_person,callback,parent=None): phpGedViewImporter(database) diff --git a/gramps2/src/plugins/PatchNames.py b/gramps2/src/plugins/PatchNames.py index 8ea5416a8..5d895130c 100644 --- a/gramps2/src/plugins/PatchNames.py +++ b/gramps2/src/plugins/PatchNames.py @@ -47,7 +47,7 @@ import GrampsDisplay # #------------------------------------------------------------------------- import Utils -import Tool +from PluginUtils import Tool, register_tool from QuestionDialog import OkDialog #------------------------------------------------------------------------- @@ -359,8 +359,6 @@ class PatchNamesOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'patchnames', category = Tool.TOOL_DBPROC, diff --git a/gramps2/src/plugins/ReadPkg.py b/gramps2/src/plugins/ReadPkg.py index 7bd38835d..b5ca57e2e 100644 --- a/gramps2/src/plugins/ReadPkg.py +++ b/gramps2/src/plugins/ReadPkg.py @@ -55,6 +55,7 @@ import gtk import const from GrampsDb import gramps_db_reader_factory from QuestionDialog import ErrorDialog +from PluginUtils import register_import #------------------------------------------------------------------------- # @@ -118,5 +119,4 @@ _filter.set_name(_('GRAMPS packages')) _filter.add_mime_type(_mime_type) _format_name = _('GRAMPS package') -from PluginMgr import register_import register_import(impData,_filter,_mime_type,0,_format_name) diff --git a/gramps2/src/plugins/Rebuild.py b/gramps2/src/plugins/Rebuild.py index c9817317b..e75918a9c 100644 --- a/gramps2/src/plugins/Rebuild.py +++ b/gramps2/src/plugins/Rebuild.py @@ -55,7 +55,7 @@ import gtk.glade import RelLib import Utils import const -import Tool +from PluginUtils import Tool, register_tool from QuestionDialog import OkDialog #------------------------------------------------------------------------- @@ -111,8 +111,6 @@ class RebuildOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'rebuild', category = Tool.TOOL_DBFIX, diff --git a/gramps2/src/plugins/RelCalc.py b/gramps2/src/plugins/RelCalc.py index 014ba3be7..9978bbf93 100644 --- a/gramps2/src/plugins/RelCalc.py +++ b/gramps2/src/plugins/RelCalc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,10 +46,9 @@ import RelLib import Utils import NameDisplay import ListModel -import PluginMgr import DateHandler import PeopleModel -import Tool +from PluginUtils import Tool, relationship_class, register_tool column_names = [ _('Name'), @@ -78,7 +77,7 @@ class RelCalc(Tool.Tool): """ self.person = person - self.RelClass = PluginMgr.relationship_class + self.RelClass = relationship_class self.relationship = self.RelClass(self.db) self.parent = parent self.win_key = self @@ -228,7 +227,7 @@ class RelCalcOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -PluginMgr.register_tool( +register_tool( name = 'relcalc', category = Tool.TOOL_UTILS, tool_class = RelCalc, diff --git a/gramps2/src/plugins/ReorderIds.py b/gramps2/src/plugins/ReorderIds.py index 218ed6da7..339d79ac5 100644 --- a/gramps2/src/plugins/ReorderIds.py +++ b/gramps2/src/plugins/ReorderIds.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ from gettext import gettext as _ #------------------------------------------------------------------------ import Utils import RelLib -import Tool +from PluginUtils import Tool, register_tool from QuestionDialog import WarningDialog _findint = re.compile('^[^\d]*(\d+)[^\d]*') @@ -197,8 +197,6 @@ class ReorderIdsOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'reorder_ids', category = Tool.TOOL_DBPROC, diff --git a/gramps2/src/plugins/SimpleBookTitle.py b/gramps2/src/plugins/SimpleBookTitle.py index dfe871f4c..3fd675e03 100644 --- a/gramps2/src/plugins/SimpleBookTitle.py +++ b/gramps2/src/plugins/SimpleBookTitle.py @@ -41,7 +41,7 @@ import gtk # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions +from PluginUtils import Report, ReportOptions, register_report import BaseDoc import SelectObject import AddMedia @@ -290,7 +290,6 @@ class SimpleBookTitleOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report register_report( name = 'simple_book_title', category = Report.CATEGORY_TEXT, diff --git a/gramps2/src/plugins/SoundGen.py b/gramps2/src/plugins/SoundGen.py index b6f085f06..933a7fdd2 100644 --- a/gramps2/src/plugins/SoundGen.py +++ b/gramps2/src/plugins/SoundGen.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ import GrampsDisplay import soundex import Utils import AutoComp -import Tool +from PluginUtils import Tool, register_tool #------------------------------------------------------------------------- # @@ -160,8 +160,6 @@ class SoundGenOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'soundgen', category = Tool.TOOL_UTILS, diff --git a/gramps2/src/plugins/StatisticsChart.py b/gramps2/src/plugins/StatisticsChart.py index 51e00ffd6..a003efc43 100644 --- a/gramps2/src/plugins/StatisticsChart.py +++ b/gramps2/src/plugins/StatisticsChart.py @@ -53,7 +53,7 @@ import gtk from RelLib import Person, Family # gender and report type names import BaseDoc -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report import GenericFilter import DateHandler from Utils import ProgressMeter @@ -968,8 +968,6 @@ class StatisticsChartOptions(ReportOptions.ReportOptions): # Register report/options # #------------------------------------------------------------------------ -from PluginMgr import register_report - register_report( name = 'statistics_chart', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/Summary.py b/gramps2/src/plugins/Summary.py index 1bcc7f312..902041d8b 100644 --- a/gramps2/src/plugins/Summary.py +++ b/gramps2/src/plugins/Summary.py @@ -45,7 +45,7 @@ import gtk.glade #------------------------------------------------------------------------ import Utils import RelLib -from PluginUtils import Report +from PluginUtils import Report, register_report import DateHandler #------------------------------------------------------------------------ @@ -166,8 +166,6 @@ class SummaryReport: # # #------------------------------------------------------------------------- -from PluginMgr import register_report - register_report( name = 'summary', category = Report.CATEGORY_VIEW, diff --git a/gramps2/src/plugins/TestcaseGenerator.py b/gramps2/src/plugins/TestcaseGenerator.py index 53c51d965..aaad8fbef 100644 --- a/gramps2/src/plugins/TestcaseGenerator.py +++ b/gramps2/src/plugins/TestcaseGenerator.py @@ -48,7 +48,7 @@ import gtk.glade #------------------------------------------------------------------------- import Errors import RelLib -import Tool +from PluginUtils import Tool, register_tool import const import Utils from QuestionDialog import ErrorDialog @@ -1415,8 +1415,6 @@ class TestcaseGeneratorOptions(Tool.ToolOptions): #------------------------------------------------------------------------- if __debug__: - from PluginMgr import register_tool - register_tool( name = 'testcasegenerator', category = Tool.TOOL_DEBUG, diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py index f5be1b285..1347e4e39 100644 --- a/gramps2/src/plugins/TimeLine.py +++ b/gramps2/src/plugins/TimeLine.py @@ -44,7 +44,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Report, ReportOptions, ReportUtils +from PluginUtils import Report, ReportOptions, ReportUtils, register_report pt2cm = ReportUtils.pt2cm import BaseDoc import GenericFilter @@ -466,8 +466,6 @@ class TimeLineOptions(ReportOptions.ReportOptions): # # #------------------------------------------------------------------------ -from PluginMgr import register_report - register_report( name = 'timeline', category = Report.CATEGORY_DRAW, diff --git a/gramps2/src/plugins/Verify.py b/gramps2/src/plugins/Verify.py index 647396890..86caea5e5 100644 --- a/gramps2/src/plugins/Verify.py +++ b/gramps2/src/plugins/Verify.py @@ -47,7 +47,7 @@ import GrampsDisplay #------------------------------------------------------------------------ import RelLib import Utils -import Tool +from PluginUtils import Tool, register_report #------------------------------------------------------------------------- # @@ -705,8 +705,6 @@ class VerifyOptions(Tool.ToolOptions): # # #------------------------------------------------------------------------- -from PluginMgr import register_tool - register_tool( name = 'verify', category = Tool.TOOL_UTILS, diff --git a/gramps2/src/plugins/WriteCD.py b/gramps2/src/plugins/WriteCD.py index 2f51f7415..5f5f1c6ac 100644 --- a/gramps2/src/plugins/WriteCD.py +++ b/gramps2/src/plugins/WriteCD.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -64,6 +64,7 @@ import Mime import const import QuestionDialog import ImgManip +from PluginUtils import register_export _title_string = _("Export to CD") @@ -318,5 +319,4 @@ _description = _('Exporting to CD copies all your data and media ' _config = None _filename = 'burn' -from PluginMgr import register_export register_export(writeData,_title,_description,_config,_filename) diff --git a/gramps2/src/plugins/WriteFtree.py b/gramps2/src/plugins/WriteFtree.py index 2ee2d7207..996ed9214 100644 --- a/gramps2/src/plugins/WriteFtree.py +++ b/gramps2/src/plugins/WriteFtree.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2003-2005 Donald N. Allingham +# Copyright (C) 2003-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -56,6 +56,7 @@ import Utils import GenericFilter import Errors from QuestionDialog import ErrorDialog +from PluginUtils import register_export #------------------------------------------------------------------------- # @@ -286,5 +287,4 @@ _description = _('Web Family Tree format.') _config = (_('Web Family Tree export options'),FtreeWriterOptionBox) _filename = 'wft' -from PluginMgr import register_export register_export(writeData,_title,_description,_config,_filename) diff --git a/gramps2/src/plugins/WriteGeneWeb.py b/gramps2/src/plugins/WriteGeneWeb.py index 72167c983..3bd560ccc 100644 --- a/gramps2/src/plugins/WriteGeneWeb.py +++ b/gramps2/src/plugins/WriteGeneWeb.py @@ -57,6 +57,7 @@ import const import Utils import Errors from QuestionDialog import ErrorDialog +from PluginUtils import register_export #------------------------------------------------------------------------- # @@ -602,5 +603,4 @@ _description = _('GeneWeb is a web based genealogy program.') _config = (_('GeneWeb export options'),GeneWebWriterOptionBox) _filename = 'gw' -from PluginMgr import register_export register_export(exportData,_title,_description,_config,_filename) diff --git a/gramps2/src/plugins/WritePkg.py b/gramps2/src/plugins/WritePkg.py index 847325702..07132f21c 100644 --- a/gramps2/src/plugins/WritePkg.py +++ b/gramps2/src/plugins/WritePkg.py @@ -57,6 +57,7 @@ import gtk.glade from GrampsDb._WriteXML import XmlWriter import Utils from QuestionDialog import MissingMediaDialog +from PluginUtils import register_export #------------------------------------------------------------------------- # @@ -210,5 +211,4 @@ _description = _('GRAMPS package is an archived XML database together with the m _config = None _filename = 'gpkg' -from PluginMgr import register_export register_export(writeData,_title,_description,_config,_filename) diff --git a/gramps2/src/plugins/rel_da.py b/gramps2/src/plugins/rel_da.py index 84d8d45f7..d25db922b 100644 --- a/gramps2/src/plugins/rel_da.py +++ b/gramps2/src/plugins/rel_da.py @@ -34,6 +34,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -175,8 +176,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, [ "da", "DA", "da_DK", "danish", "Danish", "da_DK.UTF8", "da_DK@euro", "da_DK.UTF8@euro", "dansk", "Dansk", diff --git a/gramps2/src/plugins/rel_de.py b/gramps2/src/plugins/rel_de.py index 5ac7cf874..cb627bb10 100644 --- a/gramps2/src/plugins/rel_de.py +++ b/gramps2/src/plugins/rel_de.py @@ -34,6 +34,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -392,8 +393,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["de","DE","de_DE","deutsch","Deutsch","de_DE.UTF8","de_DE@euro","de_DE.UTF8@euro", "german","German", "de_DE.UTF-8", "de_DE.utf-8", "de_DE.utf8"]) diff --git a/gramps2/src/plugins/rel_es.py b/gramps2/src/plugins/rel_es.py index 87494ebe9..b3f04e7d3 100644 --- a/gramps2/src/plugins/rel_es.py +++ b/gramps2/src/plugins/rel_es.py @@ -33,6 +33,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -330,8 +331,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this function with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["es","ES","es_ES","espanol","Espanol","es_ES.UTF8","es_ES@euro","es_ES.UTF8@euro", "spanish","Spanish", "es_ES.UTF-8", "es_ES.utf-8", "es_ES.utf8"]) diff --git a/gramps2/src/plugins/rel_fi.py b/gramps2/src/plugins/rel_fi.py index e057c9abd..fffabea82 100644 --- a/gramps2/src/plugins/rel_fi.py +++ b/gramps2/src/plugins/rel_fi.py @@ -34,6 +34,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -217,8 +218,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["fi","FI","fi_FI","finnish","Finnish","fi_FI.UTF8","fi_FI@euro","fi_FI.UTF8@euro", "suomi","Suomi", "fi_FI.UTF-8", "fi_FI.utf-8", "fi_FI.utf8"]) diff --git a/gramps2/src/plugins/rel_fr.py b/gramps2/src/plugins/rel_fr.py index a184c57d3..bc0b69a58 100644 --- a/gramps2/src/plugins/rel_fr.py +++ b/gramps2/src/plugins/rel_fr.py @@ -31,6 +31,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -224,8 +225,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["fr", "FR", "fr_FR", "fr_CA", "francais", "Francais", "fr_FR.UTF8", "fr_FR@euro", "fr_FR.UTF8@euro", "french","French", "fr_FR.UTF-8", "fr_FR.utf-8", "fr_FR.utf8", "fr_CA.UTF-8"]) diff --git a/gramps2/src/plugins/rel_hu.py b/gramps2/src/plugins/rel_hu.py index d5e5739aa..ed7cfda3d 100644 --- a/gramps2/src/plugins/rel_hu.py +++ b/gramps2/src/plugins/rel_hu.py @@ -32,7 +32,7 @@ import RelLib import Relationship -from PluginMgr import register_relcalc +from PluginUtils import register_relcalc import types from gettext import gettext as _ diff --git a/gramps2/src/plugins/rel_it.py b/gramps2/src/plugins/rel_it.py index fc8db6c6d..28280a603 100644 --- a/gramps2/src/plugins/rel_it.py +++ b/gramps2/src/plugins/rel_it.py @@ -34,7 +34,7 @@ import RelLib import Relationship import types - +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -201,8 +201,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Function registration # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["it", "IT", "it_IT", "it_IT@euro", "it_IT.utf8"]) diff --git a/gramps2/src/plugins/rel_no.py b/gramps2/src/plugins/rel_no.py index 61aa4d6d7..fe6fee999 100644 --- a/gramps2/src/plugins/rel_no.py +++ b/gramps2/src/plugins/rel_no.py @@ -34,6 +34,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -267,8 +268,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["nb","nn","no", "nb_NO","nn_NO","no_NO","nb_NO.UTF8","nn_NO.UTF8","no_NO.UTF8", "nb_NO.UTF-8","nn_NO.UTF-8","no_NO.UTF-8", diff --git a/gramps2/src/plugins/rel_ru.py b/gramps2/src/plugins/rel_ru.py index 409412823..763eff301 100644 --- a/gramps2/src/plugins/rel_ru.py +++ b/gramps2/src/plugins/rel_ru.py @@ -32,6 +32,7 @@ import RelLib import Relationship import types +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -260,7 +261,5 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["ru","RU","ru_RU","koi8r","ru_koi8r","russian","Russian","ru_RU.koi8r","ru_RU.KOI8-R","ru_RU.utf8","ru_RU.UTF8", "ru_RU.utf-8","ru_RU.UTF-8","ru_RU.iso88595","ru_RU.iso8859-5","ru_RU.iso-8859-5"]) diff --git a/gramps2/src/plugins/rel_sv.py b/gramps2/src/plugins/rel_sv.py index c7713273b..019dcdd29 100644 --- a/gramps2/src/plugins/rel_sv.py +++ b/gramps2/src/plugins/rel_sv.py @@ -2,7 +2,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2003-2005 Donald N. Allingham +# Copyright (C) 2003-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ import RelLib import Relationship import types from gettext import gettext as _ +from PluginUtils import register_relcalc #------------------------------------------------------------------------- # @@ -222,8 +223,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator): # Register this class with the Plugins system # #------------------------------------------------------------------------- -from PluginMgr import register_relcalc - register_relcalc(RelationshipCalculator, ["sv","SV","sv_SE","swedish","Swedish","sv_SE.UTF8","sv_SE@euro","sv_SE.UTF8@euro", "svenska","Svenska", "sv_SE.UTF-8", "sv_SE.utf-8", "sv_SE.utf8"])