From 9531b80436f848702034b53b9068accba52a0bcc Mon Sep 17 00:00:00 2001
From: Don Allingham
Date: Sun, 11 Nov 2001 00:55:56 +0000
Subject: [PATCH] Getting ready for 0.6.0
svn: r558
---
gramps/doc/gramps-manual/C/gramps-manual.sgml | 327 +-
.../C/gramps-manual/addmedia.png | Bin 0 -> 8646 bytes
.../C/gramps-manual/addnewchild.png | Bin 6455 -> 7403 bytes
.../C/gramps-manual/authors.html | 3 +-
.../C/gramps-manual/bookmarks.html | 27 +-
.../C/gramps-manual/chooseparents.png | Bin 10990 -> 12234 bytes
.../C/gramps-manual/editpersondata.html | 184 +-
.../C/gramps-manual/ep_event.png | Bin 9201 -> 10070 bytes
.../C/gramps-manual/ep_gallery.png | Bin 19947 -> 25109 bytes
.../C/gramps-manual/ep_general.png | Bin 73819 -> 82550 bytes
.../C/gramps-manual/familyview.html | 5 +-
.../C/gramps-manual/familyview.png | Bin 16963 -> 18886 bytes
.../C/gramps-manual/firsttime.html | 3 +-
.../C/gramps-manual/genreports.html | 7 +-
.../C/gramps-manual/gettingstarted.html | 3 +-
.../C/gramps-manual/globalmedia.png | Bin 0 -> 23570 bytes
.../gramps-manual/C/gramps-manual/index.html | 15 +-
.../C/gramps-manual/license.html | 3 +-
.../gramps-manual/C/gramps-manual/ln7.html | 3 +-
.../C/gramps-manual/localmedia.png | Bin 0 -> 23991 bytes
.../gramps-manual/C/gramps-manual/mainwin.png | Bin 12380 -> 14275 bytes
.../C/gramps-manual/mediaview.html | 331 ++
.../C/gramps-manual/mediaview.png | Bin 0 -> 33852 bytes
.../gramps-manual/C/gramps-manual/opendb.png | Bin 0 -> 5473 bytes
.../C/gramps-manual/pedigreeview.html | 9 +-
.../C/gramps-manual/peoplelist.png | Bin 23581 -> 26456 bytes
.../C/gramps-manual/personlist.html | 3 +-
.../C/gramps-manual/placeedit.png | Bin 7411 -> 8873 bytes
.../C/gramps-manual/placeedit_name.png | Bin 0 -> 8843 bytes
.../C/gramps-manual/placeedit_refs.png | Bin 0 -> 7430 bytes
.../C/gramps-manual/placelist.html | 15 +-
.../C/gramps-manual/placelist.png | Bin 20499 -> 23451 bytes
.../gramps-manual/C/gramps-manual/prefs.html | 27 +-
.../C/gramps-manual/prefs_appear.png | Bin 10131 -> 11690 bytes
.../C/gramps-manual/prefs_dir.png | Bin 7790 -> 8963 bytes
.../C/gramps-manual/prefs_fmt.png | Bin 7670 -> 9872 bytes
.../C/gramps-manual/prefs_gen.png | Bin 8430 -> 9075 bytes
.../C/gramps-manual/prefs_report.png | Bin 6587 -> 7290 bytes
.../C/gramps-manual/prefs_research.png | Bin 7126 -> 7805 bytes
.../C/gramps-manual/prefs_revision.png | Bin 0 -> 7274 bytes
.../C/gramps-manual/reportsel.png | Bin 9012 -> 9566 bytes
.../C/gramps-manual/revcontrol.png | Bin 0 -> 10448 bytes
.../C/gramps-manual/revisoncontrol.html | 233 ++
.../C/gramps-manual/runtools.html | 5 +-
.../C/gramps-manual/savecomment.png | Bin 0 -> 4457 bytes
.../C/gramps-manual/sourceedit.png | Bin 6069 -> 7051 bytes
.../C/gramps-manual/sourceinfo.png | Bin 0 -> 7325 bytes
.../C/gramps-manual/sourcelist.html | 5 +-
.../C/gramps-manual/sourcelist.png | Bin 13314 -> 15232 bytes
.../C/gramps-manual/sourcerefsel.png | Bin 0 -> 6010 bytes
.../gramps-manual/C/gramps-manual/toolsel.png | Bin 9328 -> 10500 bytes
gramps/gramps.spec | 1 +
gramps/src/EditPerson.py | 15 +-
gramps/src/SourceView.py | 1 -
gramps/src/WriteXML.py | 2 +-
gramps/src/config.glade | 2 +-
gramps/src/const.py | 2 +-
gramps/src/gramps.glade | 2 +-
gramps/src/imagesel.glade | 4 +-
gramps/src/locale/de/LC_MESSAGES/gramps.mo | Bin 60903 -> 61911 bytes
gramps/src/locale/es/LC_MESSAGES/gramps.mo | Bin 55582 -> 61900 bytes
gramps/src/locale/fr/LC_MESSAGES/gramps.mo | Bin 54857 -> 61599 bytes
gramps/src/locale/sv/LC_MESSAGES/gramps.mo | Bin 51544 -> 59406 bytes
gramps/src/logo.png | Bin 21535 -> 21321 bytes
gramps/src/plugins/merge.glade | 2 +-
gramps/src/po/de.po | 1907 +++++-----
gramps/src/po/es.po | 2352 +++++++-----
gramps/src/po/fr.po | 3166 +++++++----------
gramps/src/po/sv.po | 2401 ++++++++-----
69 files changed, 6223 insertions(+), 4842 deletions(-)
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/addmedia.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/globalmedia.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/localmedia.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/mediaview.html
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/mediaview.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/opendb.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/placeedit_name.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/placeedit_refs.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/prefs_revision.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/revcontrol.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/revisoncontrol.html
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/savecomment.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/sourceinfo.png
create mode 100644 gramps/doc/gramps-manual/C/gramps-manual/sourcerefsel.png
diff --git a/gramps/doc/gramps-manual/C/gramps-manual.sgml b/gramps/doc/gramps-manual/C/gramps-manual.sgml
index 3609bbb35..3c1f0ebf1 100644
--- a/gramps/doc/gramps-manual/C/gramps-manual.sgml
+++ b/gramps/doc/gramps-manual/C/gramps-manual.sgml
@@ -1,5 +1,5 @@
+
]>
@@ -80,7 +80,7 @@
- This is version 1.0 of the GRAMPS manual.
+ This is version 1.1 of the GRAMPS manual.
@@ -552,21 +552,11 @@
Gallery Tab
- Photographs and images are stored in the
- Gallery tab. Images of a wide variety of
- formats are stored, including JPEG and
- PNG.
-
-
- GRAMPS can either refer to an
- existing file, or make its own copy. By default,
- GRAMPS will make its own copy. There
- are advantages and disadvatages to both approaches. Refering to
- an external copy reduces disk space. Allowing
- GRAMPS to make its own copy
- allows GRAMPS to still have the image if the original
- is altered, deleted, or moved. It also simplifies the transfer
- of a database from one machine to another.
+ The Gallery tab allows you to associate
+ files (known in GRAMPS as media
+ objects) with a particular person. These files are typically
+ images or photographs, but may be of any filetype, such as (but
+ not limited to) sound files and word processing documents.
Gallery Tab
@@ -577,60 +567,109 @@
- The first image in the gallery is considered to be the primary
- image. This image will appear on the General
- Information tab, and will be the image used by
- report generators. An image can be made the default at any time
- by selecting the image, and clicking on the Make
- Prmimary button. Images may be added by clicking the
- Add button, and deleted by clicking the
- Delete button. If the image is a
- reference to another file, GRAMPS
- will remove the reference to the file. If the file is a copy
- maintained by GRAMPS, then
- GRAMPS will remove the file from the
- file system.
+ GRAMPS provides a central repository
+ for all media objects in the Media View. This allows the same
+ media object to appear in multiple galleries. Adding a media
+ object to a gallery actually adds the object to the Media View,
+ and makes a local reference in the gallery.
- Right clicking on an selected image brings up a menu.
+ While each media object can have a note and attributes attached
+ to it, each gallery can add its own notes and attributes to the
+ reference in its gallery. This allows media objects to have
+ global and local properties. For example, a photo of a family
+ reunion may have many people in it. A global note may describe
+ the picture in general, identifying the place and date. When
+ this object is added to a gallery, you can attach a note to the
+ reference in the gallery adding some specific information, such
+ as "Aunt Martha is the third person from the right in the
+ second row". Clicking the Edit
+ Properites allows you to edit the local properties.
+
+
+ Local Media Properties
+
+ Local Media Properties
+
+
+
+
+
+ The first object in the gallery is considered to be the primary
+ image. If this object is an image, it will appear on the
+ General Information tab, and will be the
+ primary image used by report generators. An image can be made
+ the default at any time by selecting the thumbnail image and
+ dragging it to the first position in the gallery. In this same
+ manner, the order of the images can be changed using the same
+ drag and drop technique.
+
+
+ Objects may be added to the gallery in several ways. By clicking
+ the Add Media Object button, a dialog box
+ is presented which allows you to choose an object from the file
+ system. This method adds a new object to the Media View and
+ creates a reference in the gallery. Objects may also be added
+ by either dragging and dropping from one gallery to another, or
+ by dragging from the Media View to a gallery. In this case, a
+ new media object is not created, but a reference to an existing
+ media object is made in the gallery, sharing the same media
+ object between galleries. Finally, new objects may be added to a
+ gallery and the Media View by dragging and dropping from a file
+ manager (such as Nautilus or
+ Konqueror) or a web browser (such as
+ Galeon,
+ Mozilla, or
+ Konqueror) into a gallery.
+
+
+ Media objects can be removed from a gallery by clicking the
+ Delete Media Object button. This action
+ only removes the reference to the current gallery. It does not
+ remove the media object from the Media View or from any other
+ galleries that are referencing it.
+
+
+ Right clicking on a selected object brings up a menu.
Menu options
- View Image
+ View in default viewer
- Allows you to view the image using the GNOME's default
+ Allows you to view an object image using GNOME's default
viewer for the file type.
- Edit Image
+ Edit with the GIMP
Launches the gimp program,
- allowing you to edit the image.
+ allowing you to edit the image. This option only shows up
+ if the media object is an image.
- Edit Description
+ Edit Object Properties
- Allows you to change the description attached to the
- image.
+ Allows you to change the attributes and note attached to the
+ media object.
- Convert to private copy
+ Convert to local copy
- This option is only displayed if the image is a reference
+ This option is only displayed if the media is a reference
to a file that is not controlled by
GRAMPS. Selecting the option
causes GRAMPS to make its own
- copy of the image.
+ copy of the media object.
@@ -940,6 +979,139 @@
+
+ Media View
+
+ The Media View window displays the files associated with the
+ database. Typically, these files are images, but
+ GRAMPS allows you to attach any type of
+ file to the database. GRAMPS refers to
+ attached files as media objects. You can access the Media View at
+ any time by either pressing the Media
+ button at the top of the screen, or by choosing the
+
+ View
+ Media
+
+ entry from the menus.
+
+
+ Media View
+
+ Media View
+
+
+
+
+
+ Media Objects
+
+ Media objects can be either local or external to a
+ GRAMPS database. If
+ GRAMPS is told to import an object as
+ alocal object, it will make its own copy of the file in the
+ database directory. If the object is not imported as a local
+ object, the original file is used.
+
+
+ There are advantages and disadvantages to both methods. If the
+ object is local, then if the original file is moved or deleted,
+ then GRAMPS will still have its own
+ copy. However, this is at the price of having two copies of the
+ file. If the file is not imported as a local object, then a copy
+ is not made, saving disk space. However, altering or deleting
+ the original copy will affect the
+ GRAMPS database.
+
+
+
+ Adding a Media Object
+
+ Media objects can be imported in several ways. Adding an object
+ to any gallery adds the object to the Media View. The gallery is
+ will actually contain a reference to the object in the Media
+ View.
+
+
+ Objects may also be added using the Add Media
+ Object button. This will add the object to the Media
+ View, but not to any gallery. When you select the file to be
+ added, a preview will be displayed in the preview window. The
+ the file is an image, the image will be displayed. Otherwise, an
+ icon representing the file type will be displayed. In the dialog
+ box, you may choose to either import the object as a local
+ object, or leave it as an external object.
+
+ Add Media Object Dialog Box
+
+ Add Media Object Dialog Box
+
+
+
+
+
+
+ Finally, you may drag-and-drop an object from either a file
+ manager or a web browser. If the object is dropped into a
+ gallery, then a reference is made in the gallery, and the object
+ appears in the Media View. If the object is dropped directly
+ into the Media View, then it appears in the Media View, but will
+ not appear in a gallery. Currently, all objects imported via
+ drag-and-drop are imported as external (not local) objects.
+
+
+
+ Making a Reference to a Media Object
+
+ Once an object is in the Media View, it is possible to make a
+ reference to it in any gallery. You may place the object in as
+ many galleries as you like, and only one copy of the file will
+ exist.
+
+
+ To make a reference to a media object in a gallery, you may
+ simply drag-and-drop the object from the Media View directly to
+ a gallery. The object will then appear in the
+ gallery. Similarly, you may drag-and-drop from one gallery to
+ another gallery, and a new object reference is created in the
+ target gallery.
+
+
+
+ Changing a Media Object's Properties
+
+ Media objects have global and local properties. The title of the
+ object is a global property. It may only be changed from the
+ Media View, and it will affect all references. An object also
+ has a global note and a set of user defined global attributes.
+ A reference in a gallery may a have a local note and local
+ attributes as well. All references share the global properties,
+ but each gallery has its own set of notes a attributes.
+
+
+ The global note can be used to provide a general
+ description. For example, in a family reunion image, you may
+ wish to use the global note to indicate the place, date, and
+ occasion of the photograph. In a local note in Aunt Martha's
+ gallery, you may wish to add a local note indicating that
+ "Aunt Martha is the third person from the right in the
+ second row".
+
+
+ The global properties may be changed by selecting the
+ Edit Media Object button.
+
+ Edit a Media Object's Global Properties
+
+ Edit a Media Object's Global Properties
+
+
+
+
+
+
+
+
Bookmarking People
@@ -1019,6 +1191,79 @@
+
+ Using Revision Control
+
+ Revision control allows you to keep a history of the changes that
+ you have made to your database. Instead of needing to keep
+ multiple sets of back up files, a single revision control database
+ is maintained. At any point, you can revert back to a previously
+ saved version.
+
+
+ GRAMPS uses the standard
+ RCS system to handle revisions.
+
+
+ Revison control is enabled in the Revision Control tab of the
+ preferences dialog. Once enabled, every save is logged into the
+ revision control database. If you have enabled prompting for a
+ comment, then a dialog box will be displayed on every save asking
+ you to provide a comment about the changes you have made.
+
+ Providing a revision control comment
+
+ Providing a revision control comment
+
+
+
+
+
+
+ Reverting to a previous version
+
+ If revision control has been enabled, you have the option of
+ reverting to a previous version of the database. Selecting the
+ check box will allow you to select a previous version.
+
+ Opening a database
+
+ Opening a database
+
+
+
+
+
+
+ If the check box has be selected, GRAMPS
+ will display a dialog box that will allow you to choose which version
+ you would like to view. The dialog box displays the version number, the
+ date the version was saved, who saved the database, and any comment supplied
+ when the datbase was saved.
+
+ Choosing a revision
+
+ Choosing a revision
+
+
+
+
+
+
+ Choosing a previous revision does not replace your current
+ database. If you do not save the retrieved database, it will not
+ replace the current version. If for some reason you accidentally
+ save the retrieved database when you did not want to replace the
+ current version, you can always use the revison control
+ mechanism to get back the version you replaced.
+
+
+ Revision control is applied only to the database itself, not to
+ any media objects have been associated with the database.
+
+
+
+
diff --git a/gramps/doc/gramps-manual/C/gramps-manual/addmedia.png b/gramps/doc/gramps-manual/C/gramps-manual/addmedia.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef87d1d7ec5c8c6b558593f44973782e47852bbd
GIT binary patch
literal 8646
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
literal 6455
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
ZRF1`|&31LMUTFZ#jjtM&{(0-ce*iq7g1-O&
diff --git a/gramps/doc/gramps-manual/C/gramps-manual/authors.html b/gramps/doc/gramps-manual/C/gramps-manual/authors.html
index 193b9a910..c30753371 100644
--- a/gramps/doc/gramps-manual/C/gramps-manual/authors.html
+++ b/gramps/doc/gramps-manual/C/gramps-manual/authors.html
@@ -5,7 +5,8 @@
>AuthorsBookmarking People<<< Previous
Photographs and images are stored in the
- The Gallery tab. Images of a wide variety of
- formats are stored, including JPEG and
- PNG.
-
tab allows you to associate
+ files (known in GRAMPS can either refer to an
- existing file, or make its own copy. By default,
- GRAMPS will make its own copy. There
- are advantages and disadvatages to both approaches. Refering to
- an external copy reduces disk space. Allowing
- GRAMPS to make its own copy
- allows GRAMPS to still have the image if the original
- is altered, deleted, or moved. It also simplifies the transfer
- of a database from one machine to another.
+> as media
+ objects) with a particular person. These files are typically
+ images or photographs, but may be of any filetype, such as (but
+ not limited to) sound files and word processing documents.
The first image in the gallery is considered to be the primary
- image. This image will appear on the General
- Information tab, and will be the image used by
- report generators. An image can be made the default at any time
- by selecting the image, and clicking on the Make
- Prmimary button. Images may be added by clicking the
- Add button, and deleted by clicking the
- Delete button. If the image is a
- reference to another file, GRAMPS
- will remove the reference to the file. If the file is a copy
- maintained by GRAMPS, then
- GRAMPS will remove the file from the
- file system.
+> provides a central repository
+ for all media objects in the Media View. This allows the same
+ media object to appear in multiple galleries. Adding a media
+ object to a gallery actually adds the object to the Media View,
+ and makes a local reference in the gallery.
Right clicking on an selected image brings up a menu.
+> While each media object can have a note and attributes attached
+ to it, each gallery can add its own notes and attributes to the
+ reference in its gallery. This allows media objects to have
+ global and local properties. For example, a photo of a family
+ reunion may have many people in it. A global note may describe
+ the picture in general, identifying the place and date. When
+ this object is added to a gallery, you can attach a note to the
+ reference in the gallery adding some specific information, such
+ as "Aunt Martha is the third person from the right in the
+ second row". Clicking the Edit
+ Properites allows you to edit the local properties.
+
Figure 12. Local Media Properties
The first object in the gallery is considered to be the primary
+ image. If this object is an image, it will appear on the
+ General Information tab, and will be the
+ primary image used by report generators. An image can be made
+ the default at any time by selecting the thumbnail image and
+ dragging it to the first position in the gallery. In this same
+ manner, the order of the images can be changed using the same
+ drag and drop technique.
+
Objects may be added to the gallery in several ways. By clicking
+ the Add Media Object button, a dialog box
+ is presented which allows you to choose an object from the file
+ system. This method adds a new object to the Media View and
+ creates a reference in the gallery. Objects may also be added
+ by either dragging and dropping from one gallery to another, or
+ by dragging from the Media View to a gallery. In this case, a
+ new media object is not created, but a reference to an existing
+ media object is made in the gallery, sharing the same media
+ object between galleries. Finally, new objects may be added to a
+ gallery and the Media View by dragging and dropping from a file
+ manager (such as Nautilus or
+ Konqueror) or a web browser (such as
+ Galeon,
+ Mozilla, or
+ Konqueror) into a gallery.
+
Media objects can be removed from a gallery by clicking the
+ Delete Media Object button. This action
+ only removes the reference to the current gallery. It does not
+ remove the media object from the Media View or from any other
+ galleries that are referencing it.
+
Right clicking on a selected object brings up a menu.
View Image
View in default viewer
Allows you to view the image using the GNOME's default
+> Allows you to view an object image using GNOME's default
viewer for the file type.
Edit Image
Edit with the GIMP
Launches the gimp program,
- allowing you to edit the image.
+ allowing you to edit the image. This option only shows up
+ if the media object is an image.
Edit Description
Edit Object Properties
Allows you to change the description attached to the
- image.
+> Allows you to change the attributes and note attached to the
+ media object.
Convert to private copy
Convert to local copy
This option is only displayed if the image is a reference
+> This option is only displayed if the media is a reference
to a file that is not controlled by
GRAMPS to make its own
- copy of the image.
+ copy of the media object.