diff --git a/gramps/doc/gramps-manual/C/gramps-manual.sgml b/gramps/doc/gramps-manual/C/gramps-manual.sgml
index af4c151d7..9db575b1e 100644
--- a/gramps/doc/gramps-manual/C/gramps-manual.sgml
+++ b/gramps/doc/gramps-manual/C/gramps-manual.sgml
@@ -842,7 +842,45 @@
- FIXME: This section should describe the pedegree view.
+ Moving the mouse over a displayed name will display additional
+ information about a person, including their date of birth and date
+ of death. Double-clicking the box will display the Edit
+ Person dialog box for the person. Holding down the
+ Shift key while double-clicking will will make that person the
+ active person.
+
+
+ Navigation around the tree can be accomplished several
+ ways. Clicking on the arrow next to the active person will display
+ a menu listing the children of the active person. Selecting a
+ person from this list will change the active person to the
+ selected child, effectively shifting the pedegree view to the
+ left, or down one generation. Clicking one of the arrow buttons on
+ the left side of the screen will make the select either the active
+ person's father (top button) or mother (bottom button),
+ effectively shifting the pedegree view to the right, or up one
+ generation. If the active person does not have any children, then
+ the button on the left hand side of the screen will not
+ appear. Similarly, if the active person does have a father or
+ mother, the corresponding button on the right hand side of the
+ screen will not appear.
+
+
+ Navigation
+
+ Navigation
+
+
+
+
+
+ As a quick short cut, double clicking on a line between two people
+ will make the person on the right hand side of the line the active
+ person. shows navigation using this
+ method. When the mouse is over one of the lines connecting
+ individuals, the line widens and becomes highlighted. In this
+ case, double-clcking on the line would make Hjalmar Smith the
+ active person.
@@ -868,7 +906,9 @@
- From this screen you are able to Add, Edit, and Delete sources.
+ From this screen you are able to Add and Edit sources. Currently,
+ deleting of sources is not available. This will be implemented in
+ a future version.
@@ -928,6 +968,16 @@
allow you to quickly jump to a person, making that person the
active person. This allows you to avoid searching for them
everytime you want to add/change something in their information.
+
+
+ Using Bookmarks
+
+ Using Bookmarks
+
+
+
+
+
Choosing
Bookmarks
@@ -938,6 +988,16 @@
select the person.
+ Choosing
+
+ Bookmarks
+ Go to Bookmark
+
+ displays a submenu which allows you to choose a person who was
+ previously bookmarked. Selecting a person from this menu will
+ make that person the active person.
+
+
Choosing
Bookmarks
@@ -946,6 +1006,14 @@
displays a dialog box that allows you to reorder or delete
bookmarks in the list.
+
+ Editing Bookmarks
+
+ Editing Bookmarks
+
+
+
+
@@ -1181,7 +1249,7 @@
- This allows you to set the default directory for your database,
+ This allows you to set the default directories for your databases,
reports, and Web Sites.
@@ -1335,82 +1403,94 @@ appear in every gramps generated file.
-
+ Analysis and Exploration
-
+
+ Compare individual events
- Compare individual events — Aids
- in the analysis of data by allowing the development of
+ Aids in the analysis of data by allowing the development of
custom filters that can be applied to the database to find
similar events.
+
+
+ Interactive descendant browser
- Interactive descendant browser —
Provides a browsable hierarchy based on the active person.
-
-
-
+
+
+ Data Processing
-
+
+ Check and repair database
- Check and repair database —
Checks the database for integrity problems, fixing the
problems that it can.
+
+
+ Extract information from names
- Extract information from names —
Searches the entire database and attempts to extract titles
and nicknames that may be embedded in a person's given name
field.
+
+
+ Merge people
- Merge people — Searches the
- entire database, looking for individual entries that may
- represent the same person.
+ Searches the entire database, looking for individual entries
+ that may represent the same person.
+
+
+ Rename personal event types
- Rename personal event types —
Allows all the events of a certain name to be renamed to a
new name.
+
+
+ Reorder gramps ID's
- Reorder gramps ID's — Reorders the
- gramps ID's according to gramps' default rules.
+ Reorders the gramps ID's according to gramps' default rules.
-
-
-
+
+
+ Utilities
-
+
+ Generate SoundEx codes
- Generate SoundEx codes —
Generates SoundEx codes for names.
+
+
+ Relationship calculator
- Relationship calculator —
Calulates the relationship between two people.
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -209,6 +239,6 @@ SHARED ELEMENTS
diff --git a/gramps/src/GrampsParser.py b/gramps/src/GrampsParser.py
index 0dd3ef0f7..6cec790f4 100644
--- a/gramps/src/GrampsParser.py
+++ b/gramps/src/GrampsParser.py
@@ -91,6 +91,7 @@ class GrampsParser(handler.ContentHandler):
self.source_ref = None
self.attribute = None
self.placeobj = None
+ self.locations = 0
self.place_map = {}
self.resname = ""
@@ -161,6 +162,7 @@ class GrampsParser(handler.ContentHandler):
def start_placeobj(self,attrs):
self.placeobj = self.db.findPlaceNoMap(u2l(attrs['id']))
self.placeobj.set_title(u2l(attrs['title']))
+ self.locations = 0
#---------------------------------------------------------------------
#
@@ -177,11 +179,12 @@ class GrampsParser(handler.ContentHandler):
loc.set_county(u2l(attrs['county']))
if attrs.has_key('country'):
loc.set_country(u2l(attrs['country']))
- if attrs.has_key('type'):
+ if self.locations > 0:
self.placeobj.add_alternate_locations(loc)
else:
self.placeobj.set_main_location(loc)
-
+ self.locations = self.locations + 1
+
#---------------------------------------------------------------------
#
#
@@ -427,8 +430,8 @@ class GrampsParser(handler.ContentHandler):
def start_photo(self,attrs):
photo = Photo()
for key in attrs.keys():
- if key == "descrip":
- photo.setDescription(u2l(attrs["descrip"]))
+ if key == "descrip" or key == "description":
+ photo.setDescription(u2l(attrs[key]))
elif key == "src":
src = u2l(attrs["src"])
if src[0] != os.sep:
diff --git a/gramps/src/WriteXML.py b/gramps/src/WriteXML.py
index f73dd71ca..82ac7c06f 100644
--- a/gramps/src/WriteXML.py
+++ b/gramps/src/WriteXML.py
@@ -304,7 +304,7 @@ def exportData(database, filename, callback):
if fileroot == path[0:l]:
path = path[l+1:]
g.write(' \n' % (state,country))
for photo in place.getPhotoList():
@@ -474,7 +474,7 @@ def exportData(database, filename, callback):
if fileroot == path[0:l]:
path = path[l+1:]
g.write("