Update for 0.8.0-rc3

svn: r1102

gramps/configure.in

@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl May need to run automake && aclocal first
 AC_INIT(src/gramps.py)
 AM_INIT_AUTOMAKE(gramps, 0.8.0)
-RELEASE=rc2
+RELEASE=rc3
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"

gramps/gramps.spec

@@ -1,5 +1,5 @@
 %define ver      0.8.0
-%define rel      rc1
+%define rel      rc3
 %define prefix   /usr
 
 Summary: Genealogical Research and Analysis Management Programming System.

gramps/src/EditPerson.py

@@ -781,7 +781,6 @@ class EditPerson:
         idval = self.gid.get_text()
 
         changed = 0
-        print self.lists_changed
         name = self.person.getPrimaryName()
 
         if self.person.getId() != idval:

gramps/src/Makefile.in

@@ -114,7 +114,7 @@ SUBDIRS = docgen filters plugins data po
 
 # For intl. support, how do we compile?
 CFLAGS = -fPIC -shared -O @CFLAGS@ @CPPFLAGS@ -I@includedir@
-LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@ 
+LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
 CLEANFILES = ${INTLLIBS}
 MOSTLYCLEANFILES = 
 

gramps/src/config.glade

@@ -55,6 +55,8 @@ Preferences dialog under the Settings menu.</text>
       <background_color>225,219,197</background_color>
       <logo_background_color>225,220,197</logo_background_color>
       <textbox_color>255,255,255</textbox_color>
+      <logo_image>gramps.xpm</logo_image>
+      <watermark_image>splash.jpg</watermark_image>
     </widget>
 
     <widget>
@@ -64,6 +66,7 @@ Preferences dialog under the Settings menu.</text>
       <title_color>125,104,74</title_color>
       <background_color>225,220,197</background_color>
       <logo_background_color>225,220,197</logo_background_color>
+      <logo_image>gramps.xpm</logo_image>
 
       <widget>
 	<class>GtkVBox</class>
@@ -572,6 +575,7 @@ files, you may leave it blank.</label>
       <title_color>125,104,74</title_color>
       <background_color>225,220,197</background_color>
       <logo_background_color>225,220,197</logo_background_color>
+      <logo_image>gramps.xpm</logo_image>
 
       <widget>
 	<class>GtkVBox</class>
@@ -704,6 +708,7 @@ numerical dates</label>
       <title_color>125,104,74</title_color>
       <background_color>225,220,197</background_color>
       <logo_background_color>225,220,197</logo_background_color>
+      <logo_image>gramps.xpm</logo_image>
 
       <widget>
 	<class>GtkVBox</class>
@@ -793,6 +798,7 @@ more of these alternate calendars, enable alternate calendar support.</label>
       <title_color>125,104,74</title_color>
       <background_color>225,220,197</background_color>
       <logo_background_color>225,220,197</logo_background_color>
+      <logo_image>gramps.xpm</logo_image>
 
       <widget>
 	<class>GtkVBox</class>
@@ -898,6 +904,8 @@ Please enjoy using GRAMPS.</text>
       <textbox_color>255,255,255</textbox_color>
       <text_color>0,0,0</text_color>
       <title_color>125,104,74</title_color>
+      <logo_image>gramps.xpm</logo_image>
+      <watermark_image>splash.jpg</watermark_image>
     </widget>
   </widget>
 </widget>

gramps/src/const.py

@@ -92,7 +92,7 @@ startup        = 1
 #
 #-------------------------------------------------------------------------
 progName     = "GRAMPS"
-version      = "0.8.0-rc1"
+version      = "0.8.0-rc3"
 copyright    = "© 2001-2002 Donald N. Allingham"
 authors      = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"]
 comments     = _("GRAMPS (Genealogical Research and Analysis "

gramps/src/plugins/ReadGedcom.py

@@ -416,7 +416,9 @@ class GedcomParser:
                 if self.indi_count % 10 == 0:
                     self.update(self.people_obj,str(self.indi_count))
                 self.indi_count = self.indi_count + 1
-                self.person = self.db.findPerson(matches[1],self.pmap)
+                id = matches[1]
+                id = id[1:-1]
+                self.person = self.find_or_create_person(id)
                 self.added[self.person.getId()] = self.person
                 self.parse_individual()
                 self.db.buildPersonDisplay(self.person.getId())
@@ -445,6 +447,20 @@ class GedcomParser:
             else:
 	        self.barf(1)
 
+    def find_or_create_person(self,id):
+        
+        if self.pmap.has_key(id):
+            person = self.db.findPersonNoMap(self.pmap[id])
+        elif self.db.getPersonMap().has_key(id):
+            person = Person()
+            self.pmap[id] = self.db.addPerson(person)
+        else:
+            person = Person()
+            person.setId(id)
+            self.db.addPersonAs(person)
+            self.pmap[id] = id
+        return person
+
     def parse_cause(self,event,level):
         while 1:
             matches = self.get_next()
@@ -509,10 +525,14 @@ class GedcomParser:
                 self.backup()
                 return
 	    elif matches[1] == "HUSB":
-                self.family.setFather(self.db.findPerson(matches[2],self.pmap))
+                id = matches[2]
+                person = self.find_or_create_person(id[1:-1])
+                self.family.setFather(person)
                 self.ignore_sub_junk(2)
 	    elif matches[1] == "WIFE":
-                self.family.setMother(self.db.findPerson(matches[2],self.pmap))
+                id = matches[2]
+                person = self.find_or_create_person(id[1:-1])
+                self.family.setMother(person)
                 self.ignore_sub_junk(2)
 	    elif matches[1] == "SLGS":
                 ord = LdsOrd()
@@ -524,7 +544,8 @@ class GedcomParser:
                 self.parse_address(self.addr,2)
 	    elif matches[1] == "CHIL":
                 mrel,frel = self.parse_ftw_relations(2)
-                child = self.db.findPerson(matches[2],self.pmap)
+                id = matches[2]
+                child = self.find_or_create_person(id[1:-1])
                 self.family.addChild(child)
 
                 for f in child.getParentList():