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

Improved sort, fixed minor bugs

Browse Source 
svn: r299
This commit is contained in:
Don Allingham 2001-08-06 23:58:09 +00:00
parent ca88794a36
commit 69f0e8311c
3 changed files with 74 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/NEWS
View File

@ -13,8 +13,12 @@ Version 0.4.0
* Added privacy flag and confidence level to events, attributes, etc.
* Automatically detect gzip'ed XML vs. XML
* Added option to write either gzip'ed XML or straight XML
* Warn on closing the edit person window when modifications have been
made.
* Warn on closing the edit person and marriage/relationshp window
when modifications have been made.
* French translation
* New plugin from Jesper Zedlitz that implements a graphical
representation of the people in the database, allowing you to
reposition people according to your own desires.
Version 0.3.2
* Fixed Style Editor on WebPage.py, to allow styles to be edited.

3
gramps/src/GrampsParser.py
View File

@ -292,6 +292,9 @@ class GrampsParser(handler.ContentHandler):
elif attrs.has_key("mrel"):
mrel = u2l(attrs["mrel"])
frel = u2l(attrs["frel"])
if mrel=="Birth" and frel=="Birth":
self.person.MainFamily = family
else:
self.person.AltFamilyList.append((family,mrel,frel))
else:
self.person.MainFamily = family

82
gramps/src/gramps_main.py
View File

@ -370,7 +370,7 @@ def redraw_child_list(filter):
if pdday.getYear() != -1:
# reject if child deathdate < parents birthdate+ 10
if pdday.getLowYear() < limit.getHighYear()+10:
if pdday.getLowYear() < bday.getHighYear()+10:
continue
if dday_valid:
@ -1028,7 +1028,7 @@ def find_family(father,mother):
#-------------------------------------------------------------------------
def change_family_type(family,mrel,frel):
is_main = mrel == "Birth" and frel == "Birth"
is_main = (mrel == "Birth") and (frel == "Birth")
if not family:
if is_main:
@ -1043,18 +1043,17 @@ def change_family_type(family,mrel,frel):
fam.removeChild(active_person)
return
elif family == active_person.getMainFamily():
if is_main:
if not is_main:
utils.modified()
active_person.setMainFamily(None)
found = 0
for fam in active_person.getAltFamilyList():
if fam[0] == family:
fam[1] = type
found = 1
break
elif fam[1] == type:
fam[0] = family
found = 1
if found == 0:
break
else:
active_person.addAltFamily(family,mrel,frel)
else:
for fam in active_person.getAltFamilyList():
@ -1114,15 +1113,15 @@ def on_save_parents_clicked(obj):
else:
family = None
family.setRelationship(type)
change_family_type(family,mrel,frel)
active_mother = select_mother
active_father = select_father
active_family = family
utils.destroy_passed_object(obj)
if family:
family.setRelationship(type)
change_family_type(family,mrel,frel)
load_family()
#-------------------------------------------------------------------------
@ -1440,8 +1439,41 @@ def on_person_list_click_column(obj,column):
return
person_list.set_sort_type(sort_direct)
person_list.set_sort_column(sort_column)
sort_person_list()
if id2col.has_key(active_person):
row = person_list.find_row_from_data(id2col[active_person])
person_list.moveto(row)
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
def sort_person_list():
person_list.freeze()
person_list.sort()
person_list.moveto()
if ListColors.get_enable():
try:
oddbg = GdkColor(ListColors.oddbg[0],ListColors.oddbg[1],ListColors.oddbg[2])
oddfg = GdkColor(ListColors.oddfg[0],ListColors.oddfg[1],ListColors.oddfg[2])
evenbg = GdkColor(ListColors.evenbg[0],ListColors.evenbg[1],ListColors.evenbg[2])
evenfg = GdkColor(ListColors.evenfg[0],ListColors.evenfg[1],ListColors.evenfg[2])
rows = person_list.rows
for i in range(0,rows,2):
person_list.set_background(i,oddbg)
person_list.set_foreground(i,oddfg)
if i != rows:
person_list.set_background(i+1,evenbg)
person_list.set_foreground(i+1,evenfg)
except OverflowError:
pass
person_list.thaw()
if id2col.has_key(active_person):
row = person_list.find_row_from_data(id2col[active_person])
person_list.moveto(row)
#-------------------------------------------------------------------------
#
@ -1843,7 +1875,24 @@ def on_spouselist_changed(obj):
#-------------------------------------------------------------------------
def new_after_edit(person):
database.addPerson(person.person)
update_display(1)
pos = (person.person,0)
id2col[person] = pos
gname = utils.phonebook_from_name
if DataFilter.compare(person.person):
if person.person.getGender():
gender = const.male
else:
gender = const.female
bday = person.person.getBirth().getDateObj()
dday = person.person.getDeath().getDateObj()
name = person.person.getPrimaryName()
person_list.insert(0,[gname(name,0),person.person.getId(), gender,bday.getQuoteDate(),
dday.getQuoteDate(), sort.build_sort_name(name),
sort.build_sort_birth(bday), sort.build_sort_death(dday)])
person_list.set_row_data(0,pos)
sort_person_list()
# update_display(1)
#-------------------------------------------------------------------------
#
@ -2307,15 +2356,10 @@ def apply_filter():
clistadd([gname(name,alt),person.getId(), gender,bday.getQuoteDate(),
dday.getQuoteDate(), sort.build_sort_name(name),
sort.build_sort_birth(bday), sort.build_sort_death(dday)], pos)
i = i + 1
person_list.sort()
person_list.moveto()
sort_person_list()
person_list.thaw()
if i > 0:
goto_active_person()
#-------------------------------------------------------------------------
#
#