From 3f95d8ddb74bea6f8dd28f8ee0560b0e5d333520 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Sun, 18 Jan 2009 04:59:14 +0000 Subject: [PATCH] Plugins Restructure: Move docgen plugins into plugins/docgen. svn: r11652 --- po/POTFILES.in | 18 +++++---- src/ViewManager.py | 14 ++----- src/const.py.in | 4 +- src/docgen/Makefile.am | 29 ++++---------- src/{ => plugins}/docgen/AsciiDoc.py | 0 src/{ => plugins}/docgen/CairoDoc.py | 0 src/{ => plugins}/docgen/GtkPrint.py | 0 src/{ => plugins}/docgen/HtmlDoc.py | 0 src/{ => plugins}/docgen/LaTeXDoc.py | 0 src/plugins/docgen/Makefile.am | 39 +++++++++++++++++++ src/{ => plugins}/docgen/ODFDoc.py | 0 src/{ => plugins}/docgen/PSDrawDoc.py | 0 src/{ => plugins}/docgen/PdfDoc.py | 0 src/{ => plugins}/docgen/RTFDoc.py | 0 src/{ => plugins}/docgen/SvgDrawDoc.py | 0 .../docgen/gtkprintpreview.glade | 0 16 files changed, 61 insertions(+), 43 deletions(-) rename src/{ => plugins}/docgen/AsciiDoc.py (100%) rename src/{ => plugins}/docgen/CairoDoc.py (100%) rename src/{ => plugins}/docgen/GtkPrint.py (100%) rename src/{ => plugins}/docgen/HtmlDoc.py (100%) rename src/{ => plugins}/docgen/LaTeXDoc.py (100%) create mode 100644 src/plugins/docgen/Makefile.am rename src/{ => plugins}/docgen/ODFDoc.py (100%) rename src/{ => plugins}/docgen/PSDrawDoc.py (100%) rename src/{ => plugins}/docgen/PdfDoc.py (100%) rename src/{ => plugins}/docgen/RTFDoc.py (100%) rename src/{ => plugins}/docgen/SvgDrawDoc.py (100%) rename src/{ => plugins}/docgen/gtkprintpreview.glade (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8331ffc4e..6f2b31903 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -103,17 +103,9 @@ src/DateHandler/_Date_sv.py src/DateHandler/__init__.py # docgen directory -src/docgen/AsciiDoc.py -src/docgen/GtkPrint.py -src/docgen/HtmlDoc.py -src/docgen/LaTeXDoc.py src/docgen/ODSDoc.py -src/docgen/ODFDoc.py src/docgen/ODSTab.py -src/docgen/PSDrawDoc.py -src/docgen/RTFDoc.py src/docgen/SpreadSheetDoc.py -src/docgen/SvgDrawDoc.py src/docgen/TextBufDoc.py # DisplayModels package @@ -244,6 +236,16 @@ src/plugins/ImportXml.py src/plugins/Records.py src/plugins/WebCal.py +# plugins/docgen directory +src/plugins/docgen/AsciiDoc.py +src/plugins/docgen/GtkPrint.py +src/plugins/docgen/HtmlDoc.py +src/plugins/docgen/LaTeXDoc.py +src/plugins/docgen/ODFDoc.py +src/plugins/docgen/PSDrawDoc.py +src/plugins/docgen/RTFDoc.py +src/plugins/docgen/SvgDrawDoc.py + # plugins/drawreport directory src/plugins/drawreport/AncestorTree.py src/plugins/drawreport/DescendTree.py diff --git a/src/ViewManager.py b/src/ViewManager.py index be06ea982..e21a620b7 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -596,21 +596,15 @@ class ViewManager: def __do_load_plugins(self): """ - Loads the plugins at initialization time. We load the document - generators and the plugins. The plugin status window is opened - on an error if the user has requested. + Loads the plugins at initialization time. The plugin status window is + opened on an error if the user has requested. """ - # load document generators - self.uistate.status_text(_('Loading document formats...')) - error = self.__pmgr.load_plugins(const.DOCGEN_DIR) - error |= self.__pmgr.load_plugins(const.USER_DOCGEN) - # load plugins self.uistate.status_text(_('Loading plugins...')) - error |= self.__pmgr.load_plugins(const.PLUGINS_DIR) + error = self.__pmgr.load_plugins(const.PLUGINS_DIR) error |= self.__pmgr.load_plugins(const.USER_PLUGINS) - # get to ssee if we need to open the plugin status window + # get to see if we need to open the plugin status window if error and Config.get(Config.POP_PLUGIN_STATUS): self.__plugin_status() diff --git a/src/const.py.in b/src/const.py.in index f42b2e021..a03ce76f6 100644 --- a/src/const.py.in +++ b/src/const.py.in @@ -111,8 +111,7 @@ TOOL_OPTIONS = os.path.join(HOME_DIR, "tool_options.xml") ENV_DIR = os.path.join(HOME_DIR, "env") TEMP_DIR = os.path.join(HOME_DIR, "temp") -THUMB_DIR = os.path.join(HOME_DIR, "thumb") -USER_DOCGEN = os.path.join(HOME_DIR, "docgen") +THUMB_DIR = os.path.join(HOME_DIR, "thumb") USER_PLUGINS = os.path.join(HOME_DIR, "plugins") USER_TEMPLATES = os.path.join(HOME_DIR, "templates") # dirs checked/made for each Gramps session @@ -137,7 +136,6 @@ RULE_GLADE = os.path.join(GLADE_DIR, "rule.glade") PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") -DOCGEN_DIR = os.path.join(ROOT_DIR, "docgen") DATA_DIR = os.path.join(ROOT_DIR, "data") SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml") TEMPLATE_DIR = os.path.join(DATA_DIR, "templates") diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am index 2a8bc1fb0..61c60be9a 100644 --- a/src/docgen/Makefile.am +++ b/src/docgen/Makefile.am @@ -5,28 +5,13 @@ docgendir=$(prefix)/share/gramps/docgen docgen_PYTHON = \ - __init__.py\ - AsciiDoc.py\ - CairoDoc.py\ - CSVTab.py\ - HtmlDoc.py\ - LaTeXDoc.py\ - ODFDoc.py\ - ODSDoc.py\ - ODSTab.py\ - SpreadSheetDoc.py\ - TabbedDoc.py\ - PdfDoc.py\ - PSDrawDoc.py\ - RTFDoc.py\ - SvgDrawDoc.py\ - TextBufDoc.py \ - GtkPrint.py - -docgen_DATA = \ - gtkprintpreview.glade - -dist_docgen_DATA = $(docgen_DATA) + __init__.py \ + CSVTab.py \ + ODSDoc.py \ + ODSTab.py \ + SpreadSheetDoc.py \ + TabbedDoc.py \ + TextBufDoc.py # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo diff --git a/src/docgen/AsciiDoc.py b/src/plugins/docgen/AsciiDoc.py similarity index 100% rename from src/docgen/AsciiDoc.py rename to src/plugins/docgen/AsciiDoc.py diff --git a/src/docgen/CairoDoc.py b/src/plugins/docgen/CairoDoc.py similarity index 100% rename from src/docgen/CairoDoc.py rename to src/plugins/docgen/CairoDoc.py diff --git a/src/docgen/GtkPrint.py b/src/plugins/docgen/GtkPrint.py similarity index 100% rename from src/docgen/GtkPrint.py rename to src/plugins/docgen/GtkPrint.py diff --git a/src/docgen/HtmlDoc.py b/src/plugins/docgen/HtmlDoc.py similarity index 100% rename from src/docgen/HtmlDoc.py rename to src/plugins/docgen/HtmlDoc.py diff --git a/src/docgen/LaTeXDoc.py b/src/plugins/docgen/LaTeXDoc.py similarity index 100% rename from src/docgen/LaTeXDoc.py rename to src/plugins/docgen/LaTeXDoc.py diff --git a/src/plugins/docgen/Makefile.am b/src/plugins/docgen/Makefile.am new file mode 100644 index 000000000..afec13f3a --- /dev/null +++ b/src/plugins/docgen/Makefile.am @@ -0,0 +1,39 @@ +# This is the src/plugins/docgen level Makefile for Gramps +# We could use GNU make's ':=' syntax for nice wildcard use, +# but that is not necessarily portable. +# If not using GNU make, then list all .py files individually + +pkgdatadir = $(datadir)/@PACKAGE@/plugins/docgen + +pkgdata_PYTHON = \ + AsciiDoc.py \ + CairoDoc.py \ + GtkPrint.py \ + HtmlDoc.py \ + LaTeXDoc.py \ + ODFDoc.py \ + PdfDoc.py \ + PSDrawDoc.py \ + RTFDoc.py \ + SvgDrawDoc.py + +pkgpyexecdir = @pkgpyexecdir@/plugins/docgen +pkgpythondir = @pkgpythondir@/plugins/docgen + +GLADEFILES = \ + gtkprintpreview.glade + +GRAPHICS = + +DATAFILES = + +dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES) + +# Clean up all the byte-compiled files +MOSTLYCLEANFILES = *pyc *pyo + +GRAMPS_PY_MODPATH = "../../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgdata_PYTHON)); diff --git a/src/docgen/ODFDoc.py b/src/plugins/docgen/ODFDoc.py similarity index 100% rename from src/docgen/ODFDoc.py rename to src/plugins/docgen/ODFDoc.py diff --git a/src/docgen/PSDrawDoc.py b/src/plugins/docgen/PSDrawDoc.py similarity index 100% rename from src/docgen/PSDrawDoc.py rename to src/plugins/docgen/PSDrawDoc.py diff --git a/src/docgen/PdfDoc.py b/src/plugins/docgen/PdfDoc.py similarity index 100% rename from src/docgen/PdfDoc.py rename to src/plugins/docgen/PdfDoc.py diff --git a/src/docgen/RTFDoc.py b/src/plugins/docgen/RTFDoc.py similarity index 100% rename from src/docgen/RTFDoc.py rename to src/plugins/docgen/RTFDoc.py diff --git a/src/docgen/SvgDrawDoc.py b/src/plugins/docgen/SvgDrawDoc.py similarity index 100% rename from src/docgen/SvgDrawDoc.py rename to src/plugins/docgen/SvgDrawDoc.py diff --git a/src/docgen/gtkprintpreview.glade b/src/plugins/docgen/gtkprintpreview.glade similarity index 100% rename from src/docgen/gtkprintpreview.glade rename to src/plugins/docgen/gtkprintpreview.glade