From 9c364490ce481a0545b8c34fad03d1d345b11226 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Thu, 2 Oct 2008 04:02:10 +0000 Subject: [PATCH] Move PluginUtils/_PluginMgr.py to gen/plug/_manager.py. Now, instead of "from PluginUtils import PluginManager", use "from gen.plug import PluginManager". svn: r11100 --- src/ArgHandler.py | 3 +- src/DbLoader.py | 2 +- src/DisplayState.py | 2 +- src/ExportAssistant.py | 2 +- src/GrampsDbUtils/_GrampsDbWRFactories.py | 2 +- src/GrampsDbUtils/_WriteGedcom.py | 2 +- src/GrampsDbUtils/_WriteXML.py | 2 +- src/PluginUtils/_PluginDialogs.py | 2 +- src/PluginUtils/_PluginWindows.py | 2 +- src/PluginUtils/_Tool.py | 3 -- src/PluginUtils/__init__.py | 2 - src/QuickReports.py | 2 +- src/ReportBase/_BookFormatComboBox.py | 3 +- src/ReportBase/_CommandLineReport.py | 5 +-- src/ReportBase/_Constants.py | 5 +-- src/ReportBase/_DrawFormatComboBox.py | 4 +- src/ReportBase/_TextFormatComboBox.py | 4 +- src/ViewManager.py | 3 +- src/docgen/AsciiDoc.py | 2 +- src/docgen/GtkPrint.py | 2 +- src/docgen/HtmlDoc.py | 2 +- src/docgen/LaTeXDoc.py | 2 +- src/docgen/ODFDoc.py | 2 +- src/docgen/PSDrawDoc.py | 2 +- src/docgen/PdfDoc.py | 2 +- src/docgen/RTFDoc.py | 2 +- src/docgen/SvgDrawDoc.py | 2 +- src/gen/plug/__init__.py | 3 ++ .../_PluginMgr.py => gen/plug/_manager.py} | 38 +++++++++++-------- src/plugins/AgeOnDate.py | 2 +- src/plugins/AncestorReport.py | 9 +++-- src/plugins/AncestorTree.py | 9 +++-- src/plugins/BookReport.py | 10 ++--- src/plugins/CalculateEstimatedDates.py | 5 ++- src/plugins/Calendar.py | 13 ++++--- src/plugins/ChangeNames.py | 5 ++- src/plugins/ChangeTypes.py | 5 ++- src/plugins/Check.py | 5 ++- src/plugins/CmdRef.py | 5 ++- src/plugins/CustomBookText.py | 6 +-- src/plugins/DateParserDisplayTest.py | 5 ++- src/plugins/Desbrowser.py | 5 ++- src/plugins/DescendReport.py | 9 +++-- src/plugins/DescendTree.py | 9 +++-- src/plugins/DetAncestralReport.py | 9 +++-- src/plugins/DetDescendantReport.py | 9 +++-- src/plugins/DumpGenderStats.py | 5 ++- src/plugins/EndOfLineReport.py | 9 +++-- src/plugins/Eval.py | 5 ++- src/plugins/EventCmp.py | 5 ++- src/plugins/EventNames.py | 5 ++- src/plugins/ExportCSV.py | 2 +- src/plugins/ExportVCalendar.py | 2 +- src/plugins/ExportVCard.py | 2 +- src/plugins/ExtractCity.py | 5 ++- src/plugins/FamilyGroup.py | 9 +++-- src/plugins/FanChart.py | 9 +++-- src/plugins/FilterByName.py | 2 +- src/plugins/FindDupes.py | 5 ++- src/plugins/GVFamilyLines.py | 8 ++-- src/plugins/GVHourGlass.py | 8 ++-- src/plugins/GVRelGraph.py | 24 ++++++------ src/plugins/ImportCSV.py | 2 +- src/plugins/ImportGeneWeb.py | 2 +- src/plugins/ImportProGen.py | 2 +- src/plugins/ImportvCard.py | 2 +- src/plugins/IndivComplete.py | 9 +++-- src/plugins/KinshipReport.py | 9 +++-- src/plugins/Leak.py | 5 ++- src/plugins/MarkerReport.py | 9 +++-- src/plugins/MediaManager.py | 5 ++- src/plugins/NarrativeWeb.py | 6 +-- src/plugins/NotRelated.py | 5 ++- src/plugins/NumberOfAncestorsReport.py | 9 +++-- src/plugins/OnThisDay.py | 2 +- src/plugins/OwnerEditor.py | 6 +-- src/plugins/PatchNames.py | 5 ++- src/plugins/PlaceReport.py | 9 +++-- src/plugins/Query.py | 2 +- src/plugins/ReadGrdb.py | 2 +- src/plugins/ReadPkg.py | 2 +- src/plugins/Rebuild.py | 5 ++- src/plugins/RebuildRefMap.py | 5 ++- src/plugins/References.py | 2 +- src/plugins/RelCalc.py | 5 ++- src/plugins/RemoveUnused.py | 5 ++- src/plugins/ReorderIds.py | 5 ++- src/plugins/Reporef.py | 2 +- src/plugins/SameSurnames.py | 2 +- src/plugins/SimpleBookTitle.py | 6 +-- src/plugins/SoundGen.py | 5 ++- src/plugins/StatisticsChart.py | 9 +++-- src/plugins/Summary.py | 9 +++-- src/plugins/TestcaseGenerator.py | 5 ++- src/plugins/TimeLine.py | 9 +++-- src/plugins/Verify.py | 5 ++- src/plugins/WebCal.py | 7 ++-- src/plugins/WriteCD.py | 2 +- src/plugins/WriteFtree.py | 2 +- src/plugins/WriteGeneWeb.py | 2 +- src/plugins/WritePkg.py | 2 +- src/plugins/all_events.py | 2 +- src/plugins/all_relations.py | 2 +- src/plugins/lineage.py | 2 +- src/plugins/rel_cs.py | 2 +- src/plugins/rel_da.py | 2 +- src/plugins/rel_de.py | 2 +- src/plugins/rel_es.py | 2 +- src/plugins/rel_fi.py | 2 +- src/plugins/rel_fr.py | 2 +- src/plugins/rel_hu.py | 2 +- src/plugins/rel_it.py | 2 +- src/plugins/rel_nl.py | 2 +- src/plugins/rel_no.py | 2 +- src/plugins/rel_pl.py | 2 +- src/plugins/rel_pt.py | 2 +- src/plugins/rel_ru.py | 2 +- src/plugins/rel_sk.py | 2 +- src/plugins/rel_sv.py | 2 +- src/plugins/siblings.py | 2 +- 120 files changed, 304 insertions(+), 255 deletions(-) rename src/{PluginUtils/_PluginMgr.py => gen/plug/_manager.py} (94%) diff --git a/src/ArgHandler.py b/src/ArgHandler.py index a6e66d938..4c200e3b3 100644 --- a/src/ArgHandler.py +++ b/src/ArgHandler.py @@ -62,7 +62,8 @@ import gen.db.exceptions as GX import gen from DbManager import CLIDbManager, NAME_FILE, find_locker_name -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from ReportBase import CATEGORY_BOOK, CATEGORY_CODE, CATEGORY_WEB, cl_report IMPORT_TYPES = (const.APP_GRAMPS_XML, const.APP_GEDCOM, diff --git a/src/DbLoader.py b/src/DbLoader.py index ff5277d4e..eda80f028 100644 --- a/src/DbLoader.py +++ b/src/DbLoader.py @@ -60,7 +60,7 @@ import Mime import gen.db import GrampsDbUtils import Utils -from PluginUtils import PluginManager +from gen.plug import PluginManager from QuestionDialog import (DBErrorDialog, ErrorDialog, QuestionDialog2, WarningDialog) import Errors diff --git a/src/DisplayState.py b/src/DisplayState.py index a3fedfcc5..189f1e881 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -56,7 +56,7 @@ import Config from BasicUtils import name_displayer import const import ManagedWindow -from PluginUtils import PluginManager +from gen.plug import PluginManager DISABLED = -1 diff --git a/src/ExportAssistant.py b/src/ExportAssistant.py index 4f9463fc4..07b3479d6 100644 --- a/src/ExportAssistant.py +++ b/src/ExportAssistant.py @@ -52,7 +52,7 @@ import gtk import const import Config -from PluginUtils import PluginManager +from gen.plug import PluginManager import Utils import ManagedWindow diff --git a/src/GrampsDbUtils/_GrampsDbWRFactories.py b/src/GrampsDbUtils/_GrampsDbWRFactories.py index f1bdbd991..d75395ed3 100644 --- a/src/GrampsDbUtils/_GrampsDbWRFactories.py +++ b/src/GrampsDbUtils/_GrampsDbWRFactories.py @@ -44,7 +44,7 @@ import logging log = logging.getLogger(".GrampDb") from gen.db import GrampsDbException -from PluginUtils import PluginManager +from gen.plug import PluginManager def gramps_db_reader_factory(db_type): """Factory class for obtaining a Gramps database importer. diff --git a/src/GrampsDbUtils/_WriteGedcom.py b/src/GrampsDbUtils/_WriteGedcom.py index 0994e826c..b26fbf045 100644 --- a/src/GrampsDbUtils/_WriteGedcom.py +++ b/src/GrampsDbUtils/_WriteGedcom.py @@ -1531,6 +1531,6 @@ DESCRIPTION = _('GEDCOM is used to transfer data between genealogy programs. ' CONFIG = (_('GEDCOM export options'), ExportOptions.WriterOptionBox) FILENAME = 'ged' -from PluginUtils import PluginManager +from gen.plug import PluginManager pmgr = PluginManager.get_instance() pmgr.register_export(export_data, TITLE, DESCRIPTION, CONFIG, FILENAME) diff --git a/src/GrampsDbUtils/_WriteXML.py b/src/GrampsDbUtils/_WriteXML.py index 6d4b6e679..60e202eae 100644 --- a/src/GrampsDbUtils/_WriteXML.py +++ b/src/GrampsDbUtils/_WriteXML.py @@ -144,6 +144,6 @@ DESCRIPTION = _('The GRAMPS XML database is a text version of a family tree. ' CONFIG = (_('GRAMPS XML export options'), ExportOptions.WriterOptionBox) FILENAME = 'gramps' -from PluginUtils import PluginManager +from gen.plug import PluginManager pmgr = PluginManager.get_instance() pmgr.register_export(export_data, TITLE, DESCRIPTION, CONFIG, FILENAME) diff --git a/src/PluginUtils/_PluginDialogs.py b/src/PluginUtils/_PluginDialogs.py index 7234f6abf..5708b7974 100644 --- a/src/PluginUtils/_PluginDialogs.py +++ b/src/PluginUtils/_PluginDialogs.py @@ -43,7 +43,7 @@ from gettext import gettext as _ import const from ReportBase import report, standalone_categories import _Tool -from PluginUtils import PluginManager +from gen.plug import PluginManager import ManagedWindow #------------------------------------------------------------------------- diff --git a/src/PluginUtils/_PluginWindows.py b/src/PluginUtils/_PluginWindows.py index 21d1670fa..c2f586968 100644 --- a/src/PluginUtils/_PluginWindows.py +++ b/src/PluginUtils/_PluginWindows.py @@ -45,7 +45,7 @@ import gobject #------------------------------------------------------------------------- import ManagedWindow import Errors -from PluginUtils import PluginManager +from gen.plug import PluginManager import _Tool as Tool #------------------------------------------------------------------------- diff --git a/src/PluginUtils/_Tool.py b/src/PluginUtils/_Tool.py index edca992f2..386ba139f 100644 --- a/src/PluginUtils/_Tool.py +++ b/src/PluginUtils/_Tool.py @@ -48,9 +48,6 @@ from PluginUtils import (Options, OptionHandler, OptionList, # Constants # #------------------------------------------------------------------------- -# Modes for running tools -MODE_GUI = 1 # Standrt tool using GUI -MODE_CLI = 2 # Command line interface (CLI) # Tool categories TOOL_DEBUG = -1 diff --git a/src/PluginUtils/__init__.py b/src/PluginUtils/__init__.py index a276cc488..6ecd17f98 100644 --- a/src/PluginUtils/__init__.py +++ b/src/PluginUtils/__init__.py @@ -24,8 +24,6 @@ from _GuiOptions import GuiMenuOptions, make_gui_option from _Options import Options, OptionListCollection, OptionList, OptionHandler -from _PluginMgr import PluginManager - import _Tool as Tool from _PluginDialogs import ReportPluginDialog, ToolPluginDialog import _PluginWindows as PluginWindows diff --git a/src/QuickReports.py b/src/QuickReports.py index c0991f07b..9a818d8c3 100644 --- a/src/QuickReports.py +++ b/src/QuickReports.py @@ -54,7 +54,7 @@ import gtk # #------------------------------------------------------------------------- -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import (CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE, CATEGORY_QR_MISC, CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY) diff --git a/src/ReportBase/_BookFormatComboBox.py b/src/ReportBase/_BookFormatComboBox.py index cdc06da4f..a21cb19e9 100644 --- a/src/ReportBase/_BookFormatComboBox.py +++ b/src/ReportBase/_BookFormatComboBox.py @@ -36,6 +36,7 @@ import gobject #------------------------------------------------------------------------- import Config import PluginUtils +import gen #------------------------------------------------------------------------- # @@ -45,7 +46,7 @@ import PluginUtils class BookFormatComboBox(gtk.ComboBox): def __init__(self): - pmgr = PluginUtils.PluginManager.get_instance() + pmgr = gen.plug.PluginManager.get_instance() self.__book_doc_list = pmgr.get_book_doc_list() self.__book_doc_list.sort() gtk.ComboBox.__init__(self) diff --git a/src/ReportBase/_CommandLineReport.py b/src/ReportBase/_CommandLineReport.py index 0958b10b1..8729a3e3d 100644 --- a/src/ReportBase/_CommandLineReport.py +++ b/src/ReportBase/_CommandLineReport.py @@ -40,7 +40,6 @@ log = logging.getLogger(".") # Gramps modules # #------------------------------------------------------------------------- -import PluginUtils import gen import Utils import BaseDoc @@ -126,7 +125,7 @@ class CommandLineReport: """ Initialize the options that are hard-coded into the report system. """ - pmgr = PluginUtils.PluginManager.get_instance() + pmgr = gen.plug.PluginManager.get_instance() _textdoc_list = pmgr.get_text_doc_list() _drawdoc_list = pmgr.get_draw_doc_list() _bookdoc_list = pmgr.get_book_doc_list() @@ -285,7 +284,7 @@ class CommandLineReport: self.option_class.handler.output = self.options_dict['of'] - pmgr = PluginUtils.PluginManager.get_instance() + pmgr = gen.plug.PluginManager.get_instance() if self.category == CATEGORY_TEXT: for item in pmgr.get_text_doc_list(): diff --git a/src/ReportBase/_Constants.py b/src/ReportBase/_Constants.py index 530b9827a..47734abfc 100644 --- a/src/ReportBase/_Constants.py +++ b/src/ReportBase/_Constants.py @@ -35,10 +35,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- -# Modes for generating reports -MODE_GUI = 1 # Standalone report using GUI -MODE_BKI = 2 # Book Item interface using GUI -MODE_CLI = 4 # Command line interface (CLI) + # Report categories CATEGORY_TEXT = 0 diff --git a/src/ReportBase/_DrawFormatComboBox.py b/src/ReportBase/_DrawFormatComboBox.py index 24808de2e..261869e84 100644 --- a/src/ReportBase/_DrawFormatComboBox.py +++ b/src/ReportBase/_DrawFormatComboBox.py @@ -24,7 +24,7 @@ import gtk import gobject import Config -import PluginUtils +import gen #------------------------------------------------------------------------- # @@ -34,7 +34,7 @@ import PluginUtils class DrawFormatComboBox(gtk.ComboBox): def __init__(self): - pmgr = PluginUtils.PluginManager.get_instance() + pmgr = gen.plug.PluginManager.get_instance() self.__drawdoc_list = pmgr.get_draw_doc_list() self.__drawdoc_list.sort() gtk.ComboBox.__init__(self) diff --git a/src/ReportBase/_TextFormatComboBox.py b/src/ReportBase/_TextFormatComboBox.py index f5d674568..3e4ea677d 100644 --- a/src/ReportBase/_TextFormatComboBox.py +++ b/src/ReportBase/_TextFormatComboBox.py @@ -24,7 +24,7 @@ import gtk import gobject import Config -import PluginUtils +import gen #------------------------------------------------------------------------- # @@ -34,7 +34,7 @@ import PluginUtils class TextFormatComboBox(gtk.ComboBox): def __init__(self): - pmgr = PluginUtils.PluginManager.get_instance() + pmgr = gen.plug.PluginManager.get_instance() self.__text_doc_list = pmgr.get_text_doc_list() self.__text_doc_list.sort() gtk.ComboBox.__init__(self) diff --git a/src/ViewManager.py b/src/ViewManager.py index b201f3e03..933e5a857 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -55,8 +55,9 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from PluginUtils import Tool, PluginWindows, PluginManager, \ +from PluginUtils import Tool, PluginWindows, \ ReportPluginDialog, ToolPluginDialog +from gen.plug import PluginManager import ReportBase import DisplayState import const diff --git a/src/docgen/AsciiDoc.py b/src/docgen/AsciiDoc.py index 5c0fc68f7..3d50abfc9 100644 --- a/src/docgen/AsciiDoc.py +++ b/src/docgen/AsciiDoc.py @@ -34,7 +34,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager import Errors import Mime import Utils diff --git a/src/docgen/GtkPrint.py b/src/docgen/GtkPrint.py index ada52d377..bcca2fc29 100644 --- a/src/docgen/GtkPrint.py +++ b/src/docgen/GtkPrint.py @@ -44,7 +44,7 @@ import os #------------------------------------------------------------------------ import BaseDoc from CairoDoc import CairoDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager import Errors #------------------------------------------------------------------------ diff --git a/src/docgen/HtmlDoc.py b/src/docgen/HtmlDoc.py index 153c952c0..b91f253f1 100644 --- a/src/docgen/HtmlDoc.py +++ b/src/docgen/HtmlDoc.py @@ -36,7 +36,7 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager import ImgManip import tarfile import const diff --git a/src/docgen/LaTeXDoc.py b/src/docgen/LaTeXDoc.py index 6c318349c..5b7edfb01 100644 --- a/src/docgen/LaTeXDoc.py +++ b/src/docgen/LaTeXDoc.py @@ -43,7 +43,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager import ImgManip import Errors import Mime diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py index 5989db7d8..390acda73 100644 --- a/src/docgen/ODFDoc.py +++ b/src/docgen/ODFDoc.py @@ -43,7 +43,7 @@ from xml.sax.saxutils import escape #------------------------------------------------------------------------- import BaseDoc import const -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import ReportUtils import ImgManip import FontScale diff --git a/src/docgen/PSDrawDoc.py b/src/docgen/PSDrawDoc.py index ec6791d89..a04042e7e 100644 --- a/src/docgen/PSDrawDoc.py +++ b/src/docgen/PSDrawDoc.py @@ -32,7 +32,7 @@ from gettext import gettext as _ #Gramps modules #------------------------------------------------------------------------- from ReportBase import ReportUtils, run_print_dialog, get_print_dialog_app -from PluginUtils import PluginManager +from gen.plug import PluginManager import BaseDoc import Errors diff --git a/src/docgen/PdfDoc.py b/src/docgen/PdfDoc.py index 153d9e59d..dd150e3ec 100644 --- a/src/docgen/PdfDoc.py +++ b/src/docgen/PdfDoc.py @@ -37,7 +37,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ from CairoDoc import CairoDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager import Utils import Mime diff --git a/src/docgen/RTFDoc.py b/src/docgen/RTFDoc.py index a1aecdf63..fa0c097db 100644 --- a/src/docgen/RTFDoc.py +++ b/src/docgen/RTFDoc.py @@ -34,7 +34,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager import ImgManip import Errors import Mime diff --git a/src/docgen/SvgDrawDoc.py b/src/docgen/SvgDrawDoc.py index 486264f46..8277f0565 100644 --- a/src/docgen/SvgDrawDoc.py +++ b/src/docgen/SvgDrawDoc.py @@ -34,7 +34,7 @@ import StringIO # Gramps modules # #------------------------------------------------------------------------- -from PluginUtils import PluginManager +from gen.plug import PluginManager import BaseDoc import Errors diff --git a/src/gen/plug/__init__.py b/src/gen/plug/__init__.py index a55de30ef..77a8b9970 100644 --- a/src/gen/plug/__init__.py +++ b/src/gen/plug/__init__.py @@ -22,3 +22,6 @@ The "plug" package for handling plugins in Gramps. """ __all__ = [ "opt" ] + +from _manager import PluginManager + diff --git a/src/PluginUtils/_PluginMgr.py b/src/gen/plug/_manager.py similarity index 94% rename from src/PluginUtils/_PluginMgr.py rename to src/gen/plug/_manager.py index b8b3dcf5e..ad8f50504 100644 --- a/src/PluginUtils/_PluginMgr.py +++ b/src/gen/plug/_manager.py @@ -21,12 +21,12 @@ # $Id$ """ -The core of the GRAMPS plugin system. This module provides tasks to load -plugins from specfied directories, build menus for the different categories, -and provide dialog to select and execute plugins. +The core of the GRAMPS plugin system. This module provides capability to load +plugins from specfied directories and provide information about the loaded +plugins. -Plugins are divided into several categories. This are: reports, tools, -importers, exporters, and document generators. +Plugins are divided into several categories. These are: reports, tools, +importers, exporters, quick reports, and document generators. """ #------------------------------------------------------------------------- @@ -44,7 +44,6 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from ReportBase import MODE_GUI, MODE_CLI, MODE_BKI, book_categories import gen.utils import Relationship @@ -66,6 +65,15 @@ class PluginManager(gen.utils.Callback): __signals__ = { 'plugins-reloaded' : None } + # Modes for generating reports + REPORT_MODE_GUI = 1 # Standalone report using GUI + REPORT_MODE_BKI = 2 # Book Item interface using GUI + REPORT_MODE_CLI = 4 # Command line interface (CLI) + + # Modes for running tools + TOOL_MODE_GUI = 1 # Standrt tool using GUI + TOOL_MODE_CLI = 2 # Command line interface (CLI) + def get_instance(): """ Use this function to get the instance of the PluginManager """ if PluginManager.__instance is None: @@ -305,17 +313,15 @@ class PluginManager(gen.utils.Callback): This function should be used to register tool in GUI and/or command-line mode. """ - - import _Tool - - (junk, gui_task) = divmod(modes, 2**_Tool.MODE_GUI) + (junk, gui_task) = divmod(modes, 2**PluginManager.TOOL_MODE_GUI) if gui_task: self.__register_gui_tool(tool_class, options_class, translated_name, name, category, description, status, author_name, author_email, unsupported, require_active) - (junk, cli_task) = divmod(modes-gui_task, 2**_Tool.MODE_CLI) + (junk, cli_task) = divmod(modes-gui_task, + 2**PluginManager.TOOL_MODE_CLI) if cli_task: self.__register_cli_tool(name, category, tool_class, options_class, translated_name, unsupported) @@ -369,7 +375,8 @@ class PluginManager(gen.utils.Callback): The low-level functions (starting with '_') should not be used on their own. Instead, this function will call them as needed. """ - (junk, standalone_task) = divmod(modes, 2**MODE_GUI) + (junk, standalone_task) = divmod(modes, + 2**PluginManager.REPORT_MODE_GUI) if standalone_task: self.__register_standalone(report_class, options_class, translated_name, name, category, @@ -377,15 +384,16 @@ class PluginManager(gen.utils.Callback): author_email, unsupported, require_active) - (junk, book_item_task) = divmod(modes-standalone_task, 2**MODE_BKI) + (junk, book_item_task) = divmod(modes-standalone_task, + 2**PluginManager.REPORT_MODE_BKI) if book_item_task: - book_item_category = book_categories[category] + book_item_category = category self.__register_book_item(translated_name, book_item_category, report_class, options_class, name, unsupported, require_active) (junk, command_line_task) = divmod(modes-standalone_task-book_item_task, - 2**MODE_CLI) + 2**PluginManager.REPORT_MODE_CLI) if command_line_task: self.__register_cl_report(name, category, report_class, options_class, translated_name, diff --git a/src/plugins/AgeOnDate.py b/src/plugins/AgeOnDate.py index 0c9bad9dd..45ac1445e 100644 --- a/src/plugins/AgeOnDate.py +++ b/src/plugins/AgeOnDate.py @@ -25,7 +25,7 @@ Display references for any object from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_DATE import DateHandler import gen.lib diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py index 3cc269567..7e5cb3b89 100644 --- a/src/plugins/AncestorReport.py +++ b/src/plugins/AncestorReport.py @@ -36,10 +36,9 @@ from gettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, NumberOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc from BasicUtils import name_displayer @@ -342,7 +341,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = AncestorReport, options_class = AncestorOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Ahnentafel Report"), status = _("Stable"), description = _("Produces a textual ancestral report"), diff --git a/src/plugins/AncestorTree.py b/src/plugins/AncestorTree.py index 50e565393..d8ed7f5a4 100644 --- a/src/plugins/AncestorTree.py +++ b/src/plugins/AncestorTree.py @@ -38,10 +38,9 @@ from gettext import gettext as _ #------------------------------------------------------------------------ import BaseDoc from SubstKeywords import SubstKeywords -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, NumberOption, TextOption, PersonOption -from ReportBase import Report, ReportUtils, CATEGORY_DRAW, MenuReportOptions, \ - MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, CATEGORY_DRAW, MenuReportOptions from BasicUtils import name_displayer pt2cm = ReportUtils.pt2cm cm2pt = ReportUtils.cm2pt @@ -531,7 +530,9 @@ pmgr.register_report( category = CATEGORY_DRAW, report_class = AncestorTree, options_class = AncestorTreeOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Ancestor Tree"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 033c73b2c..0a2fb9f51 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -72,12 +72,12 @@ import ListModel import Errors import BaseDoc from QuestionDialog import WarningDialog, ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import PersonOption, FilterOption, FamilyOption import ManagedWindow # Import from specific modules in ReportBase -from ReportBase._Constants import CATEGORY_BOOK, MODE_GUI, MODE_CLI +from ReportBase import CATEGORY_BOOK, book_categories from ReportBase._BookFormatComboBox import BookFormatComboBox from ReportBase._ReportDialog import ReportDialog from ReportBase._DocReportDialog import DocReportDialog @@ -204,7 +204,7 @@ class BookItem: if item[5]: self.category = _UNSUPPORTED else: - self.category = item[1] + self.category = book_categories[item[1]] self.write_item = item[2] self.name = item[4] self.option_class = item[3](self.name, self.dbase) @@ -757,7 +757,7 @@ class BookReportSelector(ManagedWindow.ManagedWindow): if book_item[5]: category = _UNSUPPORTED else: - category = book_item[1] + category = book_categories[book_item[1]] data = [ book_item[0], category, book_item[4] ] new_iter = self.av_model.add(data) @@ -1245,7 +1245,7 @@ pmgr.register_report( category = CATEGORY_BOOK, report_class = BookReportSelector, options_class = cl_report, - modes = MODE_GUI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | PluginManager.REPORT_MODE_CLI, translated_name = _("Book Report"), status = _("Stable"), description = _("Produces a book containing several reports."), diff --git a/src/plugins/CalculateEstimatedDates.py b/src/plugins/CalculateEstimatedDates.py index 9dc1d09b3..0d9e1b91d 100644 --- a/src/plugins/CalculateEstimatedDates.py +++ b/src/plugins/CalculateEstimatedDates.py @@ -36,7 +36,8 @@ import time # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Tool, PluginManager, PluginWindows, MenuToolOptions +from PluginUtils import Tool, PluginWindows, MenuToolOptions +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, NumberOption, StringOption, \ FilterOption, PersonOption import gen.lib @@ -488,7 +489,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = CalcToolManagedWindow, options_class = CalcEstDateOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Calculate Estimated Dates"), status = _("Beta"), author_name = "Douglas S. Blank", diff --git a/src/plugins/Calendar.py b/src/plugins/Calendar.py index 9090730fc..3a48fa011 100644 --- a/src/plugins/Calendar.py +++ b/src/plugins/Calendar.py @@ -37,10 +37,9 @@ import os #------------------------------------------------------------------------ import BaseDoc from BasicUtils import name_displayer -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import (Report, ReportUtils, MenuReportOptions, - CATEGORY_DRAW, CATEGORY_TEXT, - MODE_GUI, MODE_BKI, MODE_CLI) + CATEGORY_DRAW, CATEGORY_TEXT) from gen.plug.menu import BooleanOption, StringOption, NumberOption, \ EnumeratedListOption, FilterOption, PersonOption import GrampsLocale @@ -924,7 +923,9 @@ pmgr.register_report( category = CATEGORY_DRAW, report_class = Calendar, options_class = CalendarOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Calendar"), status = _("Stable"), author_name = "Douglas S. Blank", @@ -937,7 +938,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = CalendarReport, options_class = CalendarReportOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Birthday and Anniversary Report"), status = _("Stable"), author_name = "Douglas S. Blank", diff --git a/src/plugins/ChangeNames.py b/src/plugins/ChangeNames.py index 528b9c47d..75a51550b 100644 --- a/src/plugins/ChangeNames.py +++ b/src/plugins/ChangeNames.py @@ -49,7 +49,8 @@ import GrampsDisplay import ManagedWindow from QuestionDialog import OkDialog -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from TransUtils import sgettext as _ #------------------------------------------------------------------------- # @@ -286,7 +287,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = ChangeNames, options_class = ChangeNamesOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Fix Capitalization of Family Names"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/ChangeTypes.py b/src/plugins/ChangeTypes.py index 95e8c18c2..4a0711623 100644 --- a/src/plugins/ChangeTypes.py +++ b/src/plugins/ChangeTypes.py @@ -49,7 +49,8 @@ import ManagedWindow import AutoComp from gen.lib import EventType from QuestionDialog import OkDialog -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager #------------------------------------------------------------------------- # @@ -202,7 +203,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = ChangeTypes, options_class = ChangeTypesOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Rename Event Types"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/Check.py b/src/plugins/Check.py index 48691f7ac..738ffb568 100644 --- a/src/plugins/Check.py +++ b/src/plugins/Check.py @@ -60,7 +60,8 @@ import Utils #import const import ManagedWindow -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from QuestionDialog import OkDialog, MissingMediaDialog from BasicUtils import name_displayer as _nd @@ -1514,7 +1515,7 @@ pmgr.register_tool( category = Tool.TOOL_DBFIX, tool_class = Check, options_class = CheckOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Check and Repair Database"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/CmdRef.py b/src/plugins/CmdRef.py index d1728e750..354ab2279 100644 --- a/src/plugins/CmdRef.py +++ b/src/plugins/CmdRef.py @@ -38,7 +38,8 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from ReportBase import CATEGORY_BOOK, CATEGORY_WEB from ReportBase._CommandLineReport import CommandLineReport @@ -236,7 +237,7 @@ if __debug__: category = Tool.TOOL_DEBUG, tool_class = CmdRef, options_class = CmdRefOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Generate Commandline Plugin Reference"), status = _("Stable"), author_name = "Martin Hawlisch", diff --git a/src/plugins/CustomBookText.py b/src/plugins/CustomBookText.py index 113857af9..a8ae7f666 100644 --- a/src/plugins/CustomBookText.py +++ b/src/plugins/CustomBookText.py @@ -41,9 +41,9 @@ from gettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import TextOption -from ReportBase import Report, MenuReportOptions, CATEGORY_TEXT, MODE_BKI +from ReportBase import Report, MenuReportOptions, CATEGORY_TEXT import BaseDoc #------------------------------------------------------------------------ @@ -166,6 +166,6 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = CustomText, options_class = CustomTextOptions, - modes = MODE_BKI, + modes = PluginManager.REPORT_MODE_BKI, translated_name = _("Custom Text"), ) diff --git a/src/plugins/DateParserDisplayTest.py b/src/plugins/DateParserDisplayTest.py index 2af370c57..8d45a658d 100644 --- a/src/plugins/DateParserDisplayTest.py +++ b/src/plugins/DateParserDisplayTest.py @@ -43,7 +43,8 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- import gen.lib -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager import Utils from QuestionDialog import QuestionDialog from DateHandler import parser as _dp @@ -234,7 +235,7 @@ pmgr.register_tool( category = Tool.TOOL_DEBUG, tool_class = DateParserDisplayTest, options_class = Tool.ToolOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Check Localized Date Displayer and Parser"), status = _("Beta"), author_name = "Martin Hawlisch", diff --git a/src/plugins/Desbrowser.py b/src/plugins/Desbrowser.py index cf503ba87..80cd78509 100644 --- a/src/plugins/Desbrowser.py +++ b/src/plugins/Desbrowser.py @@ -44,7 +44,8 @@ from gtk import glade # #------------------------------------------------------------------------ from BasicUtils import name_displayer -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager import GrampsDisplay import ManagedWindow from TransUtils import sgettext as _ @@ -164,7 +165,7 @@ pmgr.register_tool( category = Tool.TOOL_ANAL, tool_class = DesBrowse, options_class = DesBrowseOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Interactive Descendant Browser"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/DescendReport.py b/src/plugins/DescendReport.py index 2f3a4afe1..ad98e3451 100644 --- a/src/plugins/DescendReport.py +++ b/src/plugins/DescendReport.py @@ -35,10 +35,9 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import NumberOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc import Sort from BasicUtils import name_displayer @@ -252,7 +251,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = DescendantReport, options_class = DescendantOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Descendant Report"), status = _("Stable"), description = _("Produces a list of descendants of the active person"), diff --git a/src/plugins/DescendTree.py b/src/plugins/DescendTree.py index a828ef57c..110cc5cd3 100644 --- a/src/plugins/DescendTree.py +++ b/src/plugins/DescendTree.py @@ -29,10 +29,9 @@ # #------------------------------------------------------------------------ from BasicUtils import name_displayer -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import TextOption, NumberOption, BooleanOption, PersonOption -from ReportBase import Report, MenuReportOptions, \ - ReportUtils, CATEGORY_DRAW, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, MenuReportOptions, ReportUtils, CATEGORY_DRAW from SubstKeywords import SubstKeywords from gettext import gettext as _ import BaseDoc @@ -485,7 +484,9 @@ pmgr.register_report( category = CATEGORY_DRAW, report_class = DescendTree, options_class = DescendTreeOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Descendant Tree"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index d520cf5cb..ec9584ade 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -38,10 +38,9 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import gen.lib -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, NumberOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT from ReportBase import Bibliography, Endnotes import BaseDoc import DateHandler @@ -882,7 +881,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = DetAncestorReport, options_class = DetAncestorOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Detailed Ancestral Report"), status=(_("Stable")), description= _("Produces a detailed ancestral report"), diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index bcccdd7de..45102840a 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -39,10 +39,9 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import gen.lib -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, NumberOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT from ReportBase import Bibliography, Endnotes import BaseDoc import DateHandler @@ -872,7 +871,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = DetDescendantReport, options_class = DetDescendantOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Detailed Descendant Report"), status = _("Stable"), description = _("Produces a detailed descendant report"), diff --git a/src/plugins/DumpGenderStats.py b/src/plugins/DumpGenderStats.py index f63759e04..c7138cfb5 100644 --- a/src/plugins/DumpGenderStats.py +++ b/src/plugins/DumpGenderStats.py @@ -30,7 +30,8 @@ import gtk import ListModel import ManagedWindow -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ] #------------------------------------------------------------------------- @@ -115,7 +116,7 @@ if __debug__: category = Tool.TOOL_DEBUG, tool_class = DumpGenderStats, options_class = DumpGenderStatsOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Dump Gender Statistics"), description = _("Will dump the statistics for the gender guessing " "from the first name.") diff --git a/src/plugins/EndOfLineReport.py b/src/plugins/EndOfLineReport.py index b33e4f35f..c1cc33c3c 100644 --- a/src/plugins/EndOfLineReport.py +++ b/src/plugins/EndOfLineReport.py @@ -34,10 +34,9 @@ from gettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc from BasicUtils import name_displayer import DateHandler @@ -318,7 +317,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = EndOfLineReport, options_class = EndOfLineOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("End of Line Report"), status = _("Stable"), description = _("Produces a textual end of line report"), diff --git a/src/plugins/Eval.py b/src/plugins/Eval.py index 410dc8be5..9ca6d0d16 100644 --- a/src/plugins/Eval.py +++ b/src/plugins/Eval.py @@ -46,7 +46,8 @@ from gtk import glade # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager import ManagedWindow #------------------------------------------------------------------------- @@ -126,7 +127,7 @@ if __debug__: category = Tool.TOOL_DEBUG, tool_class = Eval, options_class = EvalOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Python Evaluation Window"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/EventCmp.py b/src/plugins/EventCmp.py index 61384769e..1031f5314 100644 --- a/src/plugins/EventCmp.py +++ b/src/plugins/EventCmp.py @@ -52,7 +52,8 @@ import const import Errors import DateHandler from QuestionDialog import WarningDialog -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from ReportBase import ReportUtils import GrampsDisplay import ManagedWindow @@ -462,7 +463,7 @@ pmgr.register_tool( category = Tool.TOOL_ANAL, tool_class = EventComparison, options_class = EventComparisonOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Compare Individual Events"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/EventNames.py b/src/plugins/EventNames.py index 9c5313ccc..e1aea5e92 100644 --- a/src/plugins/EventNames.py +++ b/src/plugins/EventNames.py @@ -45,7 +45,8 @@ import ManagedWindow import gen.lib import Utils -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from BasicUtils import name_displayer #------------------------------------------------------------------------- @@ -158,7 +159,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = EventNames, options_class = EventNamesOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Extract Event Descriptions from Event Data"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/ExportCSV.py b/src/plugins/ExportCSV.py index 2e8494eea..62609fbe1 100644 --- a/src/plugins/ExportCSV.py +++ b/src/plugins/ExportCSV.py @@ -59,7 +59,7 @@ from Filters import GenericFilter, Rules, build_filter_menu import Utils import Errors from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager import DateHandler #------------------------------------------------------------------------- diff --git a/src/plugins/ExportVCalendar.py b/src/plugins/ExportVCalendar.py index c77c8539f..17470cc55 100644 --- a/src/plugins/ExportVCalendar.py +++ b/src/plugins/ExportVCalendar.py @@ -59,7 +59,7 @@ import Utils from gen.lib import Date, EventType import Errors from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/ExportVCard.py b/src/plugins/ExportVCard.py index b76081c30..de6753669 100644 --- a/src/plugins/ExportVCard.py +++ b/src/plugins/ExportVCard.py @@ -56,7 +56,7 @@ from Filters import GenericFilter, Rules, build_filter_menu from gen.lib import Date import Errors from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/ExtractCity.py b/src/plugins/ExtractCity.py index ab31a4e06..47dece14a 100644 --- a/src/plugins/ExtractCity.py +++ b/src/plugins/ExtractCity.py @@ -50,7 +50,8 @@ import gobject import ManagedWindow import GrampsDisplay -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager import Utils CITY_STATE_ZIP = re.compile("((\w|\s)+)\s*,\s*((\w|\s)+)\s*(,\s*((\d|-)+))", re.UNICODE) @@ -643,7 +644,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = ExtractCity, options_class = ExtractCityOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Extract Place Data from a Place Title"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py index 2141a6ff3..3357e9e07 100644 --- a/src/plugins/FamilyGroup.py +++ b/src/plugins/FamilyGroup.py @@ -29,10 +29,9 @@ # #------------------------------------------------------------------------ import gen.lib -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, FamilyOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc import DateHandler from TransUtils import sgettext as _ @@ -769,7 +768,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = FamilyGroup, options_class = FamilyGroupOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Family Group Report"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/FanChart.py b/src/plugins/FanChart.py index a6f9b47c0..566afb366 100644 --- a/src/plugins/FanChart.py +++ b/src/plugins/FanChart.py @@ -34,10 +34,9 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import BaseDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import EnumeratedListOption, NumberOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW, \ - MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW from SubstKeywords import SubstKeywords #------------------------------------------------------------------------ @@ -439,7 +438,9 @@ pmgr.register_report( category = CATEGORY_DRAW, report_class = FanChart, options_class = FanChartOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Fan Chart"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/FilterByName.py b/src/plugins/FilterByName.py index e9ab70a1e..ec5f05e1d 100644 --- a/src/plugins/FilterByName.py +++ b/src/plugins/FilterByName.py @@ -24,7 +24,7 @@ Display filtered data """ from Simple import SimpleAccess, SimpleDoc, SimpleTable -from PluginUtils import PluginManager +from gen.plug import PluginManager from Utils import media_path_full from QuickReports import run_quick_report_by_name_direct from gen.lib import Person diff --git a/src/plugins/FindDupes.py b/src/plugins/FindDupes.py index ad198ae47..9634c213d 100644 --- a/src/plugins/FindDupes.py +++ b/src/plugins/FindDupes.py @@ -52,7 +52,8 @@ import Errors from Merge import PersonCompare import GrampsDisplay import ManagedWindow -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from QuestionDialog import ErrorDialog, RunDatabaseRepair from TransUtils import sgettext as _ #------------------------------------------------------------------------- @@ -696,7 +697,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = Merge, options_class = MergeOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Find Possible Duplicate People"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/GVFamilyLines.py b/src/plugins/GVFamilyLines.py index dd0e8d1b7..4491dfc3a 100644 --- a/src/plugins/GVFamilyLines.py +++ b/src/plugins/GVFamilyLines.py @@ -49,9 +49,8 @@ import gen.lib import Utils import ThumbNails from DateHandler import displayer as _dd -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_GRAPHVIZ, MODE_GUI -from PluginUtils import PluginManager +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_GRAPHVIZ +from gen.plug import PluginManager from gen.plug.menu import NumberOption, ColorOption, BooleanOption, \ EnumeratedListOption, PersonListOption, \ SurnameColorOption @@ -1028,7 +1027,8 @@ pmgr.register_report( category = CATEGORY_GRAPHVIZ, report_class = FamilyLinesReport, options_class = FamilyLinesOptions, - modes = MODE_GUI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_CLI, status = _("Stable"), author_name = "Stephane Charette", author_email = "stephanecharette@gmail.com", diff --git a/src/plugins/GVHourGlass.py b/src/plugins/GVHourGlass.py index 2e499db0d..db4561967 100644 --- a/src/plugins/GVHourGlass.py +++ b/src/plugins/GVHourGlass.py @@ -36,11 +36,10 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import PersonOption, BooleanOption, NumberOption, \ EnumeratedListOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - MODE_GUI, MODE_CLI, CATEGORY_GRAPHVIZ +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_GRAPHVIZ from BasicUtils import name_displayer import DateHandler @@ -299,7 +298,8 @@ pmgr.register_report( category = CATEGORY_GRAPHVIZ, report_class = HourGlassReport, options_class = HourGlassOptions, - modes = MODE_GUI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Hourglass Graph"), status = _("Stable"), author_name = "Brian G. Matherly", diff --git a/src/plugins/GVRelGraph.py b/src/plugins/GVRelGraph.py index c33ae9d65..7d779cb93 100644 --- a/src/plugins/GVRelGraph.py +++ b/src/plugins/GVRelGraph.py @@ -43,11 +43,10 @@ from TransUtils import sgettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, EnumeratedListOption, FilterOption, \ PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - MODE_GUI, MODE_CLI, CATEGORY_GRAPHVIZ +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_GRAPHVIZ from BasicUtils import name_displayer import DateHandler import gen.lib @@ -561,16 +560,17 @@ class RelGraphOptions(MenuReportOptions): #------------------------------------------------------------------------ pmgr = PluginManager.get_instance() pmgr.register_report( - name = 'rel_graph', - category = CATEGORY_GRAPHVIZ, - report_class = RelGraphReport, - options_class = RelGraphOptions, - modes = MODE_GUI | MODE_CLI, + name = 'rel_graph', + category = CATEGORY_GRAPHVIZ, + report_class = RelGraphReport, + options_class = RelGraphOptions, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Relationship Graph"), - status = _("Stable"), - description = _("Produces relationship graphs using Graphviz"), - author_name = "Brian G. Matherly", - author_email = "brian@gramps-project.org" + status = _("Stable"), + description = _("Produces relationship graphs using Graphviz"), + author_name = "Brian G. Matherly", + author_email = "brian@gramps-project.org" ) diff --git a/src/plugins/ImportCSV.py b/src/plugins/ImportCSV.py index 73d141767..866e47409 100644 --- a/src/plugins/ImportCSV.py +++ b/src/plugins/ImportCSV.py @@ -58,7 +58,7 @@ import gtk import gen.lib from QuestionDialog import ErrorDialog from DateHandler import parser as _dp -from PluginUtils import PluginManager +from gen.plug import PluginManager from Utils import gender as gender_map from Utils import ProgressMeter diff --git a/src/plugins/ImportGeneWeb.py b/src/plugins/ImportGeneWeb.py index f5e4b0621..7840fca9e 100644 --- a/src/plugins/ImportGeneWeb.py +++ b/src/plugins/ImportGeneWeb.py @@ -56,7 +56,7 @@ import Errors import gen.lib import const from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager from htmlentitydefs import name2codepoint _date_parse = re.compile('([kmes~?<>]+)?([0-9/]+)([J|H|F])?(\.\.)?([0-9/]+)?([J|H|F])?') diff --git a/src/plugins/ImportProGen.py b/src/plugins/ImportProGen.py index f1c504855..727a465db 100644 --- a/src/plugins/ImportProGen.py +++ b/src/plugins/ImportProGen.py @@ -54,7 +54,7 @@ import Utils import gen.lib import const from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager class ProgenError(Exception): diff --git a/src/plugins/ImportvCard.py b/src/plugins/ImportvCard.py index 7ca182795..aa35592b7 100644 --- a/src/plugins/ImportvCard.py +++ b/src/plugins/ImportvCard.py @@ -56,7 +56,7 @@ import Errors import gen.lib import const from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py index 59f243054..5b8434fe7 100644 --- a/src/plugins/IndivComplete.py +++ b/src/plugins/IndivComplete.py @@ -37,10 +37,9 @@ from gettext import gettext as _ import gen.lib import BaseDoc import DateHandler -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, FilterOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT from ReportBase import Bibliography, Endnotes from BasicUtils import name_displayer as _nd from Utils import media_path_full @@ -639,7 +638,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = IndivCompleteReport, options_class = IndivCompleteOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Complete Individual Report"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/KinshipReport.py b/src/plugins/KinshipReport.py index 8c5e551f4..5735a7766 100644 --- a/src/plugins/KinshipReport.py +++ b/src/plugins/KinshipReport.py @@ -35,10 +35,9 @@ from string import capitalize # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import NumberOption, BooleanOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc from BasicUtils import name_displayer import DateHandler @@ -403,7 +402,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = KinshipReport, options_class = KinshipOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Kinship Report"), status = _("Stable"), description = _("Produces a textual report of kinship for a given person"), diff --git a/src/plugins/Leak.py b/src/plugins/Leak.py index 9d69167d9..b2b7f9a45 100644 --- a/src/plugins/Leak.py +++ b/src/plugins/Leak.py @@ -47,7 +47,8 @@ import gc # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager import ManagedWindow #------------------------------------------------------------------------- @@ -126,7 +127,7 @@ if __debug__: category = Tool.TOOL_DEBUG, tool_class = Leak, options_class = LeakOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Show Uncollected Objects"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/MarkerReport.py b/src/plugins/MarkerReport.py index 2e5b63807..fe1316a71 100644 --- a/src/plugins/MarkerReport.py +++ b/src/plugins/MarkerReport.py @@ -34,10 +34,9 @@ from gettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import EnumeratedListOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc from gen.lib import MarkerType from Filters import GenericFilterFactory, Rules @@ -522,7 +521,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = MarkerReport, options_class = MarkerOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Marker Report"), status = _("Stable"), description = _("Produces a list of people with a specified marker"), diff --git a/src/plugins/MediaManager.py b/src/plugins/MediaManager.py index 11801160e..8fb19495c 100644 --- a/src/plugins/MediaManager.py +++ b/src/plugins/MediaManager.py @@ -51,7 +51,8 @@ import Assistant import Errors from gen.lib import MediaObject from BasicUtils import UpdateCallback -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from Utils import media_path_full, relative_path, media_path from TransUtils import sgettext as _ @@ -591,7 +592,7 @@ pmgr.register_tool( category = Tool.TOOL_UTILS, tool_class = MediaMan, options_class = MediaManOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Media Manager"), status = _("Beta"), author_name = "Alex Roitman", diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 2b787d8af..f6d367948 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -73,12 +73,12 @@ import gen.lib import const from GrampsCfg import get_researcher import Sort -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import PersonOption, NumberOption, StringOption, \ BooleanOption, EnumeratedListOption, FilterOption, \ NoteOption, MediaOption, DestinationOption from ReportBase import (Report, ReportUtils, MenuReportOptions, CATEGORY_WEB, - MODE_GUI, MODE_CLI, Bibliography) + Bibliography) import Utils import ThumbNails import ImgManip @@ -3321,7 +3321,7 @@ pmgr.register_report( category = CATEGORY_WEB, report_class = NavWebReport, options_class = NavWebOptions, - modes = MODE_GUI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | PluginManager.REPORT_MODE_CLI, translated_name = _("Narrated Web Site"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/NotRelated.py b/src/plugins/NotRelated.py index aa53a9857..25ee7f422 100644 --- a/src/plugins/NotRelated.py +++ b/src/plugins/NotRelated.py @@ -43,7 +43,8 @@ import gobject # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager, Tool +from PluginUtils import Tool +from gen.plug import PluginManager from ReportBase import ReportUtils from Editors import EditPerson, EditFamily import ManagedWindow @@ -432,7 +433,7 @@ pmgr.register_tool( category = Tool.TOOL_UTILS, tool_class = NotRelated, options_class = NotRelatedOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Not Related"), status = _("Stable"), author_name = "Stephane Charette", diff --git a/src/plugins/NumberOfAncestorsReport.py b/src/plugins/NumberOfAncestorsReport.py index a9453fced..b8dc1c38b 100644 --- a/src/plugins/NumberOfAncestorsReport.py +++ b/src/plugins/NumberOfAncestorsReport.py @@ -38,10 +38,9 @@ import math # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import PersonOption -from ReportBase import Report, MenuReportOptions, ReportUtils, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, MenuReportOptions, ReportUtils, CATEGORY_TEXT from BasicUtils import name_displayer import BaseDoc @@ -196,7 +195,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = NumberOfAncestorsReport, options_class = NumberOfAncestorsOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Number of Ancestors Report"), status = _("Stable"), description = _("Counts number of ancestors of selected person"), diff --git a/src/plugins/OnThisDay.py b/src/plugins/OnThisDay.py index 18329d894..701743b20 100644 --- a/src/plugins/OnThisDay.py +++ b/src/plugins/OnThisDay.py @@ -25,7 +25,7 @@ Display all events on a particular day. from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_EVENT import gen.lib diff --git a/src/plugins/OwnerEditor.py b/src/plugins/OwnerEditor.py index 644c2b650..6264e4773 100644 --- a/src/plugins/OwnerEditor.py +++ b/src/plugins/OwnerEditor.py @@ -48,7 +48,8 @@ import GrampsCfg import GrampsDisplay from widgets import MonitoredEntry import ManagedWindow -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from TransUtils import sgettext as _ #------------------------------------------------------------------------- @@ -196,8 +197,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = OwnerEditor, options_class = OwnerEditorOptions, - modes = Tool.MODE_GUI, -# translated_name = _("Database Owner Information"), + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Edit Database Owner Information"), status = _("Beta"), author_name = "Zsolt Foldvari", diff --git a/src/plugins/PatchNames.py b/src/plugins/PatchNames.py index 5088914d8..15ee66e92 100644 --- a/src/plugins/PatchNames.py +++ b/src/plugins/PatchNames.py @@ -46,7 +46,8 @@ import gobject # #------------------------------------------------------------------------- import Utils -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from QuestionDialog import OkDialog import ManagedWindow import GrampsDisplay @@ -369,7 +370,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = PatchNames, options_class = PatchNamesOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Extract Information from Names"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/PlaceReport.py b/src/plugins/PlaceReport.py index 7c49ef30f..bf8f14f6e 100644 --- a/src/plugins/PlaceReport.py +++ b/src/plugins/PlaceReport.py @@ -34,10 +34,9 @@ from gettext import gettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import FilterOption, PlaceListOption -from ReportBase import Report, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, MenuReportOptions, CATEGORY_TEXT import BaseDoc import DateHandler import Sort @@ -397,7 +396,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = PlaceReport, options_class = PlaceOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Place Report"), status = _("Stable"), description = _("Produces a textual place report"), diff --git a/src/plugins/Query.py b/src/plugins/Query.py index cb2bf61e0..94518ae8f 100644 --- a/src/plugins/Query.py +++ b/src/plugins/Query.py @@ -25,7 +25,7 @@ Run a query on the tables from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager import Utils from ReportBase import CATEGORY_QR_MISC import DateHandler diff --git a/src/plugins/ReadGrdb.py b/src/plugins/ReadGrdb.py index f56a7d794..0e9b0fc84 100644 --- a/src/plugins/ReadGrdb.py +++ b/src/plugins/ReadGrdb.py @@ -51,7 +51,7 @@ from QuestionDialog import ErrorDialog from Errors import HandleError from BasicUtils import UpdateCallback from BasicUtils import name_displayer -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/ReadPkg.py b/src/plugins/ReadPkg.py index 7eb187c05..8c3193bb7 100644 --- a/src/plugins/ReadPkg.py +++ b/src/plugins/ReadPkg.py @@ -57,7 +57,7 @@ import const from GrampsDbUtils import gramps_db_reader_factory from QuestionDialog import ErrorDialog, WarningDialog import Utils -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/Rebuild.py b/src/plugins/Rebuild.py index 0c7b69c99..5de832aa2 100644 --- a/src/plugins/Rebuild.py +++ b/src/plugins/Rebuild.py @@ -49,7 +49,8 @@ log = logging.getLogger(".Rebuild") # GRAMPS modules # #------------------------------------------------------------------------- -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from QuestionDialog import OkDialog from BasicUtils import UpdateCallback @@ -115,7 +116,7 @@ pmgr.register_tool( category = Tool.TOOL_DBFIX, tool_class = Rebuild, options_class = RebuildOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Rebuild Secondary Indices"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/RebuildRefMap.py b/src/plugins/RebuildRefMap.py index 8d8f37786..05cf3f92f 100644 --- a/src/plugins/RebuildRefMap.py +++ b/src/plugins/RebuildRefMap.py @@ -51,7 +51,8 @@ log = logging.getLogger(".RebuildRefMap") # GRAMPS modules # #------------------------------------------------------------------------- -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from QuestionDialog import OkDialog from BasicUtils import UpdateCallback @@ -117,7 +118,7 @@ pmgr.register_tool( category = Tool.TOOL_DBFIX, tool_class = RebuildRefMap, options_class = RebuildRefMapOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Rebuild Reference Maps"), status= _("Stable"), author_name = "Alex Roitman", diff --git a/src/plugins/References.py b/src/plugins/References.py index fd252af36..92b62d5f5 100644 --- a/src/plugins/References.py +++ b/src/plugins/References.py @@ -28,7 +28,7 @@ from ReportBase import (CATEGORY_QR_SOURCE, CATEGORY_QR_PERSON, from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager # mention so that will be translated for below [_('Person'), _('Family'), _('Event'), _('Source'), diff --git a/src/plugins/RelCalc.py b/src/plugins/RelCalc.py index 10aba4c27..90878261d 100644 --- a/src/plugins/RelCalc.py +++ b/src/plugins/RelCalc.py @@ -49,7 +49,8 @@ import ManagedWindow from DisplayModels import PeopleModel from QuestionDialog import ErrorDialog -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager column_names = [ _('Name'), @@ -265,7 +266,7 @@ pmgr.register_tool( category = Tool.TOOL_UTILS, tool_class = RelCalc, options_class = RelCalcOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Relationship Calculator"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/RemoveUnused.py b/src/plugins/RemoveUnused.py index 219b6b129..31d06cb16 100644 --- a/src/plugins/RemoveUnused.py +++ b/src/plugins/RemoveUnused.py @@ -59,7 +59,8 @@ import Errors import ManagedWindow from DateHandler import displayer as _dd from BasicUtils import UpdateCallback -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager #------------------------------------------------------------------------- # @@ -491,7 +492,7 @@ pmgr.register_tool( category = Tool.TOOL_DBFIX, tool_class = RemoveUnused, options_class = CheckOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Remove Unused Objects"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/ReorderIds.py b/src/plugins/ReorderIds.py index 6378b3e56..ebd2fb2e4 100644 --- a/src/plugins/ReorderIds.py +++ b/src/plugins/ReorderIds.py @@ -41,7 +41,8 @@ from gettext import gettext as _ #------------------------------------------------------------------------ import Utils import gen.lib -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager _findint = re.compile('^[^\d]*(\d+)[^\d]*') @@ -234,7 +235,7 @@ pmgr.register_tool( category = Tool.TOOL_DBPROC, tool_class = ReorderIds, options_class = ReorderIdsOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Reorder GRAMPS IDs"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/Reporef.py b/src/plugins/Reporef.py index 1cb08e774..d7ace4aed 100755 --- a/src/plugins/Reporef.py +++ b/src/plugins/Reporef.py @@ -31,7 +31,7 @@ Display RepoRef for sources related to active repository from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_REPOSITORY import gen.lib diff --git a/src/plugins/SameSurnames.py b/src/plugins/SameSurnames.py index bfbfd0481..98e36c0c3 100644 --- a/src/plugins/SameSurnames.py +++ b/src/plugins/SameSurnames.py @@ -25,7 +25,7 @@ Display a people who have a person's same surname from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_PERSON from Filters.Rules import Rule from Filters import GenericFilterFactory diff --git a/src/plugins/SimpleBookTitle.py b/src/plugins/SimpleBookTitle.py index e8001eefd..909519e4e 100644 --- a/src/plugins/SimpleBookTitle.py +++ b/src/plugins/SimpleBookTitle.py @@ -33,10 +33,10 @@ from TransUtils import sgettext as _ # gramps modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import StringOption, MediaOption, NumberOption from Utils import media_path_full -from ReportBase import Report, MenuReportOptions, CATEGORY_TEXT, MODE_BKI +from ReportBase import Report, MenuReportOptions, CATEGORY_TEXT import BaseDoc #------------------------------------------------------------------------ @@ -184,7 +184,7 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = SimpleBookTitle, options_class = SimpleBookTitleOptions, - modes = MODE_BKI, + modes = PluginManager.REPORT_MODE_BKI, translated_name = _("Title Page"), status = _("Stable"), description = _("Produces a title page for book reports."), diff --git a/src/plugins/SoundGen.py b/src/plugins/SoundGen.py index 3ad09c176..447f81c85 100644 --- a/src/plugins/SoundGen.py +++ b/src/plugins/SoundGen.py @@ -46,7 +46,8 @@ import GrampsDisplay import ManagedWindow import AutoComp from TransUtils import sgettext as _ -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager #------------------------------------------------------------------------- # @@ -149,7 +150,7 @@ pmgr.register_tool( category = Tool.TOOL_UTILS, tool_class = SoundGen, options_class = SoundGenOptions, - modes = Tool.MODE_GUI, + modes = PluginManager.TOOL_MODE_GUI, translated_name = _("Generate SoundEx Codes"), status=(_("Stable")), author_name = "Donald N. Allingham", diff --git a/src/plugins/StatisticsChart.py b/src/plugins/StatisticsChart.py index ce84f7674..456126e73 100644 --- a/src/plugins/StatisticsChart.py +++ b/src/plugins/StatisticsChart.py @@ -44,11 +44,10 @@ from TransUtils import sgettext as _ from gen.lib import Person, FamilyRelType, EventType # gender and report type names import BaseDoc -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import BooleanOption, NumberOption, EnumeratedListOption, \ FilterOption, PersonOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_DRAW, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW import DateHandler from Utils import ProgressMeter @@ -897,7 +896,9 @@ pmgr.register_report( category = CATEGORY_DRAW, report_class = StatisticsChart, options_class = StatisticsChartOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Statistics Charts"), status = _("Stable"), author_name = "Eero Tamminen", diff --git a/src/plugins/Summary.py b/src/plugins/Summary.py index 4121c6538..60d408402 100644 --- a/src/plugins/Summary.py +++ b/src/plugins/Summary.py @@ -37,9 +37,8 @@ from gettext import gettext as _ # #------------------------------------------------------------------------ import gen.lib -from PluginUtils import PluginManager -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_TEXT, MODE_GUI, MODE_BKI, MODE_CLI +from gen.plug import PluginManager +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_TEXT import BaseDoc from Utils import media_path_full import DateHandler @@ -297,7 +296,9 @@ pmgr.register_report( category = CATEGORY_TEXT, report_class = SummaryReport, options_class = SummaryOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Database Summary Report"), status = _("Stable"), description = _("Provides a summary of the current database"), diff --git a/src/plugins/TestcaseGenerator.py b/src/plugins/TestcaseGenerator.py index 5a4731d64..af9c11fd1 100644 --- a/src/plugins/TestcaseGenerator.py +++ b/src/plugins/TestcaseGenerator.py @@ -45,7 +45,8 @@ import gtk # #------------------------------------------------------------------------- import gen.lib -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager import Utils import LdsUtils @@ -1396,7 +1397,7 @@ if __debug__: category = Tool.TOOL_DEBUG, tool_class = TestcaseGenerator, options_class = TestcaseGeneratorOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Generate Testcases for Persons and Families"), status = _("Beta"), author_name = "Martin Hawlisch", diff --git a/src/plugins/TimeLine.py b/src/plugins/TimeLine.py index 0021e42db..7d00d90f4 100644 --- a/src/plugins/TimeLine.py +++ b/src/plugins/TimeLine.py @@ -37,10 +37,9 @@ from TransUtils import sgettext as _ # GRAMPS modules # #------------------------------------------------------------------------ -from PluginUtils import PluginManager +from gen.plug import PluginManager from gen.plug.menu import PersonOption, FilterOption, EnumeratedListOption -from ReportBase import Report, ReportUtils, MenuReportOptions, \ - CATEGORY_DRAW, MODE_GUI, MODE_BKI, MODE_CLI +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW pt2cm = ReportUtils.pt2cm import BaseDoc import Sort @@ -460,7 +459,9 @@ pmgr.register_report( category = CATEGORY_DRAW, report_class = TimeLine, options_class = TimeLineOptions, - modes = MODE_GUI | MODE_BKI | MODE_CLI, + modes = PluginManager.REPORT_MODE_GUI | \ + PluginManager.REPORT_MODE_BKI | \ + PluginManager.REPORT_MODE_CLI, translated_name = _("Timeline Chart"), status = _("Stable"), author_name = "Donald N. Allingham", diff --git a/src/plugins/Verify.py b/src/plugins/Verify.py index 3b2e36c28..a9939ad50 100644 --- a/src/plugins/Verify.py +++ b/src/plugins/Verify.py @@ -56,7 +56,8 @@ import Utils import GrampsDisplay from ManagedWindow import ManagedWindow from BasicUtils import UpdateCallback -from PluginUtils import Tool, PluginManager +from PluginUtils import Tool +from gen.plug import PluginManager from TransUtils import sgettext as _ #------------------------------------------------------------------------- # @@ -1575,7 +1576,7 @@ pmgr.register_tool( category = Tool.TOOL_UTILS, tool_class = Verify, options_class = VerifyOptions, - modes = Tool.MODE_GUI | Tool.MODE_CLI, + modes = PluginManager.TOOL_MODE_GUI | PluginManager.TOOL_MODE_CLI, translated_name = _("Verify the Data"), status=(_("Stable")), author_name = "Alex Roitman", diff --git a/src/plugins/WebCal.py b/src/plugins/WebCal.py index 3f70f0fec..b8970786f 100644 --- a/src/plugins/WebCal.py +++ b/src/plugins/WebCal.py @@ -77,9 +77,8 @@ log = logging.getLogger(".WebPage") import gen.lib import const from GrampsCfg import get_researcher -from PluginUtils import PluginManager -from ReportBase import (Report, ReportUtils, MenuReportOptions, CATEGORY_WEB, - MODE_GUI) +from gen.plug import PluginManager +from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_WEB from gen.plug.menu import BooleanOption, NumberOption, StringOption, \ EnumeratedListOption, FilterOption, PersonOption, \ DestinationOption @@ -1701,7 +1700,7 @@ pmgr.register_report( category = CATEGORY_WEB, report_class = WebCalReport, options_class = WebCalOptions, - modes = MODE_GUI, + modes = PluginManager.REPORT_MODE_GUI, translated_name = _("Web Calendar"), status = _("Stable"), author_name = "Thom Sturgill", diff --git a/src/plugins/WriteCD.py b/src/plugins/WriteCD.py index 50e4b68e2..356bdb69b 100644 --- a/src/plugins/WriteCD.py +++ b/src/plugins/WriteCD.py @@ -76,7 +76,7 @@ except: from GrampsDbUtils import XmlWriter from Utils import media_path_full from QuestionDialog import ErrorDialog, MissingMediaDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager _title_string = _("Export to CD") diff --git a/src/plugins/WriteFtree.py b/src/plugins/WriteFtree.py index 1bf3126ac..6b3888bbd 100644 --- a/src/plugins/WriteFtree.py +++ b/src/plugins/WriteFtree.py @@ -56,7 +56,7 @@ import Utils from Filters import GenericFilter, Rules, build_filter_menu import Errors from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/WriteGeneWeb.py b/src/plugins/WriteGeneWeb.py index dd7dbbf60..0c8bc555a 100644 --- a/src/plugins/WriteGeneWeb.py +++ b/src/plugins/WriteGeneWeb.py @@ -57,7 +57,7 @@ from Filters import GenericFilter, Rules, build_filter_menu import Utils import Errors from QuestionDialog import ErrorDialog -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/WritePkg.py b/src/plugins/WritePkg.py index 558517614..7cc85053c 100644 --- a/src/plugins/WritePkg.py +++ b/src/plugins/WritePkg.py @@ -61,7 +61,7 @@ import gtk # #------------------------------------------------------------------------- from GrampsDbUtils import XmlWriter -from PluginUtils import PluginManager +from gen.plug import PluginManager import Utils #------------------------------------------------------------------------- diff --git a/src/plugins/all_events.py b/src/plugins/all_events.py index 9a195187c..67ec9ab93 100644 --- a/src/plugins/all_events.py +++ b/src/plugins/all_events.py @@ -25,7 +25,7 @@ Display a person's events, both personal and family from Simple import SimpleAccess, by_date, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY def run(database, document, person): diff --git a/src/plugins/all_relations.py b/src/plugins/all_relations.py index 434ac56b5..e6df9d7a5 100644 --- a/src/plugins/all_relations.py +++ b/src/plugins/all_relations.py @@ -30,7 +30,7 @@ Display a person's relations to the home person from Simple import SimpleAccess, SimpleDoc from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_PERSON # define the formatting string once as a constant. Since this is reused diff --git a/src/plugins/lineage.py b/src/plugins/lineage.py index 665bcaf00..1b02104b5 100644 --- a/src/plugins/lineage.py +++ b/src/plugins/lineage.py @@ -35,7 +35,7 @@ Display a person's father or mother lineage import gen.lib from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_PERSON __FMT = "%-30s\t%-12s\t%-12s" diff --git a/src/plugins/rel_cs.py b/src/plugins/rel_cs.py index 5a27a9351..fc2060091 100644 --- a/src/plugins/rel_cs.py +++ b/src/plugins/rel_cs.py @@ -32,7 +32,7 @@ import gen.lib import Relationship -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_da.py b/src/plugins/rel_da.py index 44a4ba323..a3d773cb0 100644 --- a/src/plugins/rel_da.py +++ b/src/plugins/rel_da.py @@ -34,7 +34,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_de.py b/src/plugins/rel_de.py index ee100c32e..8318c2c67 100644 --- a/src/plugins/rel_de.py +++ b/src/plugins/rel_de.py @@ -46,7 +46,7 @@ import re import gen.lib import Relationship -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_es.py b/src/plugins/rel_es.py index 9592fdbc5..9ad0e0cf5 100644 --- a/src/plugins/rel_es.py +++ b/src/plugins/rel_es.py @@ -33,7 +33,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_fi.py b/src/plugins/rel_fi.py index d95afa57a..f90d17b33 100644 --- a/src/plugins/rel_fi.py +++ b/src/plugins/rel_fi.py @@ -34,7 +34,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_fr.py b/src/plugins/rel_fr.py index aa3a0b4e0..66882c32e 100644 --- a/src/plugins/rel_fr.py +++ b/src/plugins/rel_fr.py @@ -30,7 +30,7 @@ import gen.lib import Relationship -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_hu.py b/src/plugins/rel_hu.py index c5bd343e2..5f38fb28b 100644 --- a/src/plugins/rel_hu.py +++ b/src/plugins/rel_hu.py @@ -33,7 +33,7 @@ import gen.lib import Relationship -from PluginUtils import PluginManager +from gen.plug import PluginManager import types #------------------------------------------------------------------------- diff --git a/src/plugins/rel_it.py b/src/plugins/rel_it.py index d86f2d7e5..ee8322aa0 100644 --- a/src/plugins/rel_it.py +++ b/src/plugins/rel_it.py @@ -38,7 +38,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_nl.py b/src/plugins/rel_nl.py index 6151c4cd2..f458721d9 100644 --- a/src/plugins/rel_nl.py +++ b/src/plugins/rel_nl.py @@ -30,7 +30,7 @@ import gen.lib import Relationship -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_no.py b/src/plugins/rel_no.py index 442a66945..600a52616 100644 --- a/src/plugins/rel_no.py +++ b/src/plugins/rel_no.py @@ -34,7 +34,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_pl.py b/src/plugins/rel_pl.py index 8e0bd81fb..c9b27e98a 100644 --- a/src/plugins/rel_pl.py +++ b/src/plugins/rel_pl.py @@ -39,7 +39,7 @@ import gen.lib import Relationship import types from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_pt.py b/src/plugins/rel_pt.py index d30c28b70..d0f26e5c1 100644 --- a/src/plugins/rel_pt.py +++ b/src/plugins/rel_pt.py @@ -35,7 +35,7 @@ import gen.lib import Relationship import types from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_ru.py b/src/plugins/rel_ru.py index 59d8dadd1..e41344f2d 100644 --- a/src/plugins/rel_ru.py +++ b/src/plugins/rel_ru.py @@ -33,7 +33,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_sk.py b/src/plugins/rel_sk.py index f9721af6f..6f474385f 100644 --- a/src/plugins/rel_sk.py +++ b/src/plugins/rel_sk.py @@ -32,7 +32,7 @@ import gen.lib import Relationship import types -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_sv.py b/src/plugins/rel_sv.py index 59a486f97..ea5e49b25 100644 --- a/src/plugins/rel_sv.py +++ b/src/plugins/rel_sv.py @@ -35,7 +35,7 @@ import gen.lib import Relationship -from PluginUtils import PluginManager +from gen.plug import PluginManager #------------------------------------------------------------------------- # diff --git a/src/plugins/siblings.py b/src/plugins/siblings.py index 305a6c6c1..17c9e47d4 100644 --- a/src/plugins/siblings.py +++ b/src/plugins/siblings.py @@ -25,7 +25,7 @@ Display a person's siblings in a report window from Simple import SimpleAccess, SimpleDoc, SimpleTable from gettext import gettext as _ -from PluginUtils import PluginManager +from gen.plug import PluginManager from ReportBase import CATEGORY_QR_PERSON def run(database, document, person):