Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/ChooseParents.py: fix typo

Browse Source 
* src/PedView.py: build child menu with IDs
* src/ReadGedcom.py: save birth/death events, handle FTM's broken
"_primary" junk


svn: r2936
This commit is contained in:
Don Allingham 2004-02-29 05:09:23 +00:00
parent b3f1f5ab0f
commit 62a25d797d
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -10,6 +10,10 @@
* src/Marriage.py: Corrections. * src/Marriage.py: Corrections.
2004-02-28 Don Allingham <dallingham@users.sourceforge.net> 2004-02-28 Don Allingham <dallingham@users.sourceforge.net>
* src/ChooseParents.py: fix typo
* src/PedView.py: build child menu with IDs
* src/ReadGedcom.py: save birth/death events, handle FTM's broken
"_primary" junk
* src/gramps_main.py: switch to DB as default, remove save option * src/gramps_main.py: switch to DB as default, remove save option
* src/RelLib.py: setup DB environment better * src/RelLib.py: setup DB environment better
* src/DbPrompter.py: handle save/open with new DBs * src/DbPrompter.py: handle save/open with new DBs

2
src/ChooseParents.py
View File

@ -646,7 +646,7 @@ class ModifyParents:
if len(self.person.get_parent_family_id_list()) > 1: if len(self.person.get_parent_family_id_list()) > 1:
self.glade.get_widget('pref_label').show() self.glade.get_widget('pref_label').show()
self.pref.show() self.pref.show()
if family == self.person.get_parent_family_id_list()[0]: if self.family == self.person.get_parent_family_id_list()[0]:
self.pref.set_active(1) self.pref.set_active(1)
else: else:
self.pref.set_active(0) self.pref.set_active(0)

4
src/RelLib.py
View File

@ -2356,7 +2356,9 @@ class GrampsDB:
def sort_person_keys(self): def sort_person_keys(self):
if self.person_map: if self.person_map:
return self.person_map.keys() keys = self.person_map.keys()
keys.sort(self.sort_by_name)
return keys
else: else:
return [] return []
# keys = self.person_map.keys() # keys = self.person_map.keys()

8
src/plugins/ReadGedcom.py
View File

@ -811,6 +811,7 @@ class GedcomParser:
self.person.add_address(addr) self.person.add_address(addr)
elif matches[1] == "BIRT": elif matches[1] == "BIRT":
event = RelLib.Event() event = RelLib.Event()
self.db.add_event(event)
if self.person.get_birth_id(): if self.person.get_birth_id():
event.set_name("Alternate Birth") event.set_name("Alternate Birth")
self.person.add_event_id(event.get_id()) self.person.add_event_id(event.get_id())
@ -818,7 +819,7 @@ class GedcomParser:
event.set_name("Birth") event.set_name("Birth")
self.person.set_birth_id(event.get_id()) self.person.set_birth_id(event.get_id())
self.parse_person_event(event,2) self.parse_person_event(event,2)
self.db.add_event(event) self.db.commit_event(event)
elif matches[1] == "ADOP": elif matches[1] == "ADOP":
event = RelLib.Event() event = RelLib.Event()
event.set_name("Adopted") event.set_name("Adopted")
@ -827,6 +828,7 @@ class GedcomParser:
self.db.add_event(event) self.db.add_event(event)
elif matches[1] == "DEAT": elif matches[1] == "DEAT":
event = RelLib.Event() event = RelLib.Event()
self.db.add_event(event)
if self.person.get_death_id(): if self.person.get_death_id():
event.set_name("Alternate Death") event.set_name("Alternate Death")
self.person.add_event_id(event.get_id()) self.person.add_event_id(event.get_id())
@ -834,7 +836,7 @@ class GedcomParser:
event.set_name("Death") event.set_name("Death")
self.person.set_death_id(event.get_id()) self.person.set_death_id(event.get_id())
self.parse_person_event(event,2) self.parse_person_event(event,2)
self.db.add_event(event) self.db.commit_event(event)
elif matches[1] == "EVEN": elif matches[1] == "EVEN":
event = RelLib.Event() event = RelLib.Event()
if matches[2]: if matches[2]:
@ -919,7 +921,7 @@ class GedcomParser:
source_ref = self.handle_source(matches,level+1) source_ref = self.handle_source(matches,level+1)
self.person.get_primary_name().add_source_reference(source_ref) self.person.get_primary_name().add_source_reference(source_ref)
elif matches[1] == "_PRIMARY": elif matches[1] == "_PRIMARY":
type = matches[1] pass #type = matches[1]
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[2] + self.parse_continue_data(level+1) note = matches[2] + self.parse_continue_data(level+1)