diff --git a/ChangeLog b/ChangeLog index d4585d6b2..f8d5987e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-07-05 Don Allingham + * src/Editors/_EditChildRef.py: fix title + * src/Editors/_EditFamily.py: call sequence for EditChildRef + * src/glade/gramps.glade: childref label fix + * src/ManagedWindow.py: spacking + * help/C/gramps-manual.xml: text updates + * help/C/figures/select-family.png: added + * help/C/figures/select-person.png: added + * help/C/figures/family-warn.png: added + * help/C/figures/child-ref.png: added + * help/C/figures/edit-family.png: added + * help/C/figures/gedcom-export.png: updated + * help/C/figures/export-druid.png: updated + 2006-07-04 Don Allingham * various: pyflakes fixes diff --git a/help/C/figures/child-ref.png b/help/C/figures/child-ref.png new file mode 100644 index 000000000..cd4585ef0 Binary files /dev/null and b/help/C/figures/child-ref.png differ diff --git a/help/C/figures/edit-family.png b/help/C/figures/edit-family.png new file mode 100644 index 000000000..5eeefa802 Binary files /dev/null and b/help/C/figures/edit-family.png differ diff --git a/help/C/figures/export-druid.png b/help/C/figures/export-druid.png index cb6236baf..cd37e5e95 100644 Binary files a/help/C/figures/export-druid.png and b/help/C/figures/export-druid.png differ diff --git a/help/C/figures/family-warn.png b/help/C/figures/family-warn.png new file mode 100644 index 000000000..1b19cbf4a Binary files /dev/null and b/help/C/figures/family-warn.png differ diff --git a/help/C/figures/gedcom-export.png b/help/C/figures/gedcom-export.png index d760f5364..0872c5ca8 100644 Binary files a/help/C/figures/gedcom-export.png and b/help/C/figures/gedcom-export.png differ diff --git a/help/C/figures/select-family.png b/help/C/figures/select-family.png new file mode 100644 index 000000000..14d795b20 Binary files /dev/null and b/help/C/figures/select-family.png differ diff --git a/help/C/figures/select-person.png b/help/C/figures/select-person.png new file mode 100644 index 000000000..e4f4b0f54 Binary files /dev/null and b/help/C/figures/select-person.png differ diff --git a/help/C/gramps-manual.xml b/help/C/gramps-manual.xml index bb4e7afb9..3ca7a612a 100644 --- a/help/C/gramps-manual.xml +++ b/help/C/gramps-manual.xml @@ -1306,6 +1306,14 @@ Editor dialog may be used to add, remove and rearrange the displayed columns. + If a place has been highlighted, you may select the + Google Maps button to attempt to display the + place in a web browser. Your default web browser should open, + attempting to use either the longitude and lattitude coordinates or + the place name to display the location using the Google Maps web site. + This feature is limited, and may not always produce the results you + desire. +
@@ -1497,7 +1505,9 @@ Undo . If you select this command repeatedly, your most recent - changes will be undone one at a time. + changes will be undone one at a time. To roll back multple commands at a + time, you can using the Undo History dialog + available from the Edit menu. If you want to return your database to the way it was when you opened it, select @@ -1633,66 +1643,8 @@ If you import information from another GRAMPS database or GRAMPS XML database, you will see the progress of the operation in the progress bar of GRAMPS' main window. - - - + @@ -1735,8 +1687,8 @@ - + @@ -1858,8 +1810,8 @@ - + @@ -2027,8 +1979,10 @@ To Add or Edit a Person - To add a person to the database, switch to the People View - () and then click the + There are multiple ways to add a person to the database. We will + cover some of them as we proceed. The simplest way to enter a person + to add them from the People View. While you are in the People View + (), click the Add on the toolbar. Enter any data you know about this person into the Edit Person dialog (see for details). @@ -2038,7 +1992,8 @@ Edit button on the toolbar. - Alternate ways of adding or editing a person + Alternate ways of adding or editing a person from the People + View You can also use Add... and Edit... menu items available under @@ -2046,6 +2001,10 @@ select Add... or Edit... from the context menu that pops up. + + People can also be added to the database in the Relationships + View, Edit Family dialog, and other places where it makes + sense. @@ -2053,19 +2012,62 @@ To Specify a Relationship - To specify a relationship, select the person for whom the - relationship applies. Switch to the Family View () and you'll see this individual indicated as - the "Active person". + There are two primary ways to specify relationships between + people - using the Relationships View and using the Edit Family dialog + from the Family List View. The Family List is usually used to build + all the relationships within a single family at a time. The + Relationships View is usually used to build multiple relationships to + a single person. + + To specify a new relationship to the selected person, switch to + the Relationships View () and you'll see + this individual indicated as the "Active person". Next to the + Family label is a Add + button (typically represented by a + sign). + Clicking the Add button will display the Edit + Family dialog with the selected person set as either the father or the + mother. + +
+ Editing a family + + + + + + + + + Editing a family. + + + +
Now a question: Does the person who will form the relationship with the Active person already exist in the database? If yes, click - the middle button to the right of the Spouse box. You'll then be able - to browse through the list of people in the database to select the one - you want. If not, click the topmost button to the right of the Spouse - box. This will allow you to add a new person to the database and to + the Select button to the other person. You'll + then be able to browse through the list of people in the database to + select the one you want. If not, click the Add + button. This will allow you to add a new person to the database and to specify the relationship this person has to the Active person. +
+ Selecting a person + + + + + + + + + Selecting a person. + + + +
+ Filtering @@ -2079,17 +2081,17 @@ all box. - To edit an existing relationship, double-click in the Spouse - box. If there is more than one relationship in the list, you can - select the spouse or partner you want from the list before - double-clicking. + To edit an existing relationship from the Relationships View, + click on the Edit button next to corresponding + Family entry. If there is more than one relationship in the list, you + can select the spouse or partner you want by clicking the + corresponding Edit button next to the + relationship. - - Alternate ways of editing relationships. - - Most of the functions described above are also available in - the context menu that pops up when you right-click. - + To specify a new relationship in the Family List View, click on + the Add button on the toolbar, and an empty + Edit Family dialog will open. At this point, you can add people to the + family. @@ -2097,43 +2099,73 @@ To Specify Parents - To specify the parents for a person, highlight that individual - in the People View and then switch to the Family View (). Your selected person will be indicated as - the Active person. Click the + button to the - right of the Active person's parents list box. - This will bring up the Choose Parents dialog. You - will see three sections, one for father, one for mother, and one for - specifying the relationships between everyone. + You can specify Active person's parents in the Relationship + View(). A little care is required to + prevent the creation of duplicate families. If you wish to add the + active person to an already existing family, you should click the + Select button. If the family including the + parents does not already exist, you should click the + Add button. - If the father and mother of the Active person are already stored - in your database, you can scroll through the lists and make your - selections. If they are not in the database, you can click - + to add them. + If you click on the Select button, you + are presented with the Select Family dialog. This will allow you to + select the existing family, and then the Active person will be added + as a child to the family. - - Filtering +
+ Selecting a family - By default, GRAMPS will limit both lists to people who could - possibly be the parents (judged by the date of birth) of the Active - person. To override this, check the Show all box for each - list. - + + + + + - To specify parents of the Active person's spouse, switch to - Family View and then click the + button to the - right of the Spouse's parents list box. + + Selecting a family. + + + +
- To edit information about parents who are already present in the - database, move the mouse over the corresponding parents' box and - double-click. + If you click on the Add button, a new + Edit Family dialog is presented with the Active person listed a child + of the new family. You can add the parents to the family by either + adding new people as the parents or selecting existing people as the + parents. - - Alternate ways of specifying parents + + If you create a new family and select parents that are already + in an existing family, GRAMPS will issue a warning message. If you + proceed by saving the new famiy, you will have a duplicate + family. - These functions can also be performed by right-clicking on the - parents' box and using the context menu that pops up. - +
+ Duplicate family warning + + + + + + + + + Duplicate family warning. + + + +
+ + + You can also specify the parents of a person in the Family List + View. If the family already exists, click on the + Edit button on the tool bar and add the person + as a child when the Edit Family dialog is displayed. If the family + does not already exist, click the Add button to + create a new family, and add the appropriate parents and + children. @@ -2141,25 +2173,38 @@ To Specify Children - To specify children of an Active person, switch to the Family - View () and then click either the second - or the third button from the top right of the children list box. The - second button adds a child to the database and to the family, while - the third button adds a child to the family who is already present in - the database. + Adding children to a relationship is done through a similar + proceedure. From the Relationships View or the Family List View, + select the existing family or create a new family. Children can be + added by selecting the Add button or Select button to the right of the + child list. - If using the third button, select a child from the list and - specify the child's relationship with father and mother using menus at - the bottom. If you want, you can add a person to the list by clicking - the Add... button. By default, GRAMPS will - limit the lists to people who could possibly be the child (judged by - the date of birth) of the active person. To override this, check the - Show all box. + Clicking the Add button will display the + Edit Person dialog, allowing you to enter a new person. Clicking on + the Select button, will allow you to select an + existing person from a list. By default, the child is added with a the + relationship type of birth to both parents. - The relationship of the child to the parents can be modified by - right-clicking in the children's box and using the context menu that - pops up. Again, most of the above functions are available through this - context menu. + If you wish to change the parent/child relationship from the + default setting of birth, select the child and click on the Edit + button. This will display the Edit Child Reference dialog. + +
+ Child Reference Editor + + + + + + + + + Child Reference Editor. + + + +
@@ -8567,4 +8612,4 @@ url="ghelp:gpl">link, or in the file COPYING included with the source code of this program. - + \ No newline at end of file diff --git a/src/Editors/_EditChildRef.py b/src/Editors/_EditChildRef.py index ddc3c7f3f..a06132a73 100644 --- a/src/Editors/_EditChildRef.py +++ b/src/Editors/_EditChildRef.py @@ -59,13 +59,14 @@ class EditChildRef(EditSecondary): """ Displays a dialog that allows the user to edit an address. """ - def __init__(self, dbstate, uistate, track, childref, callback): + def __init__(self, name, dbstate, uistate, track, childref, callback): """ Displays the dialog box. parent - The class that called the ChildRef editor. addr - The address that is to be edited """ + self.name = name EditSecondary.__init__(self, dbstate, uistate, track, childref, callback) @@ -73,6 +74,7 @@ class EditChildRef(EditSecondary): self.top = gtk.glade.XML(const.gladeFile, "cref_edit","gramps") self.set_window(self.top.get_widget("cref_edit"), self.top.get_widget("title"), + self.name, _('Child Reference Editor')) def _setup_fields(self): diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index cece033cb..d644af809 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -252,7 +252,9 @@ class ChildEmbedList(EmbeddedList): for ref in self.family.get_child_ref_list(): if ref.ref == handle: - EditChildRef(self.dbstate, self.uistate, self.track, + p = self.dbstate.db.get_person_from_handle(handle) + n = NameDisplay.displayer.display(p) + EditChildRef(n, self.dbstate, self.uistate, self.track, ref, self.child_ref_edited) break diff --git a/src/ManagedWindow.py b/src/ManagedWindow.py index f71e042cc..9f945073a 100644 --- a/src/ManagedWindow.py +++ b/src/ManagedWindow.py @@ -338,9 +338,9 @@ class ManagedWindow: self.parent_window = self.uistate.window def set_window(self,window,title,text,msg=None): - set_titles(window,title,text,msg) + set_titles(window, title, text, msg) self.window = window - self.window.connect('delete-event',self.close) + self.window.connect('delete-event', self.close) def build_menu_names(self,obj): return ('Undefined Menu','Undefined Submenu') diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index 9ba3df92d..d151c174b 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -16403,7 +16403,7 @@ You should select parents before adding any new information. If you select paren 0 - + True False