diff --git a/gramps/NEWS b/gramps/NEWS index 8e1d182cf..2bbd19722 100644 --- a/gramps/NEWS +++ b/gramps/NEWS @@ -1,3 +1,12 @@ +Version 0.4.1 +* Tool/Report menus added to top level menu bar +* Extract Titles and Nicknames plugin improved to provide more + information +* Several bug fixes, including the problem of confusing father/ + mother relationships in families +* Significant improvements in speed for updating displays after + adding, editing, or deleting people, and for applying filters. + Version 0.4.0 * Redesigned Family page. More complex family relationships can be handled. diff --git a/gramps/gramps.spec b/gramps/gramps.spec index 328cb5098..5d1c4023a 100644 --- a/gramps/gramps.spec +++ b/gramps/gramps.spec @@ -1,4 +1,4 @@ -%define ver 0.4.0 +%define ver 0.4.1 %define rel 1 %define prefix /usr diff --git a/gramps/src/const.py b/gramps/src/const.py index ef4a6b69f..733e38c80 100644 --- a/gramps/src/const.py +++ b/gramps/src/const.py @@ -75,7 +75,7 @@ gtkrcFile = rootDir + os.sep + "gtkrc" # #------------------------------------------------------------------------- progName = "gramps" -version = "0.4.0" +version = "0.4.1" 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.") diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py index 8da470257..87a6e4ec7 100755 --- a/gramps/src/gramps_main.py +++ b/gramps/src/gramps_main.py @@ -263,7 +263,7 @@ def on_add_sp_clicked(obj): "destroy_passed_object" : utils.destroy_passed_object }) - rel_type.set_text(_("Unknown")) + rel_type.set_text(_("Married")) #------------------------------------------------------------------------- # @@ -1134,21 +1134,23 @@ def on_save_parents_clicked(obj): type = const.save_frel(type) if select_father or select_mother: - if select_mother.getGender() == Person.male and \ - select_father.getGender() == Person.female: + if select_mother and not select_father: + if select_mother.getGender() == Person.male: + select_father = select_mother + select_mother = None family = find_family(select_father,select_mother) - family.setFather(select_mother) - family.setMother(select_father) - x = select_father - select_father = select_mother - select_mother = x - elif select_mother and not select_father: - family = find_family(None,select_mother) elif select_father and not select_mother: - family = find_family(select_father) + if select_father.getGender() == Person.female: + select_mother = select_father + select_father = None + family = find_family(select_father,select_mother) elif select_mother.getGender() != select_father.getGender(): if type == "Partners": type = "Unknown" + if select_father.getGender() == Person.female: + x = select_father + select_father = select_mother + select_mother = x family = find_family(select_father,select_mother) else: type = "Partners" @@ -1194,7 +1196,7 @@ def on_select_spouse_clicked(obj): active_person.addFamily(family) select_spouse.addFamily(family) - if active_person == Person.male: + if active_person.getGender() == Person.male: family.setMother(select_spouse) family.setFather(active_person) else: