From 8c8982b3954e5bebe369a0f765d92be12e035023 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 31 May 2006 00:57:54 +0000 Subject: [PATCH] 2006-05-30 Alex Roitman * POTFILES.in: Change files due to module split. svn: r6821 --- gramps2/po/ChangeLog | 3 +++ gramps2/po/POTFILES.in | 26 ++++++++++++++----- gramps2/src/Makefile.am | 1 + gramps2/src/PluginUtils/Makefile.am | 5 ---- gramps2/src/PluginUtils/_Plugins.py | 2 +- .../Report => ReportBase}/Makefile.am | 6 ++--- .../_BareReportDialog.py | 0 .../_BookFormatComboBox.py | 0 .../Report => ReportBase}/_BookReport.py | 0 .../_CommandLineReport.py | 0 .../Report => ReportBase}/_Constants.py | 0 .../_DrawFormatComboBox.py | 0 .../_DrawReportDialog.py | 0 .../Report => ReportBase}/_FileEntry.py | 0 .../Report => ReportBase}/_PaperMenu.py | 0 .../Report => ReportBase}/_PrintTools.py | 0 .../Report => ReportBase}/_Report.py | 0 .../Report => ReportBase}/_ReportDialog.py | 0 .../Report => ReportBase}/_ReportOptions.py | 0 .../Report => ReportBase}/_ReportUtils.py | 0 .../Report => ReportBase}/_StyleComboBox.py | 0 .../Report => ReportBase}/_StyleEditor.py | 0 .../Report => ReportBase}/_TemplateParser.py | 0 .../_TextFormatComboBox.py | 0 .../_TextReportDialog.py | 0 .../Report => ReportBase}/__init__.py | 6 ++--- 26 files changed, 31 insertions(+), 18 deletions(-) rename gramps2/src/{PluginUtils/Report => ReportBase}/Makefile.am (83%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_BareReportDialog.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_BookFormatComboBox.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_BookReport.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_CommandLineReport.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_Constants.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_DrawFormatComboBox.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_DrawReportDialog.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_FileEntry.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_PaperMenu.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_PrintTools.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_Report.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_ReportDialog.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_ReportOptions.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_ReportUtils.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_StyleComboBox.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_StyleEditor.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_TemplateParser.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_TextFormatComboBox.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/_TextReportDialog.py (100%) rename gramps2/src/{PluginUtils/Report => ReportBase}/__init__.py (100%) diff --git a/gramps2/po/ChangeLog b/gramps2/po/ChangeLog index 3512a924c..4bed246d4 100644 --- a/gramps2/po/ChangeLog +++ b/gramps2/po/ChangeLog @@ -1,3 +1,6 @@ +2006-05-30 Alex Roitman + * POTFILES.in: Change files due to module split. + 2006-05-28 Alex Roitman * gramps.pot: Update. diff --git a/gramps2/po/POTFILES.in b/gramps2/po/POTFILES.in index 4a42f035c..fa8d5a83c 100644 --- a/gramps2/po/POTFILES.in +++ b/gramps2/po/POTFILES.in @@ -229,7 +229,6 @@ src/plugins/AncestorChart2.py src/plugins/AncestorChart.py src/plugins/AncestorReport.py src/plugins/Ancestors.py -src/plugins/BookReport.py src/plugins/Calendar.py src/plugins/ChangeNames.py src/plugins/ChangeTypes.py @@ -288,15 +287,30 @@ src/plugins/WriteGeneWeb.py src/plugins/WritePkg.py src/PluginUtils/__init__.py src/PluginUtils/_Options.py -src/PluginUtils/_PaperMenu.py src/PluginUtils/_PluginMgr.py src/PluginUtils/_Plugins.py -src/PluginUtils/_ReportOptions.py -src/PluginUtils/_Report.py -src/PluginUtils/_ReportUtils.py -src/PluginUtils/_StyleEditor.py src/PluginUtils/_Tool.py src/PluginUtils/_PluginStatus.py +src/ReportBase/_BareReportDialog.py +src/ReportBase/_BookFormatComboBox.py +src/ReportBase/_BookReport.py +src/ReportBase/_CommandLineReport.py +src/ReportBase/_Constants.py +src/ReportBase/_DrawFormatComboBox.py +src/ReportBase/_DrawReportDialog.py +src/ReportBase/_FileEntry.py +src/ReportBase/__init__.py +src/ReportBase/_PaperMenu.py +src/ReportBase/_PrintTools.py +src/ReportBase/_ReportDialog.py +src/ReportBase/_ReportOptions.py +src/ReportBase/_Report.py +src/ReportBase/_ReportUtils.py +src/ReportBase/_StyleComboBox.py +src/ReportBase/_StyleEditor.py +src/ReportBase/_TemplateParser.py +src/ReportBase/_TextFormatComboBox.py +src/ReportBase/_TextReportDialog.py src/RelLib/_AddressBase.py src/RelLib/_Address.py src/RelLib/_AttributeBase.py diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index 9975de3bb..934d3cb0e 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -20,6 +20,7 @@ SUBDIRS = \ data \ DateHandler \ PluginUtils \ + ReportBase \ glade \ docgen \ images \ diff --git a/gramps2/src/PluginUtils/Makefile.am b/gramps2/src/PluginUtils/Makefile.am index e214369e0..bc3cd290e 100644 --- a/gramps2/src/PluginUtils/Makefile.am +++ b/gramps2/src/PluginUtils/Makefile.am @@ -8,13 +8,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/PluginUtils pkgdata_PYTHON = \ __init__.py\ _Options.py\ - _ReportOptions.py\ - _Report.py\ - _ReportUtils.py\ _Tool.py\ - _StyleEditor.py\ _PluginMgr.py\ - _PaperMenu.py\ _PluginStatus.py\ _Plugins.py diff --git a/gramps2/src/PluginUtils/_Plugins.py b/gramps2/src/PluginUtils/_Plugins.py index bf55578ab..02f7113d0 100644 --- a/gramps2/src/PluginUtils/_Plugins.py +++ b/gramps2/src/PluginUtils/_Plugins.py @@ -57,7 +57,7 @@ import const import Utils import Config import Errors -from Report import report, standalone_categories +from ReportBase import report, standalone_categories import _Tool import _PluginMgr import _PluginStatus diff --git a/gramps2/src/PluginUtils/Report/Makefile.am b/gramps2/src/ReportBase/Makefile.am similarity index 83% rename from gramps2/src/PluginUtils/Report/Makefile.am rename to gramps2/src/ReportBase/Makefile.am index ac4b536f0..1957fee9e 100644 --- a/gramps2/src/PluginUtils/Report/Makefile.am +++ b/gramps2/src/ReportBase/Makefile.am @@ -1,6 +1,6 @@ # This is the src/Report level Makefile for Gramps -pkgdatadir = $(datadir)/@PACKAGE@/Report +pkgdatadir = $(datadir)/@PACKAGE@/ReportBase pkgdata_PYTHON = \ _BareReportDialog.py\ @@ -24,8 +24,8 @@ pkgdata_PYTHON = \ _TextFormatComboBox.py\ _TextReportDialog.py -pkgpyexecdir = @pkgpyexecdir@/Report -pkgpythondir = @pkgpythondir@/Report +pkgpyexecdir = @pkgpyexecdir@/ReportBase +pkgpythondir = @pkgpythondir@/ReportBase # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo diff --git a/gramps2/src/PluginUtils/Report/_BareReportDialog.py b/gramps2/src/ReportBase/_BareReportDialog.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_BareReportDialog.py rename to gramps2/src/ReportBase/_BareReportDialog.py diff --git a/gramps2/src/PluginUtils/Report/_BookFormatComboBox.py b/gramps2/src/ReportBase/_BookFormatComboBox.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_BookFormatComboBox.py rename to gramps2/src/ReportBase/_BookFormatComboBox.py diff --git a/gramps2/src/PluginUtils/Report/_BookReport.py b/gramps2/src/ReportBase/_BookReport.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_BookReport.py rename to gramps2/src/ReportBase/_BookReport.py diff --git a/gramps2/src/PluginUtils/Report/_CommandLineReport.py b/gramps2/src/ReportBase/_CommandLineReport.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_CommandLineReport.py rename to gramps2/src/ReportBase/_CommandLineReport.py diff --git a/gramps2/src/PluginUtils/Report/_Constants.py b/gramps2/src/ReportBase/_Constants.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_Constants.py rename to gramps2/src/ReportBase/_Constants.py diff --git a/gramps2/src/PluginUtils/Report/_DrawFormatComboBox.py b/gramps2/src/ReportBase/_DrawFormatComboBox.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_DrawFormatComboBox.py rename to gramps2/src/ReportBase/_DrawFormatComboBox.py diff --git a/gramps2/src/PluginUtils/Report/_DrawReportDialog.py b/gramps2/src/ReportBase/_DrawReportDialog.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_DrawReportDialog.py rename to gramps2/src/ReportBase/_DrawReportDialog.py diff --git a/gramps2/src/PluginUtils/Report/_FileEntry.py b/gramps2/src/ReportBase/_FileEntry.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_FileEntry.py rename to gramps2/src/ReportBase/_FileEntry.py diff --git a/gramps2/src/PluginUtils/Report/_PaperMenu.py b/gramps2/src/ReportBase/_PaperMenu.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_PaperMenu.py rename to gramps2/src/ReportBase/_PaperMenu.py diff --git a/gramps2/src/PluginUtils/Report/_PrintTools.py b/gramps2/src/ReportBase/_PrintTools.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_PrintTools.py rename to gramps2/src/ReportBase/_PrintTools.py diff --git a/gramps2/src/PluginUtils/Report/_Report.py b/gramps2/src/ReportBase/_Report.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_Report.py rename to gramps2/src/ReportBase/_Report.py diff --git a/gramps2/src/PluginUtils/Report/_ReportDialog.py b/gramps2/src/ReportBase/_ReportDialog.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_ReportDialog.py rename to gramps2/src/ReportBase/_ReportDialog.py diff --git a/gramps2/src/PluginUtils/Report/_ReportOptions.py b/gramps2/src/ReportBase/_ReportOptions.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_ReportOptions.py rename to gramps2/src/ReportBase/_ReportOptions.py diff --git a/gramps2/src/PluginUtils/Report/_ReportUtils.py b/gramps2/src/ReportBase/_ReportUtils.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_ReportUtils.py rename to gramps2/src/ReportBase/_ReportUtils.py diff --git a/gramps2/src/PluginUtils/Report/_StyleComboBox.py b/gramps2/src/ReportBase/_StyleComboBox.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_StyleComboBox.py rename to gramps2/src/ReportBase/_StyleComboBox.py diff --git a/gramps2/src/PluginUtils/Report/_StyleEditor.py b/gramps2/src/ReportBase/_StyleEditor.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_StyleEditor.py rename to gramps2/src/ReportBase/_StyleEditor.py diff --git a/gramps2/src/PluginUtils/Report/_TemplateParser.py b/gramps2/src/ReportBase/_TemplateParser.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_TemplateParser.py rename to gramps2/src/ReportBase/_TemplateParser.py diff --git a/gramps2/src/PluginUtils/Report/_TextFormatComboBox.py b/gramps2/src/ReportBase/_TextFormatComboBox.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_TextFormatComboBox.py rename to gramps2/src/ReportBase/_TextFormatComboBox.py diff --git a/gramps2/src/PluginUtils/Report/_TextReportDialog.py b/gramps2/src/ReportBase/_TextReportDialog.py similarity index 100% rename from gramps2/src/PluginUtils/Report/_TextReportDialog.py rename to gramps2/src/ReportBase/_TextReportDialog.py diff --git a/gramps2/src/PluginUtils/Report/__init__.py b/gramps2/src/ReportBase/__init__.py similarity index 100% rename from gramps2/src/PluginUtils/Report/__init__.py rename to gramps2/src/ReportBase/__init__.py index afbe91f0b..648570324 100644 --- a/gramps2/src/PluginUtils/Report/__init__.py +++ b/gramps2/src/ReportBase/__init__.py @@ -29,10 +29,10 @@ __version__ = "$Revision$" from _Constants import * from _TemplateParser import _template_map -import _ReportOptions as ReportOptions -import _ReportUtils as ReportUtils - from _Report import Report from _ReportDialog import report from _DrawReportDialog import DrawReportDialog from _TextReportDialog import TextReportDialog + +import _ReportOptions as ReportOptions +import _ReportUtils as ReportUtils