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

* src/ReadGedcom.py: allow default when selecting override, add

Browse Source 
the place properly on import
* src/gedcomimport.glade: allow default when selecting override
* src/gramps_main.py: don't lose track of active person after
a cancelled Add Person


svn: r3635
This commit is contained in:
Don Allingham 2004-10-16 17:26:04 +00:00
parent 9ae62cfe7d
commit e474fa97b9
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps2/ChangeLog
View File

@ -1,3 +1,10 @@
2004-10-16 Don Allingham <dallingham@users.sourceforge.net>
* src/ReadGedcom.py: allow default when selecting override, add
the place properly on import
* src/gedcomimport.glade: allow default when selecting override
* src/gramps_main.py: don't lose track of active person after
a cancelled Add Person
2004-10-15 Don Allingham <dallingham@users.sourceforge.net> 2004-10-15 Don Allingham <dallingham@users.sourceforge.net>
* src/GrampsBSDDB.py: increase cachesize * src/GrampsBSDDB.py: increase cachesize
* src/ReadGedcom.py: increment source count * src/ReadGedcom.py: increment source count

5
gramps2/src/EditPerson.py
View File

@ -919,8 +919,9 @@ class EditPerson:
for event_handle in self.elist: for event_handle in self.elist:
event = self.db.get_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
pname = place_title(self.db,event) pname = place_title(self.db,event)
node = self.etree.add([const.display_pevent(event.get_name()),event.get_description(), node = self.etree.add([const.display_pevent(event.get_name()),
event.get_quote_date(),pname],event) event.get_description(),
event.get_quote_date(),pname],event)
self.emap[str(event)] = node self.emap[str(event)] = node
if self.elist: if self.elist:
self.etree.select_row(0) self.etree.select_row(0)

9
gramps2/src/ReadGedcom.py
View File

@ -259,12 +259,12 @@ class GedcomParser:
self.filename = file self.filename = file
self.index = 0 self.index = 0
self.backoff = 0 self.backoff = 0
self.override = codeset != None self.override = codeset
if self.override: if self.override != 0:
if self.override == 0: if self.override == 1:
self.cnv = ansel_to_utf8 self.cnv = ansel_to_utf8
elif self.override == 1: elif self.override == 2:
self.cnv = latin_utf8.latin_to_utf8 self.cnv = latin_utf8.latin_to_utf8
else: else:
self.cnv = nocnv self.cnv = nocnv
@ -640,6 +640,7 @@ class GedcomParser:
place.set_handle(intid) place.set_handle(intid)
place.set_title(gramps_id) place.set_title(gramps_id)
place.set_gramps_id(self.db.find_next_place_gramps_id()) place.set_gramps_id(self.db.find_next_place_gramps_id())
self.db.add_place(place,self.trans)
self.lid2id[gramps_id] = intid self.lid2id[gramps_id] = intid
return place return place

3
gramps2/src/gedcomimport.glade
View File

@ -692,7 +692,8 @@
<child> <child>
<widget class="GtkComboBox" id="codeset"> <widget class="GtkComboBox" id="codeset">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes">ANSEL <property name="items" translatable="yes">default
ANSEL
ANSI (iso-8859-1) ANSI (iso-8859-1)
ASCII ASCII
UNICODE</property> UNICODE</property>

5
gramps2/src/gramps_main.py
View File

@ -1174,9 +1174,9 @@ class Gramps:
self.people_view.add_to_person_list(person,0) self.people_view.add_to_person_list(person,0)
def load_new_person(self,obj): def load_new_person(self,obj):
self.active_person = RelLib.Person() person = RelLib.Person()
try: try:
EditPerson.EditPerson(self,self.active_person,self.db, EditPerson.EditPerson(self,person,self.db,
self.update_after_edit) self.update_after_edit)
except: except:
DisplayTrace.DisplayTrace() DisplayTrace.DisplayTrace()
@ -1438,6 +1438,7 @@ class Gramps:
self.place_view.new_place_after_edit(p) self.place_view.new_place_after_edit(p)
def update_after_edit(self,epo,change=1): def update_after_edit(self,epo,change=1):
self.active_person = epo.person
if change: if change:
self.people_view.update_person_list(epo.person) self.people_view.update_person_list(epo.person)
else: else: