installation fixes

svn: r6068

configure.in

@@ -237,6 +237,7 @@ src/GrampsLogger/Makefile
 src/TreeViews/Makefile
 src/GrampsDb/Makefile
 src/docgen/Makefile
+src/Models/Makefile
 src/Editors/Makefile
 src/plugins/Makefile
 src/dates/Makefile

src/Editors/Makefile.am

@@ -0,0 +1,35 @@
+# This is the src/Editors 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@/Editors
+
+pkgdata_PYTHON = \
+	__init__.py\
+	_EditAddress.py \
+	_EditAttribute.py \
+	_EditEvent.py \
+	_EditEventRef.py \
+	_EditFamily.py \
+	_EditLocation.py \
+	_EditMedia.py \
+	_EditMediaRef.py \
+	_EditName.py \
+	_EditPerson.py \
+	_EditPlace.py \
+	_EditPrimary.py \
+	_EditRepository.py \
+	_EditSecondary.py \
+	_EditSource.py \
+	_EditSourceRef.py \
+	_EditUrl.py
+
+pkgpyexecdir = @pkgpyexecdir@/Editors
+pkgpythondir = @pkgpythondir@/Editors
+
+GRAMPS_PY_MODPATH = "../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));

src/Editors/_EditAddress.py

@@ -45,7 +45,7 @@ import gtk.glade
 #
 #-------------------------------------------------------------------------
 import const
-import EditSecondary
+from _EditSecondary import EditSecondary
 
 from DisplayTabs import *
 from GrampsWidgets import *
@@ -55,7 +55,7 @@ from GrampsWidgets import *
 # EditAddress class
 #
 #-------------------------------------------------------------------------
-class EditAddress(EditSecondary.EditSecondary):
+class EditAddress(EditSecondary):
     """
     Displays a dialog that allows the user to edit an address.
     """
@@ -66,7 +66,7 @@ class EditAddress(EditSecondary.EditSecondary):
         parent - The class that called the Address editor.
         addr - The address that is to be edited
         """
-        EditSecondary.EditSecondary.__init__(self, dbstate, uistate, track, addr)
+        EditSecondary.__init__(self, dbstate, uistate, track, addr)
 
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile, "addr_edit","gramps")

src/Editors/_EditAttribute.py

@@ -51,7 +51,7 @@ import const
 import Utils
 import RelLib
 import GrampsDisplay
-import EditSecondary
+from _EditSecondary import EditSecondary
 
 from QuestionDialog import WarningDialog
 from DisplayTabs import *
@@ -62,7 +62,7 @@ from GrampsWidgets import *
 # EditAttribute class
 #
 #-------------------------------------------------------------------------
-class EditAttribute(EditSecondary.EditSecondary):
+class EditAttribute(EditSecondary):
     """
     Displays a dialog that allows the user to edit an attribute.
     """
@@ -76,8 +76,7 @@ class EditAttribute(EditSecondary.EditSecondary):
         list - list of options for the pop down menu
         """
         self.alist = data_list
-        EditSecondary.EditSecondary.__init__(self, state, uistate, track,
+        EditSecondary.__init__(self, state, uistate, track, attrib, callback)
-                                             attrib, callback)
         
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile, "attr_edit","gramps")

src/Editors/_EditEvent.py

@@ -50,7 +50,7 @@ import Utils
 import AutoComp
 import RelLib
 import GrampsDisplay
-import EditPrimary
+from _EditPrimary import EditPrimary
 
 from QuestionDialog import WarningDialog, ErrorDialog
 from DisplayTabs import *
@@ -71,12 +71,12 @@ for event_type in Utils.family_events.keys():
 # EditEvent class
 #
 #-------------------------------------------------------------------------
-class EditEvent(EditPrimary.EditPrimary):
+class EditEvent(EditPrimary):
 
     def __init__(self,event,dbstate,uistate,track=[],callback=None):
 
-        EditPrimary.EditPrimary.__init__(self, dbstate, uistate, track,
+        EditPrimary.__init__(self, dbstate, uistate, track,
-                                         event, dbstate.db.get_event_from_handle)
+                             event, dbstate.db.get_event_from_handle)
 
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile, "event_edit","gramps")

src/Editors/_EditFamily.py

@@ -64,12 +64,12 @@ import gtk.glade
 import const
 import Utils
 import NameDisplay
-import EditPrimary
 import Spell
 import GrampsDisplay
 import RelLib
 import ReportUtils
 import AutoComp
+from _EditPrimary import EditPrimary
 
 from DdTargets import DdTargets
 from DisplayTabs import *
@@ -211,11 +211,11 @@ class ChildEmbedList(EmbeddedList):
 # EditFamily
 #
 #-------------------------------------------------------------------------
-class EditFamily(EditPrimary.EditPrimary):
+class EditFamily(EditPrimary):
 
     def __init__(self,dbstate,uistate,track,family):
-        EditPrimary.EditPrimary.__init__(self, dbstate, uistate, track,
+        EditPrimary.__init__(self, dbstate, uistate, track,
-                                         family, dbstate.db.get_family_from_handle)
+                             family, dbstate.db.get_family_from_handle)
 
 
     def _local_init(self):

src/Editors/_EditLocation.py

@@ -35,7 +35,7 @@ import gtk.glade
 #-------------------------------------------------------------------------
 import const
 import Utils
-import EditSecondary
+from _EditSecondary import EditSecondary
 
 from GrampsWidgets import *
 from gettext import gettext as _
@@ -45,11 +45,11 @@ from gettext import gettext as _
 # LocationEditor class
 #
 #-------------------------------------------------------------------------
-class EditLocation(EditSecondary.EditSecondary):
+class EditLocation(EditSecondary):
 
     def __init__(self,dbstate,uistate,track,location,callback):
-        EditSecondary.EditSecondary.__init__(self, dbstate, uistate, track,
+        EditSecondary.__init__(self, dbstate, uistate, track,
-                                             location, callback)
+                               location, callback)
 
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile, "loc_edit","gramps")

src/Editors/_EditMedia.py

@@ -47,7 +47,7 @@ import Utils
 import RelLib
 import Mime
 import ImgManip
-import EditPrimary
+from _EditPrimary import EditPrimary
 
 from GrampsWidgets import *
 from QuestionDialog import ErrorDialog
@@ -58,12 +58,12 @@ from DisplayTabs import *
 # EditMedia
 #
 #-------------------------------------------------------------------------
-class EditMedia(EditPrimary.EditPrimary):
+class EditMedia(EditPrimary):
 
     def __init__(self,state,uistate,track,obj):
 
-        EditPrimary.EditPrimary.__init__(self, state, uistate, track, obj,
+        EditPrimary.__init__(self, state, uistate, track, obj,
-                                         state.db.get_object_from_handle)
+                             state.db.get_object_from_handle)
 
     def _local_init(self):
         assert(self.obj)

src/Editors/_EditName.py

@@ -43,7 +43,7 @@ import const
 import Utils
 import RelLib
 import NameDisplay
-import EditSecondary
+from _EditSecondary import EditSecondary
 
 from DisplayTabs import *
 from GrampsWidgets import *
@@ -53,12 +53,12 @@ from GrampsWidgets import *
 # EditName class
 #
 #-------------------------------------------------------------------------
-class EditName(EditSecondary.EditSecondary):
+class EditName(EditSecondary):
 
     def __init__(self, dbstate, uistate, track, name, callback):
 
-        EditSecondary.EditSecondary.__init__(self, dbstate, uistate,
+        EditSecondary.__init__(self, dbstate, uistate,
-                                             track, name, callback)
+                               track, name, callback)
 
     def _local_init(self):
         

src/Editors/_EditPerson.py

@@ -51,11 +51,10 @@ import Mime
 import RelLib
 import DateHandler
 import NameDisplay
-import EditName
 import DisplayState
 import GrampsDisplay
 import GrampsWidgets
-import EditPrimary
+from _EditPrimary import EditPrimary
 from DisplayTabs import *
 
 from QuestionDialog import WarningDialog, ErrorDialog, QuestionDialog2
@@ -80,16 +79,15 @@ _use_patronymic = set(["ru","RU","ru_RU","koi8r","ru_koi8r","russian","Russian"]
 # EditPerson class
 #
 #-------------------------------------------------------------------------
-class EditPerson(EditPrimary.EditPrimary):
+class EditPerson(EditPrimary):
 
     use_patronymic = locale.getlocale(locale.LC_TIME)[0] in _use_patronymic
 
     def __init__(self,state,uistate,track,person,callback=None):
         """Creates an edit window.  Associates a person with the window."""
 
-        EditPrimary.EditPrimary.__init__(self, state, uistate, track,
+        EditPrimary.__init__(self, state, uistate, track, person,
-                                         person, state.db.get_person_from_handle,
+                             state.db.get_person_from_handle, callback)
-                                         callback)
 
     def _local_init(self):
         self.pname = self.obj.get_primary_name()

src/Editors/_EditPlace.py

@@ -48,7 +48,7 @@ import gtk.glade
 import const
 import Utils
 import RelLib
-import EditPrimary
+from _EditPrimary import EditPrimary
 
 from DisplayTabs import *
 from GrampsWidgets import *
@@ -58,12 +58,11 @@ from GrampsWidgets import *
 # EditPlace
 #
 #-------------------------------------------------------------------------
-class EditPlace(EditPrimary.EditPrimary):
+class EditPlace(EditPrimary):
 
     def __init__(self,dbstate,uistate,track,place,callback=None):
-        EditPrimary.EditPrimary.__init__(
+        EditPrimary.__init__(self, dbstate, uistate, track, place,
-            self, dbstate, uistate, track, place,
+                             dbstate.db.get_place_from_handle, callback)
-            dbstate.db.get_place_from_handle, callback)
 
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile,"place_editor","gramps")

src/Editors/_EditRepository.py

@@ -46,14 +46,14 @@ import RelLib
 
 from GrampsWidgets import *
 from DisplayTabs import *
-import EditPrimary
+from _EditPrimary import EditPrimary
 
-class EditRepository(EditPrimary.EditPrimary):
+class EditRepository(EditPrimary):
 
     def __init__(self,dbstate,uistate,track,repository):
 
-        EditPrimary.EditPrimary.__init__(self, dbstate, uistate, track,
+        EditPrimary.__init__(self, dbstate, uistate, track,
-                                         repository, dbstate.db.get_repository_from_handle)
+                             repository, dbstate.db.get_repository_from_handle)
 
     def _local_init(self):
         self.glade = gtk.glade.XML(const.gladeFile,"repository_editor","gramps")

src/Editors/_EditSource.py

@@ -49,7 +49,7 @@ import RelLib
 import NameDisplay
 import Spell
 import GrampsDisplay
-import EditPrimary
+from _EditPrimary import EditPrimary
 
 from DisplayTabs import *
 from WindowUtils import GladeIf
@@ -60,13 +60,12 @@ from GrampsWidgets import *
 # Constants
 #
 #-------------------------------------------------------------------------
-class EditSource(EditPrimary.EditPrimary):
+class EditSource(EditPrimary):
 
     def __init__(self,dbstate,uistate,track,source):
 
-        EditPrimary.EditPrimary.__init__(
+        EditPrimary.__init__(self, dbstate, uistate, track,
-            self, dbstate, uistate, track,
+                             source, dbstate.db.get_source_from_handle)
-            source, dbstate.db.get_source_from_handle)
 
     def _local_init(self):
 

src/Editors/_EditUrl.py

@@ -43,7 +43,7 @@ import gtk.glade
 import const
 import Utils
 import RelLib
-import EditSecondary
+from _EditSecondary import EditSecondary
 
 from GrampsWidgets import *
 
@@ -52,12 +52,12 @@ from GrampsWidgets import *
 # EditUrl class
 #
 #-------------------------------------------------------------------------
-class EditUrl(EditSecondary.EditSecondary):
+class EditUrl(EditSecondary):
 
     def __init__(self, dbstate, uistate, track, name, url, callback):
 
-        EditSecondary.EditSecondary.__init__(self, dbstate, uistate, track,
+        EditSecondary.__init__(self, dbstate, uistate, track,
-                                             url, callback)
+                               url, callback)
 
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile, "url_edit","gramps")

src/Makefile.am

@@ -14,6 +14,7 @@ SUBDIRS = \
 	TreeViews \
 	Config \
 	Mime \
+	Models \
 	images \
 	Editors
 
@@ -38,11 +39,9 @@ docfiles = \
 
 gdir_PYTHON = \
 	AddMedia.py\
-	EditAddress.py\
 	ansel_utf8.py\
 	ArgHandler.py\
 	Assistant.py\
-	EditAttribute.py\
 	AutoComp.py\
 	BaseDoc.py\
 	Bookmarks.py\
@@ -58,19 +57,7 @@ gdir_PYTHON = \
 	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\
-	EditEvent.py\
 	EventView.py\
 	Exporter.py\
 	FamilyList.py\
@@ -86,13 +73,11 @@ gdir_PYTHON = \
 	ImgManip.py\
 	latin_ansel.py\
 	ListModel.py\
-	EditLocation.py\
 	MapView.py\
 	MediaView.py\
 	MergeData.py\
 	MergePeople.py\
 	NameDisplay.py\
-	EditName.py\
 	Navigation.py\
 	Options.py\
 	PageView.py\
@@ -130,7 +115,6 @@ gdir_PYTHON = \
 	ToolTips.py\
 	TransUtils.py\
 	TreeTips.py\
-	EditUrl.py\
 	Utils.py\
 	ViewManager.py\
 	WindowUtils.py\

src/ObjectSelector/_PersonFrame.py

@@ -28,7 +28,6 @@ import gtk
 import gobject
 
 from RelLib import Person
-from Editors import EditPerson
 from NameDisplay import displayer
 display_name = displayer.display
 
@@ -105,6 +104,8 @@ class PersonFrame(ObjectFrameBase):
                 self.emit('add-object',o)
 
     def new_object(self,button):
+        from Editors import EditPerson
+        
         person = Person()
         EditPerson(self._dbstate,self._uistate,[],person)