diff --git a/ChangeLog b/ChangeLog index 8cbdb50d1..7e749548e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ * src/DataViews/_FamilyList.py: moved to DataViews directory * src/DataViews/_PlaceView.py: moved to DataViews directory * src/DataViews/_PersonView.py: moved to DataViews directory - * src/DataViews/_PedView.py: moved to DataViews directory + * src/DataViews/_PedigreeView.py: moved to DataViews directory * src/DataViews/_RepositoryView.py: moved to DataViews directory 2006-03-04 Martin Hawlisch diff --git a/configure.in b/configure.in index 74eeff7a8..fc632f8b4 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_PREREQ(2.57) AC_INIT(gramps, 2.1.0, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) -RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +RELEASE=0.SVN$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') dnl RELEASE=1 VERSIONSTRING=$VERSION diff --git a/src/DataViews/Makefile.am b/src/DataViews/Makefile.am index 03554461a..9bec0cecd 100644 --- a/src/DataViews/Makefile.am +++ b/src/DataViews/Makefile.am @@ -7,16 +7,16 @@ pkgdatadir = $(datadir)/@PACKAGE@/DataViews pkgdata_PYTHON = \ __init__.py\ - PersonView.py\ - FamilyView.py\ - FamilyList.py\ - PedView.py\ - EventView.py\ - SourceView.py\ - PlaceView.py\ - MediaView.py\ - MapView.py\ - RepositoryView.py + _PersonView.py\ + _FamilyView.py\ + _FamilyList.py\ + _PedigreeView.py\ + _EventView.py\ + _SourceView.py\ + _PlaceView.py\ + _MediaView.py\ + _MapView.py\ + _RepositoryView.py pkgpyexecdir = @pkgpyexecdir@/DataViews pkgpythondir = @pkgpythondir@/DataViews diff --git a/src/DataViews/EventView.py b/src/DataViews/_EventView.py similarity index 100% rename from src/DataViews/EventView.py rename to src/DataViews/_EventView.py diff --git a/src/DataViews/FamilyList.py b/src/DataViews/_FamilyList.py similarity index 100% rename from src/DataViews/FamilyList.py rename to src/DataViews/_FamilyList.py diff --git a/src/DataViews/FamilyView.py b/src/DataViews/_FamilyView.py similarity index 100% rename from src/DataViews/FamilyView.py rename to src/DataViews/_FamilyView.py diff --git a/src/DataViews/MapView.py b/src/DataViews/_MapView.py similarity index 100% rename from src/DataViews/MapView.py rename to src/DataViews/_MapView.py diff --git a/src/DataViews/MediaView.py b/src/DataViews/_MediaView.py similarity index 100% rename from src/DataViews/MediaView.py rename to src/DataViews/_MediaView.py diff --git a/src/DataViews/PedView.py b/src/DataViews/_PedigreeView.py similarity index 99% rename from src/DataViews/PedView.py rename to src/DataViews/_PedigreeView.py index 2f049c903..da3854848 100644 --- a/src/DataViews/PedView.py +++ b/src/DataViews/_PedigreeView.py @@ -379,7 +379,7 @@ class FormattingHelper: # PedigreeView # #------------------------------------------------------------------------- -class PedView(PageView.PersonNavView): +class PedigreeView(PageView.PersonNavView): def __init__(self,dbstate,uistate): PageView.PersonNavView.__init__(self,'Pedigree View',dbstate,uistate) diff --git a/src/DataViews/PersonView.py b/src/DataViews/_PersonView.py similarity index 100% rename from src/DataViews/PersonView.py rename to src/DataViews/_PersonView.py diff --git a/src/DataViews/PlaceView.py b/src/DataViews/_PlaceView.py similarity index 100% rename from src/DataViews/PlaceView.py rename to src/DataViews/_PlaceView.py diff --git a/src/DataViews/RepositoryView.py b/src/DataViews/_RepositoryView.py similarity index 100% rename from src/DataViews/RepositoryView.py rename to src/DataViews/_RepositoryView.py diff --git a/src/DataViews/SourceView.py b/src/DataViews/_SourceView.py similarity index 100% rename from src/DataViews/SourceView.py rename to src/DataViews/_SourceView.py diff --git a/src/DataViews/__init__.py b/src/DataViews/__init__.py index 6677d64a3..d7bfaf6a4 100644 --- a/src/DataViews/__init__.py +++ b/src/DataViews/__init__.py @@ -19,18 +19,18 @@ # $Id: __init__.py 6067 2006-03-04 05:24:16Z dallingham $ -from PersonView import PersonView -from FamilyView import FamilyView -from FamilyList import FamilyListView -from PedView import PedView -from EventView import EventView -from SourceView import SourceView -from PlaceView import PlaceView -from MediaView import MediaView -from MapView import MapView -from RepositoryView import RepositoryView +from _PersonView import PersonView +from _FamilyView import FamilyView +from _FamilyList import FamilyListView +from _PedigreeView import PedigreeView +from _EventView import EventView +from _SourceView import SourceView +from _PlaceView import PlaceView +from _MediaView import MediaView +from _MapView import MapView +from _RepositoryView import RepositoryView def get_views(): - return [PersonView, FamilyView, FamilyListView, PedView, + return [PersonView, FamilyView, FamilyListView, PedigreeView, EventView, SourceView, PlaceView, MediaView, MapView, RepositoryView] diff --git a/src/images/Makefile.am b/src/images/Makefile.am index 331c5af87..4466a2357 100644 --- a/src/images/Makefile.am +++ b/src/images/Makefile.am @@ -7,9 +7,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/images dist_pkgdata_DATA = \ bad.png\ caution.png\ - edit.png\ edit_sm.png\ - events24.png\ events.png\ flist.svg\ good.png\ @@ -18,7 +16,6 @@ dist_pkgdata_DATA = \ land_shallow_topo_350.jpg\ locked.png\ logo.png\ - media.png\ media.svg\ ped24.png\ person.svg\ diff --git a/src/images/edit.png b/src/images/edit.png deleted file mode 100644 index a8c78bdc2..000000000 Binary files a/src/images/edit.png and /dev/null differ diff --git a/src/images/events24.png b/src/images/events24.png deleted file mode 100644 index be9c1726e..000000000 Binary files a/src/images/events24.png and /dev/null differ diff --git a/src/images/media.png b/src/images/media.png deleted file mode 100644 index d2a34cddd..000000000 Binary files a/src/images/media.png and /dev/null differ diff --git a/src/images/splash.jpg b/src/images/splash.jpg index 86d524b23..8106d70eb 100644 Binary files a/src/images/splash.jpg and b/src/images/splash.jpg differ