From 38876a32a5725493992378171c36da2d5c91137d Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Mon, 15 Jun 2009 19:02:15 +0000 Subject: [PATCH] GEPS 008: File Organization svn: r12667 --- configure.in | 21 ++-- po/POTFILES.in | 255 ++++++++++++++++++++------------------ src/cli/Makefile.am | 24 ++++ src/cli/__init__.py | 24 ++++ src/gui/Makefile.am | 25 ++++ src/gui/__init__.py | 27 ++++ src/gui/views/Makefile.am | 24 ++++ src/gui/views/__init__.py | 24 ++++ 8 files changed, 297 insertions(+), 127 deletions(-) create mode 100644 src/cli/Makefile.am create mode 100644 src/cli/__init__.py create mode 100644 src/gui/Makefile.am create mode 100644 src/gui/__init__.py create mode 100644 src/gui/views/Makefile.am create mode 100644 src/gui/views/__init__.py diff --git a/configure.in b/configure.in index 97cd68685..cb716256d 100644 --- a/configure.in +++ b/configure.in @@ -115,6 +115,18 @@ Makefile gramps.sh src/const.py src/Makefile +src/cli/Makefile +src/gen/Makefile +src/gen/proxy/Makefile +src/gen/db/Makefile +src/gen/lib/Makefile +src/gen/utils/Makefile +src/gen/plug/Makefile +src/gen/plug/docbackend/Makefile +src/gen/plug/docgen/Makefile +src/gen/plug/menu/Makefile +src/gui/Makefile +src/gui/views/Makefile src/Config/Makefile src/FilterEditor/Makefile src/Mime/Makefile @@ -159,15 +171,6 @@ src/plugins/tool/Makefile src/plugins/webreport/Makefile src/DateHandler/Makefile src/widgets/Makefile -src/gen/Makefile -src/gen/proxy/Makefile -src/gen/db/Makefile -src/gen/lib/Makefile -src/gen/utils/Makefile -src/gen/plug/Makefile -src/gen/plug/docbackend/Makefile -src/gen/plug/docgen/Makefile -src/gen/plug/menu/Makefile src/data/Makefile src/glade/Makefile src/images/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index b338302e4..aef0705d0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -49,6 +49,143 @@ src/Utils.py src/UndoHistory.py src/ViewManager.py +# cli +src/cli/__init__.py + +# gen API +src/gen/__init__.py + +# gen utils API +src/gen/utils/dbutils.py +src/gen/utils/progressmon.py +src/gen/utils/__init__.py +src/gen/utils/dbutils.py +src/gen/utils/callback.py +src/gen/utils/longop.py +src/gen/utils/progressmon.py + +# gen proxy API +src/gen/proxy/living.py +src/gen/proxy/private.py +src/gen/proxy/proxybase.py +src/gen/proxy/dbbase.py +src/gen/proxy/filter.py +src/gen/proxy/__init__.py + +# gen db API +src/gen/db/base.py +src/gen/db/dbdir.py +src/gen/db/cursor.py +src/gen/db/exceptions.py +src/gen/db/dbconst.py +src/gen/db/__init__.py +src/gen/db/iterator.py + +# gen lib API +src/gen/lib/witness.py +src/gen/lib/__init__.py +src/gen/lib/reporef.py +src/gen/lib/url.py +src/gen/lib/personref.py +src/gen/lib/urltype.py +src/gen/lib/note.py +src/gen/lib/repo.py +src/gen/lib/notetype.py +src/gen/lib/repotype.py +src/gen/lib/location.py +src/gen/lib/datebase.py +src/gen/lib/privacybase.py +src/gen/lib/calendar.py +src/gen/lib/mediaref.py +src/gen/lib/attrtype.py +src/gen/lib/srcnote.py +src/gen/lib/primaryobj.py +src/gen/lib/childref.py +src/gen/lib/ldsordbase.py +src/gen/lib/childreftype.py +src/gen/lib/markertype.py +src/gen/lib/genderstats.py +src/gen/lib/place.py +src/gen/lib/srcref.py +src/gen/lib/address.py +src/gen/lib/src.py +src/gen/lib/srcmediatype.py +src/gen/lib/grampstype.py +src/gen/lib/urlbase.py +src/gen/lib/notebase.py +src/gen/lib/locationbase.py +src/gen/lib/attribute.py +src/gen/lib/attrbase.py +src/gen/lib/baseobj.py +src/gen/lib/eventroletype.py +src/gen/lib/person.py +src/gen/lib/refbase.py +src/gen/lib/mediaobj.py +src/gen/lib/mediabase.py +src/gen/lib/date.py +src/gen/lib/eventref.py +src/gen/lib/privsrcnote.py +src/gen/lib/placebase.py +src/gen/lib/name.py +src/gen/lib/addressbase.py +src/gen/lib/family.py +src/gen/lib/event.py +src/gen/lib/nametype.py +src/gen/lib/secondaryobj.py +src/gen/lib/srcbase.py +src/gen/lib/eventtype.py +src/gen/lib/researcher.py +src/gen/lib/familyreltype.py +src/gen/lib/ldsord.py + +# gen plugin API +src/gen/plug/__init__.py +src/gen/plug/_docgenplugin.py +src/gen/plug/_export.py +src/gen/plug/_import.py +src/gen/plug/_manager.py +src/gen/plug/_plugin.py +src/gen/plug/menu/_boolean.py +src/gen/plug/menu/_color.py +src/gen/plug/menu/_destination.py +src/gen/plug/menu/_enumeratedlist.py +src/gen/plug/menu/_family.py +src/gen/plug/menu/_filter.py +src/gen/plug/menu/__init__.py +src/gen/plug/menu/_media.py +src/gen/plug/menu/_menu.py +src/gen/plug/menu/_note.py +src/gen/plug/menu/_number.py +src/gen/plug/menu/_option.py +src/gen/plug/menu/_personlist.py +src/gen/plug/menu/_person.py +src/gen/plug/menu/_placelist.py +src/gen/plug/menu/_string.py +src/gen/plug/menu/_style.py +src/gen/plug/menu/_surnamecolor.py +src/gen/plug/menu/_text.py +src/gen/plug/docgen/__init__.py +src/gen/plug/docgen/basedoc.py +src/gen/plug/docgen/drawdoc.py +src/gen/plug/docgen/fontscale.py +src/gen/plug/docgen/fontstyle.py +src/gen/plug/docgen/graphdoc.py +src/gen/plug/docgen/graphicstyle.py +src/gen/plug/docgen/paperstyle.py +src/gen/plug/docgen/paragraphstyle.py +src/gen/plug/docgen/stylesheet.py +src/gen/plug/docgen/tablestyle.py +src/gen/plug/docgen/textdoc.py +src/gen/plug/docbackend/__init__.py +src/gen/plug/docbackend/cairobackend.py +src/gen/plug/docbackend/docbackend.py + +# gui - GUI code +src/gui/__init__.py + +# gui/views - the GUI views package +src/gui/views/__init__.py + # Simple API src/Simple/_SimpleTable.py @@ -391,48 +528,6 @@ src/PluginUtils/_Options.py src/PluginUtils/_PluginDialogs.py src/PluginUtils/_PluginWindows.py src/PluginUtils/_Tool.py -src/gen/utils/dbutils.py -src/gen/utils/progressmon.py -src/gen/plug/__init__.py -src/gen/plug/_docgenplugin.py -src/gen/plug/_export.py -src/gen/plug/_import.py -src/gen/plug/_manager.py -src/gen/plug/_plugin.py -src/gen/plug/menu/_boolean.py -src/gen/plug/menu/_color.py -src/gen/plug/menu/_destination.py -src/gen/plug/menu/_enumeratedlist.py -src/gen/plug/menu/_family.py -src/gen/plug/menu/_filter.py -src/gen/plug/menu/__init__.py -src/gen/plug/menu/_media.py -src/gen/plug/menu/_menu.py -src/gen/plug/menu/_note.py -src/gen/plug/menu/_number.py -src/gen/plug/menu/_option.py -src/gen/plug/menu/_personlist.py -src/gen/plug/menu/_person.py -src/gen/plug/menu/_placelist.py -src/gen/plug/menu/_string.py -src/gen/plug/menu/_style.py -src/gen/plug/menu/_surnamecolor.py -src/gen/plug/menu/_text.py -src/gen/plug/docgen/__init__.py -src/gen/plug/docgen/basedoc.py -src/gen/plug/docgen/drawdoc.py -src/gen/plug/docgen/fontscale.py -src/gen/plug/docgen/fontstyle.py -src/gen/plug/docgen/graphdoc.py -src/gen/plug/docgen/graphicstyle.py -src/gen/plug/docgen/paperstyle.py -src/gen/plug/docgen/paragraphstyle.py -src/gen/plug/docgen/stylesheet.py -src/gen/plug/docgen/tablestyle.py -src/gen/plug/docgen/textdoc.py -src/gen/plug/docbackend/__init__.py -src/gen/plug/docbackend/cairobackend.py -src/gen/plug/docbackend/docbackend.py # ReportBase package src/ReportBase/_CommandLineReport.py @@ -452,82 +547,6 @@ src/ReportBase/_StyleComboBox.py src/ReportBase/_StyleEditor.py src/ReportBase/_TextReportDialog.py -# gen -src/gen/proxy/living.py -src/gen/proxy/private.py -src/gen/proxy/proxybase.py -src/gen/proxy/dbbase.py -src/gen/proxy/filter.py -src/gen/proxy/__init__.py -src/gen/db/base.py -src/gen/db/dbdir.py -src/gen/db/cursor.py -src/gen/db/exceptions.py -src/gen/db/dbconst.py -src/gen/db/__init__.py -src/gen/db/iterator.py -src/gen/lib/witness.py -src/gen/lib/__init__.py -src/gen/lib/reporef.py -src/gen/lib/url.py -src/gen/lib/personref.py -src/gen/lib/urltype.py -src/gen/lib/note.py -src/gen/lib/repo.py -src/gen/lib/notetype.py -src/gen/lib/repotype.py -src/gen/lib/location.py -src/gen/lib/datebase.py -src/gen/lib/privacybase.py -src/gen/lib/calendar.py -src/gen/lib/mediaref.py -src/gen/lib/attrtype.py -src/gen/lib/srcnote.py -src/gen/lib/primaryobj.py -src/gen/lib/childref.py -src/gen/lib/ldsordbase.py -src/gen/lib/childreftype.py -src/gen/lib/markertype.py -src/gen/lib/genderstats.py -src/gen/lib/place.py -src/gen/lib/srcref.py -src/gen/lib/address.py -src/gen/lib/src.py -src/gen/lib/srcmediatype.py -src/gen/lib/grampstype.py -src/gen/lib/urlbase.py -src/gen/lib/notebase.py -src/gen/lib/locationbase.py -src/gen/lib/attribute.py -src/gen/lib/attrbase.py -src/gen/lib/baseobj.py -src/gen/lib/eventroletype.py -src/gen/lib/person.py -src/gen/lib/refbase.py -src/gen/lib/mediaobj.py -src/gen/lib/mediabase.py -src/gen/lib/date.py -src/gen/lib/eventref.py -src/gen/lib/privsrcnote.py -src/gen/lib/placebase.py -src/gen/lib/name.py -src/gen/lib/addressbase.py -src/gen/lib/family.py -src/gen/lib/event.py -src/gen/lib/nametype.py -src/gen/lib/secondaryobj.py -src/gen/lib/srcbase.py -src/gen/lib/eventtype.py -src/gen/lib/researcher.py -src/gen/lib/familyreltype.py -src/gen/lib/ldsord.py -src/gen/__init__.py -src/gen/utils/__init__.py -src/gen/utils/dbutils.py -src/gen/utils/callback.py -src/gen/utils/longop.py -src/gen/utils/progressmon.py - # Filters package src/Filters/_FilterComboBox.py src/Filters/_FilterList.py diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am new file mode 100644 index 000000000..70d6a4013 --- /dev/null +++ b/src/cli/Makefile.am @@ -0,0 +1,24 @@ +# This is the src/DataViews 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@/cli + +pkgdata_PYTHON = \ + __init__.py + +pkgpyexecdir = @pkgpyexecdir@/cli +pkgpythondir = @pkgpythondir@/cli + +# Clean up all the byte-compiled files +MOSTLYCLEANFILES = *pyc *pyo + +GRAMPS_PY_MODPATH = "../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgdata_PYTHON)); + +pylint: + PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgdata_PYTHON) > pylint.out diff --git a/src/cli/__init__.py b/src/cli/__init__.py new file mode 100644 index 000000000..f4f4e672b --- /dev/null +++ b/src/cli/__init__.py @@ -0,0 +1,24 @@ +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2009 Benny Malengier +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id: __init__.py 11943 2009-02-09 23:37:40Z acraphae $ + +""" +Package init for the cli package. +""" diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am new file mode 100644 index 000000000..5b899f28c --- /dev/null +++ b/src/gui/Makefile.am @@ -0,0 +1,25 @@ +# This is the src/RelLib 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 + +SUBDIRS = \ + views + +pkgdatadir = $(datadir)/@PACKAGE@/gui + +pkgdata_PYTHON = \ + __init__.py + +pkgpyexecdir = @pkgpyexecdir@/gui +pkgpythondir = @pkgpythondir@/gui + + +# 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/gui/__init__.py b/src/gui/__init__.py new file mode 100644 index 000000000..59361d5ab --- /dev/null +++ b/src/gui/__init__.py @@ -0,0 +1,27 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2009 Benny Malengier +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id: __init__.py 11943 2009-02-09 23:37:40Z acraphae $ + +""" +Package init for the gui package. +""" + +__all__ = [ "views" ] diff --git a/src/gui/views/Makefile.am b/src/gui/views/Makefile.am new file mode 100644 index 000000000..820dbdf54 --- /dev/null +++ b/src/gui/views/Makefile.am @@ -0,0 +1,24 @@ +# This is the src/DataViews 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@/views + +pkgdata_PYTHON = \ + __init__.py + +pkgpyexecdir = @pkgpyexecdir@/views +pkgpythondir = @pkgpythondir@/views + +# Clean up all the byte-compiled files +MOSTLYCLEANFILES = *pyc *pyo + +GRAMPS_PY_MODPATH = "../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgdata_PYTHON)); + +pylint: + PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgdata_PYTHON) > pylint.out diff --git a/src/gui/views/__init__.py b/src/gui/views/__init__.py new file mode 100644 index 000000000..2406cbaf8 --- /dev/null +++ b/src/gui/views/__init__.py @@ -0,0 +1,24 @@ +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2009 Benny Malengier +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id: __init__.py 11943 2009-02-09 23:37:40Z acraphae $ + +""" +Package init for the views package. +"""