diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 80225ed83..a711cd663 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2006-11-22 Don Allingham + * src/DataViews/_RelationView.py: remove unused button + * help/C/figures/family.png: updated + * help/C/figures/reorder.png: new image + * help/C/gramps.xml: updates + 2006-11-22 Martin Hawlisch * src/RelLib/_Person.py (set_birth_ref,set_death_ref): Dont fail if setting to None (which is what Check.py does). diff --git a/gramps2/help/C/figures/family.png b/gramps2/help/C/figures/family.png index 7610a0291..e58981f6b 100644 Binary files a/gramps2/help/C/figures/family.png and b/gramps2/help/C/figures/family.png differ diff --git a/gramps2/help/C/figures/reorder.png b/gramps2/help/C/figures/reorder.png new file mode 100644 index 000000000..84f1b7aea Binary files /dev/null and b/gramps2/help/C/figures/reorder.png differ diff --git a/gramps2/help/C/gramps.xml b/gramps2/help/C/gramps.xml index 4c0d8c281..39031a976 100644 --- a/gramps2/help/C/gramps.xml +++ b/gramps2/help/C/gramps.xml @@ -518,7 +518,8 @@ GRAMPS home page - A link to the GRAMPS' project web site. + This item opens your web browser and connects to the GRAMPS' project + web site. @@ -526,8 +527,8 @@ GRAMPS mailing lists - Gives you direct access to GRAMPS' mailing list - archives. + This item opens your web browser to the GRAMPS mailing list page. At + this page, you can browse the mailing list archives or join the mailing list @@ -651,58 +652,49 @@ - People View - + People View Displays the list of people in the database - Relationships View - + Relationships View Shows the relationships between the Active Person and other people. This includes parents, spouses, and children - Family List View - + Family List View Shows the list of families in the database - Pedigree View - + Pedigree View Displays a graphical ancestor tree for the selected person - Events View - + Events View Displays the list of events in the database - Sources View - + Sources View Displays the list of sources in the database - Places View - + Places View Displays the list of places in the database - Media View - + Media View Displays the list of media objects in the database - Repositories View - + Repositories View Displays the list of repositories in the database. @@ -931,15 +923,21 @@ Edit button, which will allow you to edit all the details of that particular person. - You may add, edit, or delete family information using the - buttons next to the Parents label. You can add a set of parents - by either selecting the Add button (the first button) or the - Select button (the second button). The - Add button will create a new family with - the Active Person listed as a child. The - Select button will allow you to choose - from a list of existing families, and then add the person as a - child to that family. + You may add a new set of parents by either + selecting the Add Parents or the + Share Parents. The + Add Parents button will create a + new family with the Active Person listed as a child. The + Share Parents button will allow + you to choose from a list of existing families, and then + add the person as a child to that family. + + You may edit an existing parents by selecting the + Edit button next to the + parents. If you select the Delete + next to a set of parents, then the Active Person will be + removed as a child from the parents. This button does + not delete the parents' relationship. If you are not careful, it is possible to create @@ -974,13 +972,15 @@ female. - You may add, edit, or delete family information using the - buttons next to the Family label. You can add a spouse by - clicking the Add button (the first button), which will create a - new family with the Active Person listed as a father or mother. - Selecting the Edit button will allow you to edit the displayed - family. Clicking the Delete button will remove the person from - the displayed family. + You may add a family by selecting the + Add Spouse in the toolbar. This + will create a new family with the Active Person listed + as a father or mother. + + Selecting the Edit button next to the spouse will + allow you to edit the displayed family. Clicking the + Delete button will remove the person from the displayed + family. Removing a person from a family does not delete the @@ -998,6 +998,28 @@ and mother labels should be considered to be convenience labels. + + You can reorder the parents and spouses by selecting the + Reorder. This option will only be enabled + if more than one set of parents or more than one set of spouses + exists for the Active Person. Selecting this button will display + a dialog that will allow you to reorder the families. + + +
+ Relationship Reordering Window + + + + + + + Relationship Reordering Window. + + + +
+ diff --git a/gramps2/src/DataViews/_RelationView.py b/gramps2/src/DataViews/_RelationView.py index 5f73e435f..62a93cf0b 100644 --- a/gramps2/src/DataViews/_RelationView.py +++ b/gramps2/src/DataViews/_RelationView.py @@ -617,9 +617,9 @@ class RelationshipView(PageView.PersonNavView): # add = GrampsWidgets.IconButton(call_fcn, None, gtk.STOCK_ADD) # hbox.pack_start(add, False) - if is_parent: - add = GrampsWidgets.IconButton(self.select_family, None, gtk.STOCK_INDEX) - hbox.pack_start(add, False) +# if is_parent: +# add = GrampsWidgets.IconButton(self.select_family, None, gtk.STOCK_INDEX) +# hbox.pack_start(add, False) if family: edit = GrampsWidgets.IconButton(self.edit_family, family.handle,