diff --git a/ChangeLog b/ChangeLog index 11b3d3cc4..d15e56564 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-03-03 Don Allingham + * src/GrampsDb/Makefile.am: install correct files + * src/Config/Makefile.am: added + * src/MapView.py: fix image paths + * src/Mime/Makefile.am: added + * src/images/Makefile: added + * src/gramps_main.py: fix image paths + * src/Makefile.am: install correct files + 2006-03-03 Martin Hawlisch * src/Mime/__init__.py: Honour renamed files * src/Makefile.am: Images have been moved into subdir (makes "make" work again) diff --git a/configure.in b/configure.in index eda3a9a80..1354a8723 100644 --- a/configure.in +++ b/configure.in @@ -230,6 +230,8 @@ Makefile src/Makefile src/const.py src/RelLib/Makefile +src/Config/Makefile +src/Mime/Makefile src/ObjectSelector/Makefile src/GrampsLogger/Makefile src/TreeViews/Makefile @@ -238,6 +240,7 @@ src/docgen/Makefile src/plugins/Makefile src/dates/Makefile src/data/Makefile +src/images/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile diff --git a/src/Config/Makefile.am b/src/Config/Makefile.am new file mode 100644 index 000000000..67941c00b --- /dev/null +++ b/src/Config/Makefile.am @@ -0,0 +1,20 @@ +# This is the src/Config 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@/Config + +pkgdata_PYTHON = \ + __init__.py\ + _GrampsGconfKeys.py\ + _GrampsIniKeys.py + +pkgpyexecdir = @pkgpyexecdir@/Config +pkgpythondir = @pkgpythondir@/Config + +GRAMPS_PY_MODPATH = "../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgdata_PYTHON)); diff --git a/src/GrampsDb/Makefile.am b/src/GrampsDb/Makefile.am index c91003f8c..e2faa5809 100644 --- a/src/GrampsDb/Makefile.am +++ b/src/GrampsDb/Makefile.am @@ -7,6 +7,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/GrampsDb pkgdata_PYTHON = \ _GedcomInfo.py\ + _GedTokens.py\ _GrampsBSDDB.py\ _GrampsDbBase.py\ _GrampsDBCallback.py\ diff --git a/src/Makefile.am b/src/Makefile.am index 93e9f6322..c03ea94c4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # $Id$ # This is the src level Makefile for Gramps -SUBDIRS = docgen plugins dates data po GrampsDb RelLib ObjectSelector GrampsLogger TreeViews +SUBDIRS = docgen plugins dates data po GrampsDb RelLib ObjectSelector GrampsLogger TreeViews Config Mime images # For intl. support, how do we compile? MOSTLYCLEANFILES = diff --git a/src/MapView.py b/src/MapView.py index 65fed3b2d..b4373cfd2 100644 --- a/src/MapView.py +++ b/src/MapView.py @@ -29,6 +29,7 @@ from gettext import gettext as _ import gc import re import logging +import os log = logging.getLogger(".") @@ -48,6 +49,7 @@ import gtk.gdk #------------------------------------------------------------------------- import RelLib import PageView +import const glob_loc_data = [ # (Name, longitude, latitude) ("_Center", 0,0), @@ -396,9 +398,9 @@ class MapView(PageView.PageView): no = gtk.Image() # The large zoomable map self.zoom_map = ZoomMap( - gtk.gdk.pixbuf_new_from_file("images/land_shallow_topo_2048.jpg"), - gtk.gdk.pixbuf_new_from_file("images/bad.png"), - gtk.gdk.pixbuf_new_from_file("images/good.png")) + gtk.gdk.pixbuf_new_from_file(os.path.join(const.image_dir,"land_shallow_topo_2048.jpg")), + gtk.gdk.pixbuf_new_from_file(os.path.join(const.image_dir,"bad.png")), + gtk.gdk.pixbuf_new_from_file(os.path.join(const.image_dir,"good.png"))) self.zoom_map.set_size_request(300,300) hbox.pack_start( self.zoom_map, True, True, 0) @@ -408,7 +410,7 @@ class MapView(PageView.PageView): # The small guide map self.guide_map = GuideMap( - gtk.gdk.pixbuf_new_from_file("images/land_shallow_topo_350.jpg")) + gtk.gdk.pixbuf_new_from_file(os.path.join(const.image_dir,"land_shallow_topo_350.jpg"))) self.guide_map.set_size_request(128,64) vbox.pack_start( self.guide_map, False, True, 0) diff --git a/src/Mime/Makefile.am b/src/Mime/Makefile.am new file mode 100644 index 000000000..75247fb3e --- /dev/null +++ b/src/Mime/Makefile.am @@ -0,0 +1,20 @@ +# This is the src/Mime 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@/Mime + +pkgdata_PYTHON = \ + __init__.py\ + _GnomeMime.py\ + _PythonMime.py + +pkgpyexecdir = @pkgpyexecdir@/Mime +pkgpythondir = @pkgpythondir@/Mime + +GRAMPS_PY_MODPATH = "../" + +pycheck: + (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ + pychecker $(pkgdata_PYTHON)); diff --git a/src/gramps_main.py b/src/gramps_main.py index f0e783b55..456179d13 100644 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -60,31 +60,31 @@ import TipOfDay from Mime import mime_type_is_defined from QuestionDialog import ErrorDialog -iconpaths = [".",const.image_dir] +iconpaths = [const.image_dir,"."] def register_stock_icons (): import os items = [ - ('images/person.svg',('gramps-person', - 'Person',gtk.gdk.CONTROL_MASK,0,'')), - ('images/relation.svg',('gramps-family', - 'Relationships',gtk.gdk.CONTROL_MASK,0,'')), - ('images/flist.svg',('gramps-family-list', - 'Family List',gtk.gdk.CONTROL_MASK,0,'')), - ('images/media.svg',('gramps-media', - 'Media',gtk.gdk.CONTROL_MASK,0,'')), - ('images/ped24.png',('gramps-pedigree', - 'Pedigree',gtk.gdk.CONTROL_MASK,0,'')), - ('images/repos.png',('gramps-repository', - 'Repositories',gtk.gdk.CONTROL_MASK,0,'')), - ('images/sources.png',('gramps-source', - 'Sources',gtk.gdk.CONTROL_MASK,0,'')), - ('images/events.png',('gramps-event', - 'Events',gtk.gdk.CONTROL_MASK,0,'')), - ('images/place.png',('gramps-place', - 'Places',gtk.gdk.CONTROL_MASK,0,'')), - ('images/place.png',('gramps-map', - 'Map',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'person.svg'), + ('gramps-person','Person',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'relation.svg'), + ('gramps-family','Relationships',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'flist.svg'), + ('gramps-family-list','Family List',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'/media.svg'), + ('gramps-media','Media',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'ped24.png'), + ('gramps-pedigree','Pedigree',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'repos.png'), + ('gramps-repository','Repositories',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'sources.png'), + ('gramps-source','Sources',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'events.png'), + ('gramps-event','Events',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'place.png'), + ('gramps-place','Places',gtk.gdk.CONTROL_MASK,0,'')), + (os.path.join(const.image_dir,'place.png'), + ('gramps-map','Map',gtk.gdk.CONTROL_MASK,0,'')), ] # Register our stock items @@ -101,7 +101,7 @@ def register_stock_icons (): if os.path.isfile(icon_file): break else: - icon_file = os.path.join(iconpaths[0],'images/gramps.png') + icon_file = os.path.join(const.image_dir,'gramps.png') pixbuf = gtk.gdk.pixbuf_new_from_file (icon_file) pixbuf = pixbuf.add_alpha(True, chr(0xff), chr(0xff), chr(0xff)) diff --git a/src/images/Makefile.am b/src/images/Makefile.am new file mode 100644 index 000000000..4a0c1176d --- /dev/null +++ b/src/images/Makefile.am @@ -0,0 +1,159 @@ +# $Id: Makefile.am 6057 2006-03-03 12:49:39Z loshawlos $ + +# This is the src level Makefile for Gramps +SUBDIRS = + +# For intl. support, how do we compile? +MOSTLYCLEANFILES = +CLEANFILES = + +# What are the PYTHON scripts for this package that need to be handled? +# +# We only want optimized byte-compiled (.pyo) versions, no .pyc +# In principle, this is handled by PYCFILES and PYOFILES, but +# they don't seem to work so we edited the py-compile script instead + +gdirdir=$(prefix)/share/gramps + +docfiles = \ + RelLib.py \ + Date.py \ + DateParser.py \ + DateDisplay.py \ + GrampsDbBase.py + +gdir_PYTHON = \ + AddMedia.py\ + EditAddress.py\ + ansel_utf8.py\ + ArgHandler.py\ + Assistant.py\ + EditAttribute.py\ + AutoComp.py\ + BaseDoc.py\ + Bookmarks.py\ + ColumnOrder.py\ + const.py\ + DateDisplay.py\ + DateEdit.py\ + DateHandler.py\ + DateParser.py\ + Date.py\ + DdTargets.py\ + DisplayModels.py\ + DisplayState.py\ + DisplayTabs.py\ + DisplayTrace.py\ + EditEventRef.py\ + EditFamily.py\ + EditMedia.py\ + EditMediaRef.py\ + EditPerson.py\ + EditPlace.py\ + EditPrimary.py\ + EditRepository.py\ + EditSecondary.py\ + EditSource.py\ + EditSourceRef.py\ + Errors.py\ + EventEdit.py\ + EventView.py\ + Exporter.py\ + FamilyList.py\ + FamilyView.py\ + FontScale.py\ + GenericFilter.py\ + GrampsCfg.py\ + GrampsDisplay.py\ + GrampsLocale.py\ + gramps_main.py\ + gramps.py\ + GrampsWidgets.py\ + ImgManip.py\ + latin_ansel.py\ + ListModel.py\ + EditLocation.py\ + MapView.py\ + MediaView.py\ + MergeData.py\ + MergePeople.py\ + NameDisplay.py\ + NameEdit.py\ + Navigation.py\ + Options.py\ + PageView.py\ + PaperMenu.py\ + PedView.py\ + PeopleModel.py\ + PersonView.py\ + PlaceView.py\ + PluginMgr.py\ + Plugins.py\ + QuestionDialog.py\ + RecentFiles.py\ + Relationship.py\ + RelImage.py\ + ReportOptions.py\ + Report.py\ + ReportUtils.py\ + RepositoryView.py\ + ScratchPad.py\ + SelectChild.py\ + SelectEvent.py\ + SelectObject.py\ + SelectPerson.py\ + Sort.py\ + soundex.py\ + Sources.py\ + SourceView.py\ + Spell.py\ + SpreadSheetDoc.py\ + StartupDialog.py\ + StyleEditor.py\ + SubstKeywords.py\ + TipOfDay.py\ + Tool.py\ + ToolTips.py\ + TransUtils.py\ + TreeTips.py\ + EditUrl.py\ + Utils.py\ + ViewManager.py\ + WindowUtils.py\ + Witness.py + +# Could use GNU make's ':=' syntax for nice wildcard use. +# If not using GNU make, then list all files individually +# The latter is more portable and POSIX-friendly :) +GLADEFILES = \ + gramps.glade\ + edit_person.glade\ + mergedata.glade\ + plugins.glade\ + rule.glade\ + scratchpad.glade + +# Other stuff that we need to install +dist_pkgdata_DATA = $(GLADEFILES) + +# In principle the following rule slightly violates the automake/autoconf +# spirit of keeping each subdirectory as a separate entity unto itself. +# But, since the template depends on everything from here, we allow this +# one exception. +# Build po/template.po. +.PHONY: trans +trans: + ./build_po + +pycheck: + for d in $(SUBDIRS) ; do \ + (cd $$d; make pycheck); \ + done; + pychecker $(gdir_PYTHON) + +docs: + epydoc -o doc --url http://gramps.sourceforge.net --name GRAMPS --html $(docfiles) + epydoc --pdf $(docfiles) + +cmdplug: + ./build_cmdplug