files updated for 0.5.0

svn: r405

gramps/NEWS

@@ -10,6 +10,8 @@ Version 0.5.0
   the filter.
 * New verification tool added to look for odd things in the
   database.
+* Improvements in GEDCOM import, including handling some
+  Family Tree Maker pecularities.
 
 Version 0.4.1
 * Tool/Report menus added to top level menu bar

gramps/gramps.spec

@@ -1,4 +1,4 @@
-%define ver      0.4.1
+%define ver      0.5.0
 %define rel      1
 %define prefix   /usr
 

gramps/src/EditPerson.glade

@@ -2386,7 +2386,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<child_name>CList:title</child_name>
-		<name>attr_details</name>
+		<name>attrib_details</name>
 		<label>Details</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>

gramps/src/const.py

@@ -75,7 +75,7 @@ gtkrcFile      = rootDir + os.sep + "gtkrc"
 #
 #-------------------------------------------------------------------------
 progName     = "gramps"
-version      = "0.4.2pre"
+version      = "0.5.0"
 copyright    = "(C) 2001 Donald N. Allingham"
 authors      = ["Donald N. Allingham"]
 comments     = _("Gramps (Genealogical Research and Analysis Management Programming System) is a personal genealogy program that can be extended by using the Python programming language.")

gramps/src/gramps.glade

@@ -5666,6 +5666,7 @@ Unknown
 	  <name>entry1</name>
 	  <width>250</width>
 	  <can_focus>True</can_focus>
+	  <has_focus>True</has_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
 	  <text_max_length>0</text_max_length>

gramps/src/gramps_main.py

@@ -2903,7 +2903,7 @@ def export_callback(obj,plugin_function):
 #
 #-------------------------------------------------------------------------
 def import_callback(obj,plugin_function):
-    plugin_function(database,active_person,update_display)
+    plugin_function(database,active_person,tool_callback)
     topWindow.set_title("Gramps - " + database.getSavePath())
 
 #-------------------------------------------------------------------------

gramps/src/plugins/ReadGedcom.py

@@ -46,6 +46,7 @@ db = None
 callback = None
 glade_file = None
 clear_data = 0
+is_ftw = 0
 
 photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif",
                 "tiff", "pcx" ]
@@ -647,8 +648,14 @@ class GedcomParser:
                 self.parse_person_event(event,2)
 	    elif matches[1] == "EVEN":
                 event = Event()
-                self.person.addEvent(event)
 	        self.parse_person_event(event,2)
+                if string.strip(event.getName()) == "SSN":
+                    attr = Attribute()
+                    attr.setType("Social Security Number")
+                    attr.setValue(event.getDescription())
+                    self.person.addAttribute(attr)
+                else:
+                    self.person.addEvent(event)
             else:
                 event = Event()
                 try:
@@ -930,17 +937,22 @@ class GedcomParser:
                 self.ignore_sub_junk(level+1)
             elif matches[1] == "PLAC":
                 val = matches[2]
-                place = None
+                n = string.strip(event.getName())
-                for p in self.db.getPlaceMap().values():
+                if is_ftw and n in ["Occupation","Degree","SSN"]:
-                    if val == p.get_title():
+                    event.setDescription(val)
-                        place = p
+                    self.ignore_sub_junk(level+1)
-                        break
                 else:
-                    place = Place()
+                    place = None
-                    place.set_title(matches[2])
+                    for p in self.db.getPlaceMap().values():
-                    self.db.addPlace(place)
+                        if val == p.get_title():
-                event.setPlace(place)
+                            place = p
-                self.ignore_sub_junk(level+1)
+                            break
+                    else:
+                        place = Place()
+                        place.set_title(matches[2])
+                        self.db.addPlace(place)
+                    event.setPlace(place)
+                    self.ignore_sub_junk(level+1)
             elif matches[1] == "CAUS":
                 info = matches[2] + self.parse_continue_data(level+1)
                 if note == "":
@@ -1168,6 +1180,8 @@ class GedcomParser:
     #
     #---------------------------------------------------------------------
     def parse_header_source(self):
+        global is_ftw
+        
         while 1:
 	    matches = self.get_next()
 
@@ -1177,6 +1191,8 @@ class GedcomParser:
 	    elif matches[1] == "SOUR":
                 if self.created_obj.get_text() == "":
                     self.update(self.created_obj,matches[2])
+                if matches[2] == "FTW":
+                    is_ftw = 1
    	    elif matches[1] == "NAME":
                 self.update(self.created_obj,matches[2])
    	    elif matches[1] == "VERS":