ODFDoc : Issue 2576 : change run-through form background to foreground.

svn: r14920
0002857: Spacebar doesn't activate embedded edit buttons
2010-03-24 06:44:54 +00:00 · 2010-03-19 14:59:53 +00:00 · 2010-03-12 16:59:21 +00:00 · 2010-03-07 16:50:18 +00:00 · 2010-03-06 23:31:12 +00:00 · 2010-02-20 17:44:16 +00:00
258 changed files with 198116 additions and 138281 deletions
@@ -6,11 +6,19 @@ For that use your package manager, the rest is already done by the packager.

 uninstall old version
 ---------------------
-If you do a source install in the same place of an existing install, you need
-to remove the old version first (just delete the directory).
-GRAMPS is a python application, so loading happens on reading the files, 
-meaning that files of a previous version that are no longer present in the
-new version can still be loaded, making the new install unstable.
+If you do a source install in the same place of an existing install,
+you need to remove the old version first. You can delete the old
+version by:
+
+  * deleting the installed directories (for example,
+    /usr/share/gramps)
+  * OR by running "make uninstall" from the old directory where you
+    ran "make install" (not the new GRAMPS directory)
+
+GRAMPS is a python application, so loading happens on reading the
+files, meaning that files of a previous version that are no longer
+present in the new version can still be loaded, making the new install
+unstable.

 configure vs autogen scripts
 ----------------------------
@@ -1,3 +1,25 @@
+Version 3.1.3 -- the "What name?" release.
+* contains translation updates, crash fixes, bug fixes, and minor updates.
+* fixes and updates to:
+* -> notes, date handler, GEDCOM parser, GEDCOM export, PlaceView,
+* -> thumbnails, unicode/text truncation, Gramplets, gtk 2.18/Ubuntu 9.10,
+* -> xml export/import data loss, GeneWeb GEDCOM import, css updates
+* several MacPorts-specific fixes
+* several Windows-specific fixes
+
+Version 3.1.2 -- the "Skip the impersonations" release.
+* Contains translation updates and small bug fixes.  No new features.
+* ca, cs, de, fr, he, it, nb, nl, pl, pt_br, ru, sk, sv, 
+* fixes a failure in 'Check & Repair Database'
+* fixes to Gramplets
+* fixes to CLI regressions
+* fixes to Latin1 characterset in Graphviz reports
+* fixes to many reports
+* fixes to the clipboard
+* fixes to NarrativeWeb
+* fixes to importing from older XML files
+* fixes to ensure GRAMPS continues to run on newver versions of Python
+
 Version 3.1.1 -- the "Spam, bacon, sausage and spam" release.
 * The release of 3.1.1 is primarily to fix a crash bug that needed to be addressed immediately:
 * -> bug #2792, crash with the message "need more than 6 values to unpack"
@@ -6,7 +6,7 @@ Requirements
 --------------------------------
 The following packages *MUST* be installed in order for Gramps to work:
   Python 2.5 or greater
-   PyGTK2 2.10 or greater
+   PyGTK2 2.12 or greater
   Python Glade bindings 
   librsvg2 (svg icon view)
   xdg-utils
@@ -5,7 +5,7 @@ dnl May need to run automake && aclocal first

 AC_PREREQ(2.57)
 dnl NOTE: arg to macro below becomes the "VERSION"
-AC_INIT(gramps, 3.1.1, [gramps-bugs@lists.sourceforge.net])
+AC_INIT(gramps, 3.1.4, [gramps-bugs@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE([1.6.3 foreign])

@@ -33,7 +33,7 @@ AC_SUBST(RELEASE)
 AC_SUBST(VERSIONSTRING)

 dnl Add the languages which your application supports here.
-ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl nn pl pt_BR ro ru sv eo fi lt sk tr bg hr sl ca mk sq"
+ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl nn pl pt_BR ro ru sv eo fi lt sk tr bg hr sl ca mk sq he"
 GETTEXT_PACKAGE=gramps
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])
@@ -92,7 +92,7 @@ try:
    # Do not import gtk.glade, this can raise a RuntimeError if the
    # display cannot be opened.  Just search it.
    import imp
-    imp.find_module('gtk/glade')
+    imp.find_module('glade',[[imp.find_module('gtk')[1]]])
    out("gtk.glade")
 except ImportError:
    out("NO")
@@ -1,4 +1,4 @@
-.TH gramps 1 "@VERSION@" "Avril 2008" "@VERSION@"
+.TH gramps 1 "@VERSION@" "Mars 2009" "@VERSION@"
 .SH NOM
 gramps \- GRAMPS est une application de généalogie. GRAMPS est l'acronyme de Genealogical Research and Analysis Management Programming System (Systeme de Programmation pour Recherche, Analyse et Gestion de données généalogiques)

@@ -19,7 +19,7 @@ gramps \- GRAMPS est une application de généalogie. GRAMPS est l'acronyme de G
 .IR FORMAT ]] 
 .RB [ \-i|\-\^\-import= 
 .IR ... ] 
-.RB [ \-o|\-\^\-output= 
+.RB [ \-e|\-\^\-export= 
 .IR FICHIER
 .RB [ \-f|\-\^\-format= 
 .IR FORMAT ]] 
@@ -55,7 +55,7 @@ Le format spécifique du \fIFICHIER\fR est précédé par les arguments
 \fB\-O\fR,
 ..
 \fB\-i\fR, ou
-\fB\-o\fR. Si l'option \fB\-f\fR n'est pas donnée pour le \fIFICHIER\fR, alors le format sera celui de l'extension ou du type-MIME.
+\fB\-e\fR. Si l'option \fB\-f\fR n'est pas donnée pour le \fIFICHIER\fR, alors le format sera celui de l'extension ou du type-MIME.
 .br

 Les formats de sortie disponibles sont \fBgramps\-xml\fR (deviné si \fIFICHIER\fR se termine par
@@ -103,7 +103,7 @@ i.e. \fB\-i\fR \fIFICHIER1\fR \fB\-i\fR \fIFICHIER2\fR
 et \fB\-i\fR \fIFICHIER2\fR \fB\-i\fR \fIFICHIER1\fR vont tous les deux produire différents IDs gramps.

 .TP 
-.BI \-o,\-\^\-output= " FICHIER"
+.BI \-e,\-\^\-export= " FICHIER"
 Exporter des données dans un \fIFICHIER\fR. Pour le format \fBiso\fR, le \fIFICHIER\fR est le nom du répertoire dans lequel la base de données gramps est écrite.
 Pour 
 .ig
@@ -113,7 +113,7 @@ Pour
 et \fBgeneweb\fR, le \fIFICHIER\fR est le nom du fichier de sortie 
 .br

-Quand plus d'un fichier doit être exporté, chacun doit être précédé par la commande \fB\-o\fR. Ces fichiers sont importés dans le même ordre.
+Quand plus d'un fichier doit être exporté, chacun doit être précédé par la commande \fB\-e\fR. Ces fichiers sont importés dans le même ordre.

 .TP 
 .BI \-a,\-\^\-action= " ACTION"
@@ -197,16 +197,16 @@ Si la commande \fB\-O\fR est notée, alors gramps va essayer le fichier défini

 .LP
 Avec ou sans la commande \fB\-O\fR, il peut y avoir plusieurs imports, exports, et actions dans la ligne de commande \fB\-i\fR,
-\fB\-o\fR, et \fB\-a\fR.
+\fB\-e\fR, et \fB\-a\fR.

 .LP
-L'ordre des options \fB\-i\fR, \fB\-o\fR, ou \fB\-a\fR n'a pas de sens. L'ordre actuel est toujours : imports -> actions -> exports. Mais l'ouverture doit toujours être la première!
+L'ordre des options \fB\-i\fR, \fB\-e\fR, ou \fB\-a\fR n'a pas de sens. L'ordre actuel est toujours : imports -> actions -> exports. Mais l'ouverture doit toujours être la première!

 .LP
 Si aucune option \fB\-O\fR ou \fB\-i\fR n'est donnée, gramps lancera sa propre fenêtre et demarrera avec une base vide, puisqu'il n'y a pas données.

 .LP
-Si aucune option \fB\-o\fR ou \fB\-a\fR n'est donnée, gramps lancera sa propre fenêtre et démarrera avec la base de données issue de tout les imports. Cette base sera \fBimport_db.grdb\fR sous le répertoire \fB~/.gramps/import\fR.
+Si aucune option \fB\-e\fR ou \fB\-a\fR n'est donnée, gramps lancera sa propre fenêtre et démarrera avec la base de données issue de tout les imports. Cette base sera \fBimport_db.grdb\fR sous le répertoire \fB~/.gramps/import\fR.

 .LP
 Les erreurs rencontrées lors d'import, export, ou action, seront mémorisées en \fIstdout\fR (si elles sont le fait de la manipulation par gramps) ou
@@ -227,8 +227,8 @@ Lecture de quatre bases de données dont les formats peuvent être devinés d'ap
 Si vous voulez préciser les formats de fichiers dans l'exemple ci-dessus, complétez les noms de fichiers par les options \fB\-f\fR appropriées: 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIfile4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
 .TP 
-Pour enregistrer le résultat des lectures, donnez l'option  \fB\-o\fR (utiliser \fB\-f\fR si le nom de fichier ne permet pas à gramps de deviner le format):
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-o\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
+Pour enregistrer le résultat des lectures, donnez l'option  \fB\-e\fR (utiliser \fB\-f\fR si le nom de fichier ne permet pas à gramps de deviner le format):
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-e\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
 .TP 
 Pour lire trois ensembles de données puis lancer une session interactive de gramps sur le tout : 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
@@ -19,7 +19,7 @@ gramps \- Genealogical Research and Analysis Management Programming System.
 .IR FORMAT ]] 
 .RB [ \-i|\-\^\-import= 
 .IR ... ] 
-.RB [ \-o|\-\^\-output= 
+.RB [ \-e|\-\^\-export= 
 .IR FILE
 .RB [ \-f|\-\^\-format= 
 .IR FORMAT ]] 
@@ -64,7 +64,7 @@ Explicitly specify format of \fIFILE\fR given by preceding
 \fB\-O\fR,
 ..
 \fB\-i\fR, or 
-\fB\-o\fR option. If the \fB\-f\fR option is not given for any \fIFILE\fR, 
+\fB\-e\fR option. If the \fB\-f\fR option is not given for any \fIFILE\fR, 
 the format of that file is guessed according to its extension or MIME-type. 
 .br

@@ -113,21 +113,6 @@ i.e. \fB\-i\fR \fIFILE1\fR \fB\-i\fR \fIFILE2\fR
 and \fB\-i\fR \fIFILE2\fR \fB\-i\fR \fIFILE1\fR might produce different 
 gramps IDs in the resulting database. 

-.TP 
-.BI \-o,\-\^\-output= " FILE"
-Export data into \fIFILE\fR. For \fBiso\fR format, the \fIFILE\fR is actually
-the name of directory the gramps database will be written into. 
-For
-.ig
-\fBgrdb\fR,
-..
-\fBgramps\-xml\fR, \fBgedcom\fR, \fBwft\fR, \fBgramps\-pkg\fR, 
-and \fBgeneweb\fR, the \fIFILE\fR is the name of the resulting file. 
-.br
-
-When more than one output file is given, each has to be preceded 
-by \fB\-o\fR flag. The files are written one by one, in the specified order.
-
 .TP 
 .BI \-a,\-\^\-action= " ACTION"
 Perform \fIACTION\fR on the imported data. This is done after all imports
@@ -228,10 +213,10 @@ further command line parameters.
 .LP
 With or without the \fB\-O\fR flag, there could be multiple imports,
 exports, and actions specified further on the command line by using \fB\-i\fR,
-\fB\-o\fR, and \fB\-a\fR flags.  
+\fB\-e\fR, and \fB\-a\fR flags.  

 .LP
-The order of \fB\-i\fR, \fB\-o\fR, or \fB\-a\fR options does not matter. The
+The order of \fB\-i\fR, \fB\-e\fR, or \fB\-a\fR options does not matter. The
 actual order always is: all imports (if any) -> all actions (if any)
 -> all exports (if any). But opening must always be first!

@@ -241,7 +226,7 @@ window and start the usual interactive session with the empty database,
 since there is no data to process, anyway.

 .LP
-If no \fB\-o\fR or \fB\-a\fR options are given, gramps will launch its main 
+If no \fB\-e\fR or \fB\-a\fR options are given, gramps will launch its main 
 window and start the usual interactive session with the database resulted 
 from all imports. This database resides in the \fBimport_db.grdb\fR
 under \fB~/.gramps/import\fR directory.
@@ -266,8 +251,8 @@ To import four databases (whose formats can be determined from their names) and
 To explicitly specify the formats in the above example, append filenames with appropriate \fB\-f\fR options: 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIfile4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
 .TP 
-To record the database resulting from all imports, supply \fB\-o\fR flag (use \fB\-f\fR if the filename does not allow gramps to guess the format):
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-o\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
+To record the database resulting from all imports, supply \fB\-e\fR flag (use \fB\-f\fR if the filename does not allow gramps to guess the format):
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-e\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
 .TP 
 To import three databases and start interactive gramps session with the result: 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
@@ -17,7 +17,7 @@ gramps \- Genealogisch Onderzoek en Analyse Beheersysteem.
 .IR FORMAAT ]] 
 .RB [ \-i|\-\^\-import= 
 .IR ... ] 
-.RB [ \-o|\-\^\-output= 
+.RB [ \-e|\-\^\-export= 
 .IR BESTAND
 .RB [ \-f|\-\^\-format= 
 .IR FORMAAT ]] 
@@ -63,7 +63,7 @@ Expliciet een formaat opgeven voor \fIBESTAND\fR door de optie
 \fB\-O\fR,
 ..
 \fB\-i\fR, of 
-\fB\-o\fR mee te geven. Indien de \fB\-f\fR optie niet opgegeven wordt voor
+\fB\-e\fR mee te geven. Indien de \fB\-f\fR optie niet opgegeven wordt voor
 \fIBESTAND\fR, wordt het formaat gebaseerd op de bestandsextensie of het 
 MIME-type. 
 .br
@@ -106,7 +106,7 @@ and \fB\-i\fR \fIFILE2\fR \fB\-i\fR \fIFILE1\fR might produce different
 gramps IDs in the resulting database. 

 .TP 
-.BI \-o,\-\^\-output= " FILE"
+.BI \-e,\-\^\-export= " FILE"
 Export data into \fIFILE\fR. For \fBiso\fR format, the \fIFILE\fR is actually
 the name of directory the gramps database will be written into. 
 For
@@ -118,7 +118,7 @@ and \fBgeneweb\fR, the \fIFILE\fR is the name of the resulting file.
 .br

 When more than one output file is given, each has to be preceded 
-by \fB\-o\fR flag. The files are written one by one, in the specified order.
+by \fB\-e\fR flag. The files are written one by one, in the specified order.

 .TP 
 .BI \-a,\-\^\-action= " ACTION"
@@ -218,10 +218,10 @@ further command line parameters.
 .LP
 With or without the \fB\-O\fR flag, there could be multiple imports,
 exports, and actions specified further on the command line by using \fB\-i\fR,
-\fB\-o\fR, and \fB\-a\fR flags.  
+\fB\-e\fR, and \fB\-a\fR flags.  

 .LP
-The order of \fB\-i\fR, \fB\-o\fR, or \fB\-a\fR options does not matter. The
+The order of \fB\-i\fR, \fB\-e\fR, or \fB\-a\fR options does not matter. The
 actual order always is: all imports (if any) -> all actions (if any)
 -> all exports (if any). But opening must always be first!

@@ -256,8 +256,8 @@ To import four databases (whose formats can be determined from their names) and
 To explicitly specify the formats in the above example, append filenames with appropriate \fB\-f\fR options: 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIfile4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
 .TP 
-To record the database resulting from all imports, supply \fB\-o\fR flag (use \fB\-f\fR if the filename does not allow gramps to guess the format):
-\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-o\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
+To record the database resulting from all imports, supply \fB\-e\fR flag (use \fB\-f\fR if the filename does not allow gramps to guess the format):
+\fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-e\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
 .TP 
 To import three databases and start interactive gramps session with the result: 
 \fBgramps\fR \fB\-i\fR \fIfile1.ged\fR \fB\-i\fR \fIfile2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
@@ -22,7 +22,7 @@ i Programowego Zarządzania Tą Informacją)
 .IR FORMAT ]] 
 .RB [ \-i|\-\^\-import= 
 .IR ... ] 
-.RB [ \-o|\-\^\-output= 
+.RB [ \-e|\-\^\-export=  
 .IR PLIK
 .RB [ \-f|\-\^\-format= 
 .IR FORMAT ]] 
@@ -66,7 +66,7 @@ Jawne określenie formatu \fIPLIKU\fR przez poprzedzenie opcji
 .ig
 \fB\-O\fR,
 ..
-\fB\-i\fR, lub \fB\-o\fR. 
+\fB\-i\fR, lub \fB\-e\fR. 
 Jeśli opcja \fB\-f\fR nie jest podana dla żadnego \fIPLIKU\fR, 
 to format pliku jest określany na podstawie rozszerzenia albo typu MIME.
 .br
@@ -126,7 +126,7 @@ poleceń, np.:  \fB\-i\fR \fIPLIK1\fR \fB\-i\fR \fIPLIK2\fR oraz
 (gramps ID) w bazie wynikowej.

 .TP 
-.BI \-o,\-\^\-output= " PLIK"
+.BI \-e,\-\^\-export= " PLIK"
 Eksportuje dane do \fIPLIKU\fR. Dla formatu \fBiso\fR, \fIPLIK\fR natomiast
 nazwą katalogu, do którego baza danych gramps zostanie zapisana.
 Dla
@@ -138,7 +138,7 @@ oraz \fBgeneweb\fR, \fIPLIK\fR jest nazwą pliku wynikowego.
 .br

 Kiedy więcej niż jeden plik wyjściowy jest podany, każdy musi być poprzedzony
-flagą \fB\-o\fR. Pliki będą zapisywane kolejno, w podanej przez parametry
+flagą \fB\-e\fR. Pliki będą zapisywane kolejno, w podanej przez parametry
 kolejności.

 .TP 
@@ -248,10 +248,10 @@ z linii komend.

 .LP
 Z flagą \fB\-O\fR czy bez, może występować wiele importów, eksportów oraz
-akcji określonych za pomocą flag \fB\-i\fR, \fB\-o\fR, oraz \fB\-a\fR .  
+akcji określonych za pomocą flag \fB\-i\fR, \fB\-e\fR, oraz \fB\-a\fR .  

 .LP
-Kolejność podawania opcji \fB\-i\fR, \fB\-o\fR, czy \fB\-a\fR nie ma znaczenia.
+Kolejność podawania opcji \fB\-i\fR, \fB\-e\fR, czy \fB\-a\fR nie ma znaczenia.
 Wykonywane są one zawsze w kolejności: wszystkie importy (jeśli podane) -> 
 wszystkie akcje (jeśli podane) -> wszystkie eksporty (jeśli podane)
 Ale otwarcie bazy zawsze musi być na pierwszym parametrem !
@@ -262,7 +262,7 @@ okno i rozpocznie normalną sesję interaktywną z pustą bazą danych (poniewa
 nie zdołał przetworzyć do niej żadnych danych).

 .LP
-Jeśli nie podano opcji\fB\-o\fR albo \fB\-a\fR gramps uruchomi swoje głowne 
+Jeśli nie podano opcji\fB\-e\fR albo \fB\-a\fR gramps uruchomi swoje głowne 
 okno i rozpocznie normalną sesję interaktywną z bazą będącą wynikiem wszystkich importów. Ta baza będzie znajdować się w pliku \fBimport_db.grdb\fR
 w katalogu \fB~/.gramps/import\fR.

@@ -290,8 +290,8 @@ Aby jawnie określić formaty w powyższym przykładzie, należy dodać nazwy pl
 z odpowiednimi opcjami \fB\-f\fR options: 
 \fBgramps\fR \fB\-i\fR \fIplik1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIplik2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIplik4.wft\fR \fB\-f\fR \fIwft\fR  \fB\-a\fR \fIcheck\fR 
 .TP 
-Aby zachować bazę z wynikami wszystkich importów, należy dodać flagę \fB\-o\fR (należy użyć \fB\-f\fR jeśli nazwa pliku nie pozwala gramps'owi na odgadnięcie formatu wyjściowego):
-\fBgramps\fR \fB\-i\fR \fIplik1.ged\fR \fB\-i\fR \fIplik2.tgz\fR \fB\-o\fR \fI~/nowy-pakiet\fR \fB\-f\fR \fIgramps-pkg\fR 
+Aby zachować bazę z wynikami wszystkich importów, należy dodać flagę \fB\-e\fR (należy użyć \fB\-f\fR jeśli nazwa pliku nie pozwala gramps'owi na odgadnięcie formatu wyjściowego):
+\fBgramps\fR \fB\-i\fR \fIplik1.ged\fR \fB\-i\fR \fIplik2.tgz\fR \fB\-e\fR \fI~/nowy-pakiet\fR \fB\-f\fR \fIgramps-pkg\fR 
 .TP 
 W celu zaimportwania trzech baz i rozpoczęcia sesji interaktywnej z wynikiem 
 importu należy użyć polecenia podobnego do poniższego: 
@@ -19,7 +19,7 @@ gramps \- Genealogical Research and Analysis Management Programming System.
 .IR FORMAT ]] 
 .RB [ \-i|\-\^\-import= 
 .IR ... ] 
-.RB [ \-o|\-\^\-output= 
+.RB [ \-e|\-\^\-export= 
 .IR FIL
 .RB [ \-f|\-\^\-format= 
 .IR FORMAT ]] 
@@ -63,7 +63,7 @@ Uttryckligen specificera format på \fIFIL\fR givet av föregående
 \fB\-O\fR,
 ..
 \fB\-i\fR eller 
-\fB\-o\fR-alternativ. Om \fB\-f\fR-alternativet inte ges för någon \fIFIL\fR, 
+\fB\-e\fR-alternativ. Om \fB\-f\fR-alternativet inte ges för någon \fIFIL\fR, 
 gissas filformat för den filen utgående från dess filändelse eller dess MIME-typ. 
 .br

@@ -113,7 +113,7 @@ och \fB\-i\fR \fIFIL2\fR \fB\-i\fR \fIFIL1\fR kan skapa skilda
 gramps IDs i den resulterande databasen. 

 .TP 
-.BI \-o,\-\^\-output= " FIL"
+.BI \-e,\-\^\-export= " FIL"
 Exporterar data till \fIFIL\fR. För \fBiso\fR-format, är \fIFIL\fR i själva verket namnet på den mapp, 
 som gramps databas kommer att skrivas till. 
 För
@@ -124,7 +124,7 @@ För
 och \fBgeneweb\fR, är \fIFIL\fR namnet på resultatfilen. 
 .br

-Om mer är en utdatafil anges, måste varje föregås av en \fB\-o\fR-flagga. 
+Om mer är en utdatafil anges, måste varje föregås av en \fB\-e\fR-flagga. 
 Filerna skrivs en efter en i den givna ordningen.

 .TP 
@@ -220,21 +220,21 @@ och sedan arbeta med dess data, enligt ytterligare instruktioner på kommandorad
 Med eller utan \fB\-O\fRflagga, kan det ske många importeringar,
 exporteringar och åtgärder beskrivna ytterligare på kommanodraden 
 genom att använda \fB\-i\fR-,
-\fB\-o\fR- samt \fB\-a\fR-flaggor. 
+\fB\-e\fR- samt \fB\-a\fR-flaggor. 

 .LP
-Ordningen på \fB\-i\fR-, \fB\-o\fR- eller \fB\-a\fR-alternativen spelar ingen roll. 
+Ordningen på \fB\-i\fR-, \fB\-e\fR- eller \fB\-a\fR-alternativen spelar ingen roll. 
 Den gällande ordningen är alltid: all import (om någon) -> alla åtgärder (om några)
 -> all export (om någon). Men öppning måste alltid ske först!

 .LP
 Om inget \fB\-O\fR- eller \fB\-i\fR-alternativ givits, kommer gramps att starta sitt 
-huvudfönster samt påbörja den valiga interaktiva sessionen med en tom databas,
+huvudfönster samt påbörja den vanliga interaktiva sessionen med en tom databas,
 då hur som helst inget data finns att bearbeta.

 .LP
-Om inget \fB\-o\fR- eller \fB\-a\fR-alternativ givits, kommer gramps att starta sitt 
-huvudfönster samt påbörja den valiga interaktiva sessionen med den databas, som blev 
+Om inget \fB\-e\fR- eller \fB\-a\fR-alternativ givits, kommer gramps att starta sitt 
+huvudfönster samt påbörja den vanliga interaktiva sessionen med den databas, som blev 
 resultet från all import. Denna databas återfinns i \fBimport_db.grdb\fR
 under \fB~/.gramps/import\fR-mappen.

@@ -258,8 +258,8 @@ För att importera fyra databaser (vars format kan avgöras av deras namn) och s
 För att uttryckligen specificera formaten i examplet ovan, lägg till filnamn med passande \fB\-f\fR-alternativ: 
 \fBgramps\fR \fB\-i\fR \fIFIL1.ged\fR \fB\-f\fR \fIgedcom\fR \fB\-i\fR \fIFIL2.tgz\fR \fB\-f\fR \fIgramps-pkg\fR \fB\-i\fR \fI~/db3.gramps\fR \fB\-f\fR \fIgramps-xml\fR \fB\-i\fR \fIFIL4.wft\fR \fB\-f\fR \fIwft\fR \fB\-a\fR \fIcheck\fR 
 .TP 
-För att spara den databas, som är resultat av all import, ange \fB\-o\fR-flagga (använd \fB\-f\fR om filnamnet inte tillåter gramps att gissa dess format):
-\fBgramps\fR \fB\-i\fR \fIFIL1.ged\fR \fB\-i\fR \fIFIL2.tgz\fR \fB\-o\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
+För att spara den databas, som är resultat av all import, ange \fB\-e\fR-flagga (använd \fB\-f\fR om filnamnet inte tillåter gramps att gissa dess format):
+\fBgramps\fR \fB\-i\fR \fIFIL1.ged\fR \fB\-i\fR \fIFIL2.tgz\fR \fB\-e\fR \fI~/new-package\fR \fB\-f\fR \fIgramps-pkg\fR 
 .TP 
 För att importera tre databaser och påbörja en interaklive gramps-session med importresultatet: 
 \fBgramps\fR \fB\-i\fR \fIFIL1.ged\fR \fB\-i\fR \fIFIL2.tgz\fR \fB\-i\fR \fI~/db3.gramps\fR 
@@ -68,7 +68,6 @@ Application options
  -O, --open=FAMILY_TREE                 Open family tree
  -i, --import=FILENAME                  Import file
  -e, --export=FILENAME                  Export file
-  -o, --output=FILENAME                  Write file
  -f, --format=FORMAT                    Specify format
  -a, --action=ACTION                    Specify action
  -p, --options=OPTIONS_STRING           Specify options
@@ -81,7 +80,7 @@ Application options
 #-------------------------------------------------------------------------
 # ArgHandler
 #-------------------------------------------------------------------------
-class ArgHandler:
+class ArgHandler(object):
    """
    This class is responsible for handling command line arguments (if any)
    given to gramps. The valid arguments are:
@@ -102,10 +101,10 @@ class ArgHandler:
    If no filename or -i option is given, a new interactive session (empty
    database) is launched, since no data is given anyway.
    
-    If -O or -i option is given, but no -o or -a options are given, an
+    If -O or -i option is given, but no -e or -a options are given, an
    interactive session is launched with the FILE (specified with -i). 
    
-    If both input (-O or -i) and processing (-o or -a) options are given,
+    If both input (-O or -i) and processing (-e or -a) options are given,
    interactive session will not be launched. 
    """

@@ -76,7 +76,7 @@ def fill_entry(entry, data_list):
 # StandardCustomSelector class
 #
 #-------------------------------------------------------------------------
-class StandardCustomSelector:
+class StandardCustomSelector(object):
    """
    This class provides an interface to selecting from the predefined
    options or entering custom string.
@@ -138,7 +138,7 @@ def cnv2color(text):
 # PaperSize
 #
 #------------------------------------------------------------------------
-class PaperSize:
+class PaperSize(object):
    """
    Defines the dimensions of a sheet of paper. All dimensions are in
    centimeters.
@@ -188,7 +188,7 @@ class PaperSize:
 # PaperStyle
 #
 #------------------------------------------------------------------------
-class PaperStyle:
+class PaperStyle(object):
    """
    Define the various options for a sheet of paper.
    """
@@ -301,7 +301,7 @@ class PaperStyle:
 # FontStyle
 #
 #------------------------------------------------------------------------
-class FontStyle:
+class FontStyle(object):
    """
    Defines a font style. Controls the font face, size, color, and
    attributes. In order to remain generic, the only font faces available
@@ -415,7 +415,7 @@ class FontStyle:
 # TableStyle
 #
 #------------------------------------------------------------------------
-class TableStyle:
+class TableStyle(object):
    """
    Specifies the style or format of a table. The TableStyle contains the
    characteristics of table width (in percentage of the full width), the
@@ -498,7 +498,7 @@ class TableStyle:
 # TableCellStyle
 #
 #------------------------------------------------------------------------
-class TableCellStyle:
+class TableCellStyle(object):
    """
    Defines the style of a particular table cell. Characteristics are:
    right border, left border, top border, bottom border, and padding.
@@ -592,7 +592,7 @@ class TableCellStyle:
 # ParagraphStyle
 #
 #------------------------------------------------------------------------
-class ParagraphStyle:
+class ParagraphStyle(object):
    """
    Defines the characteristics of a paragraph. The characteristics are:
    font (a FontStyle instance), right margin, left margin, first indent,
@@ -885,7 +885,7 @@ class ParagraphStyle:
 # StyleSheetList
 #
 #------------------------------------------------------------------------
-class StyleSheetList:
+class StyleSheetList(object):
    """
    Interface into the user's defined style sheets. Each StyleSheetList
    has a predefined default style specified by the report. Additional
@@ -1013,7 +1013,7 @@ class StyleSheetList:
 # StyleSheet
 #
 #------------------------------------------------------------------------
-class StyleSheet:
+class StyleSheet(object):
    """
    A collection of named paragraph styles.
    """
@@ -1239,7 +1239,7 @@ class SheetParser(handler.ContentHandler):
 # GraphicsStyle
 #
 #------------------------------------------------------------------------
-class GraphicsStyle:
+class GraphicsStyle(object):
    """
    Defines the properties of graphics objects, such as line width,
    color, fill, ect.
@@ -1318,7 +1318,7 @@ class GraphicsStyle:
 # IndexMark
 #
 #------------------------------------------------------------------------
-class IndexMark:
+class IndexMark(object):
    """
    Defines a mark to be associated with text for indexing.
    """
@@ -1335,7 +1335,7 @@ class IndexMark:
 # BaseDoc
 #
 #------------------------------------------------------------------------
-class BaseDoc:
+class BaseDoc(object):
    """
    Base class for document generators. Different output formats,
    such as OpenOffice, AbiWord, and LaTeX are derived from this base
@@ -1412,7 +1412,7 @@ class BaseDoc:
 def noescape(text):
    return text
    
-class TextDoc:
+class TextDoc(object):
    """
    Abstract Interface for text document generators. Output formats for
    text reports must implment this interface to be used by the report 
@@ -1677,6 +1677,8 @@ class TextDoc:
                is <b>text</b><i><b> here</b> not</i>
               overwrite this method if this complexity is not needed. 
        """
+        #unicode text most be sliced correctly
+        text=unicode(text)
        FIRST = 0
        LAST = 1
        tagspos = {}
@@ -1707,7 +1709,7 @@ class TextDoc:
                    #make sure text can split
                    splitpos = text[start:pos].find(split)
                    while splitpos <> -1:
-                        otext += self.ESCAPE_FUNC()(text[start:splitpos])
+                        otext += self.ESCAPE_FUNC()(text[start:start+splitpos])
                        #close open tags
                        opentags.reverse()
                        for opentag in opentags:
@@ -1760,7 +1762,7 @@ class TextDoc:
 # DrawDoc
 #
 #------------------------------------------------------------------------
-class DrawDoc:
+class DrawDoc(object):
    """
    Abstract Interface for graphical document generators. Output formats
    for graphical reports must implment this interface to be used by the
@@ -1820,7 +1822,7 @@ class DrawDoc:
 # GVDoc
 #
 #-------------------------------------------------------------------------------
-class GVDoc:
+class GVDoc(object):
    """
    Abstract Interface for Graphviz document generators. Output formats
    for Graphviz reports must implment this interface to be used by the
@@ -86,7 +86,7 @@ def _make_cmp(a,b): return -cmp(a[1], b[1])
 # NameDisplay class
 #
 #-------------------------------------------------------------------------
-class NameDisplay:
+class NameDisplay(object):
    """
    Base class for displaying of Name instances.
    """
@@ -40,7 +40,7 @@ import time
 # Callback updater
 #
 #-------------------------------------------------------------------------
-class UpdateCallback:
+class UpdateCallback(object):
    """
    Basic class providing way of calling the callback to update
    things during lenghty operations.
@@ -428,6 +428,8 @@ class NoteBookmarks(ListBookmarks) :
    def make_label(self, handle):
        obj = self.dbstate.db.get_note_from_handle(handle)
        name = obj.get().replace('\n', ' ')
+        #String must be unicode for truncation to work for non ascii characters
+        name = unicode(name)
        if len(name) > 40:
            name = name[:40]+"..."
        return ("%s [%s]" % (name, obj.gramps_id), obj)
@@ -127,6 +127,8 @@ PEDVIEW_TREESIZE     = ('interface', 'pedview-tree-size', 1)
 PEDVIEW_LAYOUT       = ('interface', 'pedview-layout', 1)
 PEDVIEW_SHOW_MARRIAGE= ('interface', 'pedview-show-marriage', 0)
 PEDVIEW_SHOW_IMAGES  = ('interface', 'pedview-show-images', 0)
+CLIPBOARD_WIDTH      = ('interface', 'clipboard-width', 1)
+CLIPBOARD_HEIGHT     = ('interface', 'clipboard-height', 1)
 DATABASE_PATH        = ('behavior', 'database-path', 2)
 FPREFIX              = ('preferences', 'fprefix', 2)
 EPREFIX              = ('preferences', 'eprefix', 2)
@@ -272,6 +274,8 @@ default_value = {
    PERSON_SEL_HEIGHT    : 450,
    MEDIA_SEL_WIDTH      : 600,
    MEDIA_SEL_HEIGHT     : 450,
+    CLIPBOARD_WIDTH      : 300,
+    CLIPBOARD_HEIGHT     : 300,
    FILTER               : False, 
    PEDVIEW_TREESIZE     : 0,
    PEDVIEW_LAYOUT       : 0,
@@ -42,7 +42,7 @@ def make_bool(val):
    else:
        return True

-class IniKeyClient:
+class IniKeyClient(object):
    """ Class to emulate gconf's client """
    def __init__(self, filename = None):
        """ Constructor takes an optional filename """
@@ -199,13 +199,19 @@ class FamilyListView(PageView.ListView):
            pass

    def remove(self, obj):
-        self.uistate.set_busy_cursor(1)
-        import gen.utils
-        
-        for handle in self.selected_handles():
-            gen.utils.remove_family_relationships(self.dbstate.db, handle)
-        self.build_tree()
-        self.uistate.set_busy_cursor(0)
+         from QuestionDialog import QuestionDialog2
+         from Utils import data_recover_msg
+         msg = _('Deleting item will remove it from the database.')
+         msg = msg + '\n' + data_recover_msg
+         q = QuestionDialog2(_('Delete %s?') % _('family'), msg,
+                                        _('_Delete Item'), _('Cancel'))
+         if q.run():
+             self.uistate.set_busy_cursor(1)
+             import gen.utils
+             for handle in self.selected_handles():
+                     gen.utils.remove_family_relationships(self.dbstate.db, handle)
+             self.build_tree()
+             self.uistate.set_busy_cursor(0)
    
    def edit(self, obj):
        for handle in self.selected_handles():
@@ -174,8 +174,7 @@ def make_requested_gramplet(viewpage, name, opts, dbstate, uistate):
        if msg is None:
            msg = _("Drag Properties Button to move and click it for setup")
        if msg:
-            gui.tooltips = gtk.Tooltips()
-            gui.tooltips.set_tip(gui.scrolledwindow, msg)
+            gui.scrolledwindow.set_tooltip_text(msg)
            gui.tooltips_text = msg
        gui.make_gui_options()
        gui.gvoptions.hide()
@@ -211,7 +210,7 @@ class GrampletWindow(ManagedWindow.ManagedWindow):
        """
        self.title = gramplet.title + " " + _("Gramplet")
        self.gramplet = gramplet
-        ManagedWindow.ManagedWindow.__init__(self, gramplet.uistate, [], self.__class__)
+        ManagedWindow.ManagedWindow.__init__(self, gramplet.uistate, [], self.title)
        self.set_window(gtk.Dialog("",gramplet.uistate.window,
                                   gtk.DIALOG_DESTROY_WITH_PARENT,
                                   (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)),
@@ -585,8 +584,7 @@ class Gramplet(object):
        """
        from PluginUtils import make_gui_option
        #tooltips, dbstate, uistate, track
-        widget, label = make_gui_option(option, None, self.dbstate, 
-                                        self.uistate,None)
+        widget, label = make_gui_option(option, self.dbstate, self.uistate,None)
        self.option_dict.update({option.get_label(): (widget, option)})
        self.option_order.append(option.get_label())

@@ -600,7 +598,7 @@ class Gramplet(object):
    def save_options(self):
        pass

-class GuiGramplet:
+class GuiGramplet(object):
    """
    Class that handles the plugin interfaces for the GrampletView.
    """
@@ -949,13 +947,10 @@ class GuiGramplet:
            else:
                tag.set_property('underline', pango.UNDERLINE_NONE)
        view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(cursor)
-        if self.tooltips:
-            if ttip:
-                self.tooltips.set_tip(self.scrolledwindow, 
-                                          ttip)
-            else:
-                self.tooltips.set_tip(self.scrolledwindow, 
-                                          self.tooltips_text)
+        if ttip:
+            self.scrolledwindow.set_tooltip_text(ttip)
+        elif self.tooltips_text:
+            self.scrolledwindow.set_tooltip_text(self.tooltips_text)
        return False # handle event further, if necessary

    def on_button_press(self, view, event):
@@ -1101,8 +1096,7 @@ class GrampletView(PageView.PersonNavView):
        # build the GUI:
        frame = MyScrolledWindow()
        msg = _("Right click to add gramplets")
-        self.tooltips = gtk.Tooltips()
-        self.tooltips.set_tip(frame, msg)
+        frame.set_tooltip_text(msg)
        frame.viewpage = self
        frame.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
        self.hbox = gtk.HBox(homogeneous=True)
@@ -1572,15 +1566,14 @@ class GrampletView(PageView.PersonNavView):
            ag_menu = self.uistate.uimanager.get_widget('/Popup/AddGramplet')
            if ag_menu:
                qr_menu = ag_menu.get_submenu()
-                if qr_menu is None:
-                    qr_menu = gtk.Menu()
-                    names = [AVAILABLE_GRAMPLETS[key]["tname"] for key 
-                             in AVAILABLE_GRAMPLETS.keys()]
-                    names.sort()
-                    for name in names:
-                        Utils.add_menuitem(qr_menu, name, 
-                                           None, self.add_gramplet)
-                    self.uistate.uimanager.get_widget('/Popup/AddGramplet').set_submenu(qr_menu)
+                qr_menu = gtk.Menu()
+                names = [AVAILABLE_GRAMPLETS[key]["tname"] for key 
+                         in AVAILABLE_GRAMPLETS.keys()]
+                names.sort()
+                for name in names:
+                    Utils.add_menuitem(qr_menu, name, 
+                                       None, self.add_gramplet)
+                self.uistate.uimanager.get_widget('/Popup/AddGramplet').set_submenu(qr_menu)
            rg_menu = self.uistate.uimanager.get_widget('/Popup/RestoreGramplet')
            if rg_menu:
                qr_menu = rg_menu.get_submenu()
@@ -152,7 +152,7 @@ class GuideMap(gtk.DrawingArea):
        return (px,py)

 # Map tile files used by the ZoomMap
-class MapTile:
+class MapTile(object):
    def __init__( self, filename, x, y, w, h, pw, ph):
        self.filename = filename
        self.full_path = os.path.join(const.IMAGE_DIR,filename)
@@ -226,7 +226,7 @@ class MapTile:
        self.scale = None
        self.scaled_pixbuf = None

-class WMSMapTile:
+class WMSMapTile(object):
    def __init__(self,capabilities,change_cb=None):
        self.change_cb = change_cb
        self.scaled_pixbuf = None
@@ -275,13 +275,11 @@ class MediaView(PageView.ListView):
        ebox = gtk.EventBox()
        ebox.add(self.image)
        ebox.connect('button-press-event', self.button_press_event)
+        ebox.set_tooltip_text(
+            _('Double click image to view in an external viewer'))
        vbox.pack_start(ebox, False)
        vbox.pack_start(base, True)

-        self.ttips = gtk.Tooltips()
-        self.ttips.set_tip(
-            ebox, _('Double click image to view in an external viewer'))
-
        self.selection.connect('changed', self.row_change)
        self._set_dnd()
        return vbox
@@ -314,13 +312,11 @@ class MediaView(PageView.ListView):
        handle = self.first_selected()
        if not handle:
            self.image.clear()
-            self.ttips.disable()
        else:
            obj = self.dbstate.db.get_object_from_handle(handle)
            pix = ThumbNails.get_thumbnail_image(
                        Utils.media_path_full(self.dbstate.db, obj.get_path()))
            self.image.set_from_pixbuf(pix)
-            self.ttips.enable()
    
    def ui_definition(self):
        """
@@ -357,7 +357,7 @@ class PersonBoxWidget( gtk.DrawingArea, _PersonWidget_base):
        else:
            self.window.draw_rectangle(self.border_gc, False, 0, 0, alloc.width-4, alloc.height-4)

-class FormattingHelper:
+class FormattingHelper(object):
    def __init__(self,dbstate):
        self.dbstate = dbstate
        self._text_cache = {}
@@ -367,7 +367,9 @@ class FormattingHelper:
        text = ""
        for event_ref in family.get_event_ref_list():
            event = self.dbstate.db.get_event_from_handle(event_ref.ref)
-            if event and event.get_type() == gen.lib.EventType.MARRIAGE:
+            if event and event.get_type() == gen.lib.EventType.MARRIAGE and \
+            (event_ref.get_role() == gen.lib.EventRoleType.FAMILY or 
+            event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
                if line_count < 3:
                    return DateHandler.get_date(event)
                name = str(event.get_type())
@@ -527,8 +529,6 @@ class PedigreeView(PageView.PersonNavView):
        contains the interface. This containter will be inserted into
        a gtk.Notebook page.
        """
-        self.tooltips = gtk.Tooltips()
-        self.tooltips.enable()
        
        self.notebook = gtk.Notebook()
        self.notebook.connect("button-press-event", self.bg_button_press_cb)
@@ -747,7 +747,8 @@ class PedigreeView(PageView.PersonNavView):
                    ((8,26,3,1),None,None),
                    ((8,28,3,1),None,None),
                    ((8,30,3,1),None,None),)
-        elif self.tree_style == 0:
+        else:
+        #elif self.tree_style == 0:
            pos_2 =(((0,0,1,3),(1,0,3),(2,1,1,1)),
                    ((2,0,1,1),None,None),
                    ((2,2,1,1),None,None))
@@ -876,7 +877,7 @@ class PedigreeView(PageView.PersonNavView):
                else:
                    pw = PersonBoxWidget( self, self.format_helper, lst[i][0], lst[i][3], positions[i][0][3], image);
                if positions[i][0][3] < 7:
-                    self.tooltips.set_tip(pw, self.format_helper.format_person(lst[i][0], 11))
+                    pw.set_tooltip_text(self.format_helper.format_person(lst[i][0], 11))

                pw.connect("button-press-event", self.person_button_press_cb,lst[i][0].get_handle())
                if positions[i][0][2] > 1:
@@ -944,7 +945,7 @@ class PedigreeView(PageView.PersonNavView):
                if lst[i] and lst[i][2]:
                    line.add_events(gtk.gdk.ENTER_NOTIFY_MASK)  # Required for tooltip and mouse-over
                    line.add_events(gtk.gdk.LEAVE_NOTIFY_MASK)  # Required for tooltip and mouse-over
-                    self.tooltips.set_tip(line, self.format_helper.format_relation(lst[i][2], 11))
+                    line.set_tooltip_text(self.format_helper.format_relation(lst[i][2], 11))
                if lst[i*2+1]:
                    line.set_data("frela", lst[i*2+1][1])
                if lst[i*2+2]:
@@ -978,7 +979,7 @@ class PedigreeView(PageView.PersonNavView):
            childlist = find_children(self.dbstate.db,lst[0][0])
            if childlist:
                l.connect("clicked",self.on_show_child_menu)
-                self.tooltips.set_tip(l, _("Jump to child..."))
+                l.set_tooltip_text(_("Jump to child..."))
            else:
                l.set_sensitive(False)
            ymid = int(math.floor(ymax/2))
@@ -987,7 +988,7 @@ class PedigreeView(PageView.PersonNavView):
            l.add(gtk.Arrow(gtk.ARROW_RIGHT, gtk.SHADOW_IN))
            if lst[1]:
                l.connect("clicked",self.on_childmenu_changed,lst[1][0].handle)
-                self.tooltips.set_tip(l, _("Jump to father"))
+                l.set_tooltip_text(("Jump to father"))
            else:
                l.set_sensitive(False)
            ymid = int(math.floor(ymax/4))
@@ -996,7 +997,7 @@ class PedigreeView(PageView.PersonNavView):
            l.add(gtk.Arrow(gtk.ARROW_RIGHT, gtk.SHADOW_IN))
            if lst[2]:
                l.connect("clicked",self.on_childmenu_changed,lst[2][0].handle)
-                self.tooltips.set_tip(l, _("Jump to mother"))
+                l.set_tooltip_text(("Jump to mother"))
            else:
                l.set_sensitive(False)
            ymid = int(math.floor(ymax/4*3))
@@ -31,6 +31,7 @@ PersonView interface.
 #------------------------------------------------------------------------

 import cPickle as pickle
+import time

 #-------------------------------------------------------------------------
 #
@@ -41,6 +42,14 @@ import gtk
 import pango
 from gtk.gdk import ACTION_COPY, BUTTON1_MASK

+#-------------------------------------------------------------------------
+#
+# set up logging
+#
+#-------------------------------------------------------------------------
+import logging
+_LOG = logging.getLogger(".gui.personview")
+
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
@@ -518,6 +527,7 @@ class PersonView(PageView.PersonNavView):
        since it can change when rows are unselected when the model is set.
        """
        if self.active:
+            cput = time.clock()
            if Config.get(Config.FILTER):
                filter_info = (PeopleModel.GENERIC, self.generic_filter)
            else:
@@ -525,7 +535,9 @@ class PersonView(PageView.PersonNavView):

            self.model = PeopleModel(self.dbstate.db, filter_info, skip)
            active = self.dbstate.active
+            cput1 = time.clock()
            self.tree.set_model(self.model)
+            cput2 = time.clock()

            if const.USE_TIPS and self.model.tooltip_column is not None:
                self.tooltips = TreeTips.TreeTips(self.tree, 
@@ -539,6 +551,9 @@ class PersonView(PageView.PersonNavView):
            self.uistate.show_filter_results(self.dbstate, 
                                             self.model.displayed, 
                                             self.model.total)
+            _LOG.debug(self.__class__.__name__ + ' build_tree ' +
+                    str(time.clock() - cput) + ' sec')
+            _LOG.debug(' setting model ' + str(cput2 - cput1) + ' sec')
        else:
            self.dirty = True

@@ -710,6 +725,7 @@ class PersonView(PageView.PersonNavView):
        if not self.model:
            return
        if self.active:
+            cput = time.clock()
            self.dirty = False
            for node in set(handle_list):
                person = self.dbstate.db.get_person_from_handle(node)
@@ -729,6 +745,8 @@ class PersonView(PageView.PersonNavView):
                path = self.model.on_get_path(node)
                pnode = self.model.get_iter(path)
                self.model.row_inserted(path, pnode)
+            _LOG.debug(self.__class__.__name__ + ' person_added ' +
+                str(time.clock() - cput) + ' sec')
        else:
            self.dirty = True

@@ -745,6 +763,7 @@ class PersonView(PageView.PersonNavView):
        if not self.model:
            return

+        cput = time.clock()
        expand = []
        self.tree.map_expanded_rows(self.func, expand)

@@ -753,11 +772,14 @@ class PersonView(PageView.PersonNavView):
            path = self.model.mapper.top_iter2path.get(i)
            if path:
                self.tree.expand_row(path, False)
+        _LOG.debug(self.__class__.__name__ + ' person_removed ' +
+                str(time.clock() - cput) + ' sec')
            
    def person_updated(self, handle_list):
        if not self.model:
            return
        
+        cput = time.clock()
        self.model.clear_cache()
        for node in handle_list:
            person = self.dbstate.db.get_person_from_handle(node)
@@ -796,6 +818,8 @@ class PersonView(PageView.PersonNavView):
                break
            
        self.goto_active_person()
+        _LOG.debug(self.__class__.__name__ + ' person_updated ' +
+                str(time.clock() - cput) + ' sec')

    def get_selected_objects(self):
        (mode, paths) = self.selection.get_selected_rows()
@@ -173,15 +173,11 @@ class PlaceView(PageView.ListView):
                widget.set_menu(mmenu)
                if gtk.pygtk_version >= (2, 12, 0):
                    widget.set_arrow_tooltip_text(actionservices.arrowtooltip)
-                hbox=gtk.HBox()
-                img = gtk.Image()
-                img.set_from_stock(gtk.STOCK_JUMP_TO, 
-                                   gtk.ICON_SIZE_LARGE_TOOLBAR)
-                hbox.pack_start(img)
-                self.mapslistlabel.append(gtk.Label(self.mapservice_label()))
-                hbox.pack_start(self.mapslistlabel[-1])
-                hbox.show_all()
-                widget.set_icon_widget(hbox)
+                lbl = gtk.Label(self.mapservice_label())
+                lbl.show()
+                self.mapslistlabel.append(lbl)
+                widget.set_label_widget(self.mapslistlabel[-1])
+                widget.set_stock_id(gtk.STOCK_JUMP_TO)

    def __create_maps_menu_actions(self):
        """
@@ -223,6 +219,13 @@ class PlaceView(PageView.ListView):
        """
        Run the map service 
        """
+        #First test if any map service is available
+        if not len(self.mapservicedata):
+            msg = _("No map service is available.")
+            msg2 = _("Check your installation.")
+            ErrorDialog(msg, msg2)
+            return
+
        place_handles = self.selected_handles()
        try:
            place_handle = self.selected_handles()[0]
@@ -1,6 +1,7 @@
-
+# Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2001-2007  Donald N. Allingham
+# Copyright (C) 2009       Gary Burton
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -91,10 +92,11 @@ _SDATA_START  = 2
 _SDATA_STOP   = 4
 _RETURN = gtk.gdk.keyval_from_name("Return")
 _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")
+_SPACE = gtk.gdk.keyval_from_name("space")
 _LEFT_BUTTON = 1
 _RIGHT_BUTTON = 3

-class AttachList:
+class AttachList(object):

    def __init__(self):
        self.list = []
@@ -130,6 +132,7 @@ class RelationshipView(PageView.PersonNavView):

        self.color = gtk.TextView().style.white
        self.child = None
+        self.old_handle = None

        Config.client.notify_add("/apps/gramps/preferences/relation-shade",
                                 self.shade_update)
@@ -417,12 +420,19 @@ class RelationshipView(PageView.PersonNavView):
            return True

    def _change_person(self, obj):
+        if obj == self.old_handle:
+            #same object, keep present scroll position
+            old_vadjust = self.scroll.get_vadjustment().value
+            self.old_handle = obj
+        else:
+            #different object, scroll to top
+            old_vadjust = self.scroll.get_vadjustment().lower
+            self.old_handle = obj
        self.scroll.get_vadjustment().value = \
                            self.scroll.get_vadjustment().lower
        if self.redrawing:
            return False
        self.redrawing = True
-        self.tooltips = gtk.Tooltips()

        for old_child in self.vbox.get_children():
            self.vbox.remove(old_child)
@@ -503,6 +513,8 @@ class RelationshipView(PageView.PersonNavView):
        self.child.show_all()

        self.vbox.pack_start(self.child, False)
+        #reset scroll position as it was before
+        self.scroll.get_vadjustment().value = old_vadjust
        self.redrawing = False
        self.uistate.modify_statusbar(self.dbstate)

@@ -528,7 +540,7 @@ class RelationshipView(PageView.PersonNavView):
        if Config.get(Config.RELEDITBTN):
            button = widgets.IconButton(self.edit_button_press, 
                                        person.handle)
-            self.tooltips.set_tip(button, _('Edit %s') % name)
+            button.set_tooltip_text(_('Edit %s') % name)
        else:
            button = None
        hbox = widgets.LinkBox(label, button)
@@ -745,30 +757,30 @@ class RelationshipView(PageView.PersonNavView):
            if not self.toolbar_visible and not self.dbstate.db.readonly:
                # Show edit-Buttons if toolbar is not visible
                if self.reorder_sensitive:
-                    add = widgets.IconButton(self.reorder, None, 
+                    add = widgets.IconButton(self.reorder_button_press, None, 
                                             gtk.STOCK_SORT_ASCENDING)
-                    self.tooltips.set_tip(add, ord_msg)
+                    add.set_tooltip_text(ord_msg)
                    hbox.pack_start(add, False)

                add = widgets.IconButton(call_fcn, None, gtk.STOCK_ADD)
-                self.tooltips.set_tip(add, add_msg)
+                add.set_tooltip_text(add_msg)
                hbox.pack_start(add, False)

                if is_parent:
                    add = widgets.IconButton(self.select_family, None,
                                             gtk.STOCK_INDEX)
-                    self.tooltips.set_tip(add, sel_msg)
+                    add.set_tooltip_text(sel_msg)
                    hbox.pack_start(add, False)

            if family:
                edit = widgets.IconButton(self.edit_family, family.handle, 
                                          gtk.STOCK_EDIT)
-                self.tooltips.set_tip(edit, edit_msg)
+                edit.set_tooltip_text(edit_msg)
                hbox.pack_start(edit, False)
                if not self.dbstate.db.readonly:
                    delete = widgets.IconButton(del_fcn, family.handle, 
                                                gtk.STOCK_REMOVE)
-                    self.tooltips.set_tip(delete, del_msg)
+                    delete.set_tooltip_text(del_msg)
                    hbox.pack_start(delete, False)
            self.attach.attach(hbox, _BTN_START, _BTN_STOP, self.row, self.row+1)
        self.row += 1
@@ -873,13 +885,11 @@ class RelationshipView(PageView.PersonNavView):
                    addchild = widgets.IconButton(self.add_child_to_fam, 
                                                  family.handle, 
                                                  gtk.STOCK_ADD)
-                    self.tooltips.set_tip(addchild, 
-                                          _('Add new child to family'))
+                    addchild.set_tooltip_text(_('Add new child to family'))
                    selchild = widgets.IconButton(self.sel_child_to_fam, 
                                                  family.handle, 
                                                  gtk.STOCK_INDEX)
-                    self.tooltips.set_tip(selchild, 
-                                          _('Add existing child to family'))
+                    selchild.set_tooltip_text(_('Add existing child to family'))
                    hbox.pack_start(addchild, False)
                    hbox.pack_start(selchild, False)

@@ -901,7 +911,7 @@ class RelationshipView(PageView.PersonNavView):
                        eventbox.modify_bg(gtk.STATE_NORMAL, self.color)
                    eventbox.add(vbox)
                    self.attach.attach(
-                        eventbox, _CDATA_START-1, _CDATA_STOP-1, self.row,
+                        eventbox, _CDATA_START-1, _CDATA_STOP, self.row,
                        self.row+1)

            self.row += 1
@@ -923,7 +933,7 @@ class RelationshipView(PageView.PersonNavView):
                if Config.get(Config.RELEDITBTN):
                    button = widgets.IconButton(self.edit_button_press, 
                                                handle)
-                    self.tooltips.set_tip(button, _('Edit %s') % name[0])
+                    button.set_tooltip_text(('Edit %s') % name[0])
                else:
                    button = None
                vbox.pack_start(widgets.LinkBox(link_label, button),
@@ -976,7 +986,7 @@ class RelationshipView(PageView.PersonNavView):
                link_label.modify_bg(gtk.STATE_NORMAL, self.color)
            if Config.get(Config.RELEDITBTN):
                button = widgets.IconButton(self.edit_button_press, handle)
-                self.tooltips.set_tip(button, _('Edit %s') % name[0])
+                button.set_tooltip_text(_('Edit %s') % name[0])
            else:
                button = None
            vbox.pack_start(widgets.LinkBox(link_label, button))
@@ -1063,7 +1073,7 @@ class RelationshipView(PageView.PersonNavView):
        link_label.set_padding(3, 0)
        if child_should_be_linked and Config.get(Config.RELEDITBTN):
            button = widgets.IconButton(self.edit_button_press, handle)
-            self.tooltips.set_tip(button, _('Edit %s') % name[0])
+            button.set_tooltip_text(_('Edit %s') % name[0])
        else:
            button = None

@@ -1094,7 +1104,7 @@ class RelationshipView(PageView.PersonNavView):
            return None

        birth = ReportUtils.get_birth_or_fallback(self.dbstate.db, person)
-        if birth and birth.get_type != gen.lib.EventType.BIRTH:
+        if birth and birth.get_type() != gen.lib.EventType.BIRTH:
            sdate = DateHandler.get_date(birth)
            if sdate:
                bdate  = "<i>%s</i>" % cgi.escape(sdate)
@@ -1106,7 +1116,7 @@ class RelationshipView(PageView.PersonNavView):
            bdate = ""

        death = ReportUtils.get_death_or_fallback(self.dbstate.db, person)
-        if death and death.get_type != gen.lib.EventType.DEATH:
+        if death and death.get_type() != gen.lib.EventType.DEATH:
            sdate = DateHandler.get_date(death)
            if sdate:
                ddate  = "<i>%s</i>" % cgi.escape(sdate)
@@ -1199,7 +1209,9 @@ class RelationshipView(PageView.PersonNavView):
        for event_ref in family.get_event_ref_list():
            handle = event_ref.ref
            event = self.dbstate.db.get_event_from_handle(handle)
-            if event.get_type() == gen.lib.EventType.MARRIAGE:
+            if event and event.get_type() == gen.lib.EventType.MARRIAGE and \
+            (event_ref.get_role() == gen.lib.EventRoleType.FAMILY or 
+            event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
                self.write_event_ref(vbox, _('Marriage'), event)
                value = True
        return value
@@ -1331,13 +1343,11 @@ class RelationshipView(PageView.PersonNavView):
                addchild = widgets.IconButton(self.add_child_to_fam, 
                                              family.handle, 
                                              gtk.STOCK_ADD)
-                self.tooltips.set_tip(addchild, 
-                                      _('Add new child to family'))
+                addchild.set_tooltip_text(_('Add new child to family'))
                selchild = widgets.IconButton(self.sel_child_to_fam, 
                                              family.handle, 
                                              gtk.STOCK_INDEX)
-                self.tooltips.set_tip(selchild, 
-                                      _('Add existing child to family'))
+                selchild.set_tooltip_text(_('Add existing child to family'))
                hbox.pack_start(addchild, False)
                hbox.pack_start(selchild, False)
                self.attach.attach(
@@ -1358,7 +1368,7 @@ class RelationshipView(PageView.PersonNavView):
                    eventbox.modify_bg(gtk.STATE_NORMAL, self.color)
                eventbox.add(vbox)
                self.attach.attach(
-                    eventbox, _CDATA_START-1, _CDATA_STOP-1, self.row,
+                    eventbox, _CDATA_START-1, _CDATA_STOP, self.row,
                    self.row+1)
                self.row += 1

@@ -1561,6 +1571,10 @@ class RelationshipView(PageView.PersonNavView):
    def change_to(self, obj, handle):
        self.dbstate.change_active_handle(handle)

+    def reorder_button_press(self, obj, event, handle):
+        if button_activated(event, _LEFT_BUTTON):
+            self.reorder(obj)
+            
    def reorder(self, obj, dumm1=None, dummy2=None):
        if self.dbstate.active:
            try:
@@ -1590,7 +1604,7 @@ def button_activated(event, mouse_button):
    if (event.type == gtk.gdk.BUTTON_PRESS and \
        event.button == mouse_button) or \
       (event.type == gtk.gdk.KEY_PRESS and \
-        event.keyval in (_RETURN, _KP_ENTER)):
+        event.keyval in (_RETURN, _KP_ENTER, _SPACE)):
        return True
    else:
        return False
@@ -105,7 +105,7 @@ WIKI_HELP_SEC = _('manual|Editing_Dates')
 # DateEdit
 #
 #-------------------------------------------------------------------------
-class DateEdit:
+class DateEdit(object):
    """Class that associates a pixmap with a text widget, providing visual
    feedback that indicates if the text widget contains a valid date"""

@@ -9,19 +9,20 @@ pkgdata_PYTHON = \
        _Date_ca.py\
 	_Date_cs.py\
 	_Date_de.py\
-	_Date_ru.py\
-	_Date_lt.py\
-	_Date_fr.py\
 	_Date_es.py\
 	_Date_fi.py\
-	_Date_sv.py\
-	_Date_nb.py\
-	_Date_nl.py\
-	_Date_sk.py\
-	_Date_pl.py\
-	_Date_pt.py\
+	_Date_fr.py\
        _Date_hr.py\
 	_Date_it.py\
+	_Date_lt.py\
+	_Date_nb.py\
+	_Date_nl.py\
+	_Date_pl.py\
+	_Date_pt.py\
+	_Date_ru.py\
+	_Date_sk.py\
+	_Date_sr.py\
+	_Date_sv.py\
 	_DateDisplay.py\
 	_DateParser.py\
 	_DateHandler.py\
@@ -46,7 +46,7 @@ import GrampsLocale
 # DateDisplay
 #
 #-------------------------------------------------------------------------
-class DateDisplay:
+class DateDisplay(object):

    _months = GrampsLocale.long_months
    MONS   = GrampsLocale.short_months
@@ -122,7 +122,7 @@ def french_valid(date_tuple):
 # Parser class
 #
 #-------------------------------------------------------------------------
-class DateParser:
+class DateParser(object):
    """
    Convert a text string into a Date object. If the date cannot be
    converted, the text string is assigned.
@@ -69,7 +69,7 @@ class DateParserCZ(DateParser):
        u'r'             : Date.CAL_FRENCH, 
        u'perský'       : Date.CAL_PERSIAN, 
        u'p'             : Date.CAL_PERSIAN, 
-        u'swedish'       : Date.CAL_SWEDISH, 
+        u'švédský'       : Date.CAL_SWEDISH, 
        u's'             : Date.CAL_SWEDISH, 
        }

@@ -103,7 +103,7 @@ class DateDisplayCZ(DateDisplay):
    calendar = (
        "", u" (juliánský)", u" (hebrejský)", 
        u" (republikánský)", u" (perský)", u" (islámský)", 
-        u" (swedish)" 
+        u" (švédský)" 
        )

    _mod_str = ("", u"před ", u"po ", u"kolem ", "", "", "")
@@ -138,7 +138,7 @@ class DateDisplayCZ(DateDisplay):
        elif mod == Date.MOD_RANGE:
            d1 = self.display_cal[cal](start)
            d2 = self.display_cal[cal](date.get_stop_date())
-            return "%s%s %s %s %s%s" % (qual_str, u'medzi', 
+            return "%s%s %s %s %s%s" % (qual_str, u'mezi', 
                                        d1, u'a', d2, self.calendar[cal])
        else:
            text = self.display_cal[date.get_calendar()](start)
@@ -58,8 +58,8 @@ class DateParserFR(DateParser):

    # Add common value

-    month_to_int[u"bluviose"] = 1
-    month_to_int[u"vendose"] = 2
+    month_to_int[u"bluviose"] = 5
+    month_to_int[u"vendose"] = 6
    month_to_int[u"7bre"] = 9
    month_to_int[u"8bre"] = 10
    month_to_int[u"9bre"] = 11
@@ -180,7 +180,7 @@ class DateParserHR(DateParser):
        """
        DateParser.init_strings(self)
        # match 'Day. MONTH year.' format with or without dots
-        self._text2 = re.compile('(\d+)?\.?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
+        self._text2 = re.compile('(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
                                % self._mon_str, re.IGNORECASE)
        # match Day.Month.Year.
        self._numeric  = re.compile(
@@ -0,0 +1,393 @@
+# -*- coding: utf-8 -*-
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2004-2007  Donald N. Allingham
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# Serbian version by Vlada Perić <vlada.peric@gmail.com>, 2009.
+# Based on the Croatian DateHandler by Josip
+
+"""
+Serbian-specific classes for parsing and displaying dates.
+"""
+
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
+import re
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from gen.lib import Date
+from _DateParser import DateParser
+from _DateDisplay import DateDisplay
+from _DateHandler import register_datehandler
+
+#-------------------------------------------------------------------------
+#
+# Serbian parser
+#
+#-------------------------------------------------------------------------
+class DateParserSR(DateParser):
+    """
+    Converts a text string into a Date object
+    """
+    month_to_int = DateParser.month_to_int
+    
+    month_to_int[u"januar"]  = 1
+    month_to_int[u"januara"] = 1
+    month_to_int[u"jan"]     = 1
+    month_to_int[u"јан"]     = 1
+    month_to_int[u"јануара"] = 1
+    month_to_int[u"јануар"]  = 1
+    month_to_int[u"i"]       = 1
+    
+    month_to_int[u"februar"]  = 2
+    month_to_int[u"februara"] = 2
+    month_to_int[u"feb"]      = 2
+    month_to_int[u"феб"]      = 2
+    month_to_int[u"фебруар"]  = 2
+    month_to_int[u"фебруара"] = 2
+    month_to_int[u"ii"]       = 2
+    
+    month_to_int[u"mart"]  = 3
+    month_to_int[u"marta"] = 3
+    month_to_int[u"mar"]   = 3
+    month_to_int[u"мар"]   = 3
+    month_to_int[u"март"]  = 3
+    month_to_int[u"марта"] = 3
+    month_to_int[u"iii"]   = 3
+    
+    month_to_int[u"april"]  = 4
+    month_to_int[u"aprila"] = 4
+    month_to_int[u"apr"]    = 4
+    month_to_int[u"апр"]    = 4
+    month_to_int[u"април"]  = 4
+    month_to_int[u"априла"] = 4
+    month_to_int[u"iv"]     = 4
+
+    month_to_int[u"maj"]  = 5
+    month_to_int[u"maja"] = 5
+    month_to_int[u"мај"]  = 5
+    month_to_int[u"маја"] = 5
+    month_to_int[u"v"]    = 5
+    
+    month_to_int[u"jun"]  = 6
+    month_to_int[u"juna"] = 6
+    month_to_int[u"јун"]  = 6
+    month_to_int[u"јуна"] = 6
+    month_to_int[u"vi"]   = 6
+
+    month_to_int[u"jul"]  = 7
+    month_to_int[u"jula"] = 7
+    month_to_int[u"јул"]  = 7
+    month_to_int[u"јула"] = 7
+    month_to_int[u"vii"]  = 7
+    
+    month_to_int[u"avgust"]  = 8
+    month_to_int[u"avgusta"] = 8
+    month_to_int[u"avg"]     = 8
+    month_to_int[u"авг"]     = 8
+    month_to_int[u"август"]  = 8
+    month_to_int[u"августа"] = 8
+    month_to_int[u"viii"]    = 8
+    
+    month_to_int[u"septembar"] = 9
+    month_to_int[u"septembra"] = 9
+    month_to_int[u"sep"]       = 9
+    month_to_int[u"сеп"]       = 9
+    month_to_int[u"септембар"] = 9
+    month_to_int[u"септембра"] = 9
+    month_to_int[u"ix"]        = 9
+    
+    month_to_int[u"oktobar"]  = 10
+    month_to_int[u"oktobra"]  = 10
+    month_to_int[u"okt"]      = 10
+    month_to_int[u"окт"]      = 10
+    month_to_int[u"октобар"]  = 10
+    month_to_int[u"октобра"]  = 10
+    month_to_int[u"x"]        = 10
+    
+    month_to_int[u"novembar"]  = 11
+    month_to_int[u"novembra"]  = 11
+    month_to_int[u"nov"]       = 11
+    month_to_int[u"нов"]       = 11
+    month_to_int[u"новембар"]  = 11
+    month_to_int[u"новембра"]  = 11
+    month_to_int[u"xi"]        = 11
+    
+    month_to_int[u"decembar"]  = 12
+    month_to_int[u"decembra"]  = 12
+    month_to_int[u"dec"]       = 12
+    month_to_int[u"дец"]       = 12
+    month_to_int[u"децембар"]  = 12
+    month_to_int[u"децембра"]  = 12
+    month_to_int[u"xii"]       = 12
+    
+    modifier_to_int = {
+        u'pre'    : Date.MOD_BEFORE, 
+        u'posle'  : Date.MOD_AFTER,
+        u'oko'    : Date.MOD_ABOUT,
+        u'cca'    : Date.MOD_ABOUT,
+
+        u'пре'    : Date.MOD_BEFORE, 
+        u'после'  : Date.MOD_AFTER,
+        u'око'    : Date.MOD_ABOUT,
+        }
+
+    calendar_to_int = {
+        u'gregorijanski'  : Date.CAL_GREGORIAN,
+        u'greg.'          : Date.CAL_GREGORIAN,
+        u'julijanski'     : Date.CAL_JULIAN,
+        u'jul.'           : Date.CAL_JULIAN,
+        u'hebrejski'      : Date.CAL_HEBREW,
+        u'hebr.'          : Date.CAL_HEBREW,
+        u'islamski'       : Date.CAL_ISLAMIC,
+        u'isl.'           : Date.CAL_ISLAMIC,
+        u'francuski republikanski': Date.CAL_FRENCH,
+        u'franc.'         : Date.CAL_FRENCH,
+        u'persijski'      : Date.CAL_PERSIAN,
+        u'pers. '         : Date.CAL_PERSIAN,
+        u'švedski'        : Date.CAL_SWEDISH, 
+        u'šv.'            : Date.CAL_SWEDISH, 
+
+        u'грегоријански'  : Date.CAL_GREGORIAN,
+        u'грег.'          : Date.CAL_GREGORIAN,
+        u'јулијански'     : Date.CAL_JULIAN,
+        u'јул.'           : Date.CAL_JULIAN,
+        u'хебрејски'      : Date.CAL_HEBREW,
+        u'хебр.'          : Date.CAL_HEBREW,
+        u'исламски'       : Date.CAL_ISLAMIC,
+        u'исл.'           : Date.CAL_ISLAMIC,
+        u'француски републикански': Date.CAL_FRENCH,
+        u'франц.'         : Date.CAL_FRENCH,
+        u'персијски'      : Date.CAL_PERSIAN,
+        u'перс. '         : Date.CAL_PERSIAN,
+        u'шведски'        : Date.CAL_SWEDISH, 
+        u'шв'             : Date.CAL_SWEDISH, 
+        }
+
+    quality_to_int = {
+        u'procenjeno' : Date.QUAL_ESTIMATED,
+        u'pro.'       : Date.QUAL_ESTIMATED,
+        u'izračunato' : Date.QUAL_CALCULATED,
+        u'izr.'       : Date.QUAL_CALCULATED,
+
+        u'процењено'  : Date.QUAL_ESTIMATED,
+        u'про.'       : Date.QUAL_ESTIMATED,
+        u'израчунато' : Date.QUAL_CALCULATED,
+        u'изр.'       : Date.QUAL_CALCULATED,
+        }
+
+    bce = [u"пре нове ере", u"пре Христа", u"п.н.е."
+           u"pre nove ere", u"pre Hrista", u"p.n.e."] + DateParser.bce
+
+    def init_strings(self):
+        """
+        compiles regular expression strings for matching dates
+        """
+        DateParser.init_strings(self)
+        # match 'Day. MONTH year.' format with or without dots
+        self._text2 = re.compile('(\d+)?\.?\s*?%s\s*((\d+)(/\d+)?)?\.?\s*$'
+                                % self._mon_str, re.IGNORECASE)
+
+        # match Day.Month.Year.
+        self._numeric  = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$")
+
+        _span1 = [u'od', u'од']
+        _span2 = [u'do', u'до']
+        _range1 = [u'između', u'између']
+        _range2 = [u'i', u'и']
+        self._span     = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % 
+                                   ('|'.join(_span1),'|'.join(_span2)),
+                                   re.IGNORECASE)
+        self._range    = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+                                   ('|'.join(_range1),'|'.join(_range2)),
+                                   re.IGNORECASE)
+
+#-------------------------------------------------------------------------
+#
+# Serbian display
+#
+#-------------------------------------------------------------------------
+class DateDisplaySR_latin(DateDisplay):
+    """
+    Serbian (latin) date display class
+    """
+    calendar = (
+        "", u" (julijanski)", u" (hebrejski)", 
+        u" (francuski republikanski)", u" (persijski)", u" (islamski)",
+        u" (švedski)" 
+        )
+
+    _mod_str = ("", "pre ", "posle ", "oko ", "", "", "")
+
+    _qual_str = ("", "procenjeno ", "izračunato ")
+    
+    _bce_str = "%s p.n.e."
+
+    formats = (
+        "GGGG-MM-DD (ISO-8601)", 
+        "Numerički (D.M.GGGG.)", 
+        "D. MMM GGGG.",
+        "D. Mesec GGGG.",
+        "D. Rb GGGG."
+        )
+    
+    roman_months = (
+        "",
+        "I",
+        "II",
+        "III",
+        "IV",
+        "V",
+        "VI",
+        "VII",
+        "VIII",
+        "IX",
+        "X",
+        "XI",
+        "XII"
+        )
+        
+    sr_months = ("",
+        u"januara",
+        u"februara",
+        u"marta",
+        u"aprila",
+        u"maja",
+        u"juna",
+        u"jula",
+        u"avgusta",
+        u"septembra",
+        u"oktobra",
+        u"novembra",
+        u"decembra"
+        )
+
+    sr_months3 = ("",
+        u"jan",
+        u"feb",
+        u"mar",
+        u"apr",
+        u"maj",
+        u"jun",
+        u"jul",
+        u"avg",
+        u"sep",
+        u"okt",
+        u"nov",
+        u"dec"
+        )        
+
+    def _display_gregorian(self, date_val):
+        """
+        display gregorian calendar date in different format
+        """
+        year = self._slash_year(date_val[2], date_val[3])
+        if self.format == 0:
+            return self.display_iso(date_val)
+        elif self.format == 1:
+            if date_val[3]:
+                return self.display_iso(date_val)
+            else:
+                if date_val[0] == 0 and date_val[1] == 0:
+                    value = str(date_val[2])
+                else:
+                    value = self._tformat.replace('%m', str(date_val[1]))
+                    value = value.replace('%d', str(date_val[0]))
+                    value = value.replace('%Y', str(abs(date_val[2])))
+                    value = value.replace('-', '/')
+        elif self.format == 2:
+            # Day. MON Year.
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = u"%s." % year
+                else:
+                    value = u"%s %s." % (self.sr_months3[date_val[1]], year)
+            else:
+                value = u"%d. %s %s." % (date_val[0], 
+                                self.sr_months3[date_val[1]], year)
+        elif self.format == 3:
+            # Day. MONTH Year.
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = u"%s." % year
+                else:
+                    value = u"%s %s." % (self.sr_months[date_val[1]], year)
+            else:
+                value = u"%d. %s %s." % (date_val[0], 
+                                self.sr_months[date_val[1]], year)
+        else:
+            # Day RomanMon Year
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = u"%s." % year
+                else:
+                    value = "%s %s." % (self.roman_months[date_val[1]], year)
+            else:
+                value = "%d. %s %s." % (date_val[0],
+                                self.roman_months[date_val[1]], year)
+        if date_val[2] < 0:
+            return self._bce_str % value
+        else:
+            return value
+
+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+
+        qual_str = self._qual_str[qual]
+        
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            d_1 = self.display_cal[cal](start)
+            d_2 = self.display_cal[cal](date.get_stop_date())
+            return "%s%s %s %s %s%s" % (qual_str, u'od', d_1, u'do', d_2,
+                                                            self.calendar[cal])
+        elif mod == Date.MOD_RANGE:
+            d_1 = self.display_cal[cal](start)
+            d_2 = self.display_cal[cal](date.get_stop_date())
+            return "%s%s %s %s %s%s" % (qual_str, u'između', d_1, u'i', d_2, 
+                                                            self.calendar[cal])
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
+                                                self.calendar[cal])
+
+
+#-------------------------------------------------------------------------
+#
+# Register classes
+#
+#-------------------------------------------------------------------------
+register_datehandler(('sr', 'serbian', 'srpski', 'sr_RS'),
+                                    DateParserSR, DateDisplaySR_latin)
@@ -29,11 +29,14 @@ from _DateHandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY,
                          register_datehandler)

 # Import all the localized handlers
+import _Date_ca
 import _Date_cs
 import _Date_de
 import _Date_es
 import _Date_fi
 import _Date_fr
+import _Date_hr
+import _Date_it
 import _Date_lt
 import _Date_nb
 import _Date_nl
@@ -41,10 +44,8 @@ import _Date_pl
 import _Date_pt
 import _Date_ru
 import _Date_sk
+import _Date_sr
 import _Date_sv
-import _Date_hr
-import _Date_ca
-import _Date_it

 # Initialize global parser
 try:
@@ -68,7 +68,7 @@ import Errors
 # DbLoader class
 #
 #-------------------------------------------------------------------------
-class DbLoader:
+class DbLoader(object):
    def __init__(self, dbstate, uistate):
        self.dbstate = dbstate
        self.uistate = uistate
@@ -102,7 +102,7 @@ STOCK_COL = 6

 RCS_BUTTON = { True : _('_Extract'), False : _('_Archive') }

-class CLIDbManager:
+class CLIDbManager(object):
    """
    Database manager without GTK functionality, allows users to create and
    open databases
@@ -1068,15 +1068,17 @@ def find_revisions(name):

 def find_locker_name(dirpath):
    """
-    Opens the lock file if it exists, reads the contexts and returns 
-    the contents, which should be like "Locked by USERNAME". 
+    Opens the lock file if it exists, reads the contexts which is "USERNAME"
+    and returns the contents, with correct string before "USERNAME",
+    so the message can be printed with correct locale.
    If a file is encountered with errors, we return 'Unknown'
    This data is displayed in the time column of the manager
    """
    try:
        fname = os.path.join(dirpath, "lock")
        ifile = open(fname)
-        last = ifile.read().strip()
+        username = ifile.read().strip()
+        last = _("Locked by %s") % username
        ifile.close()
    except (OSError, IOError):
        last = _("Unknown")
@@ -46,7 +46,7 @@ import Config
 # NodeMap
 #
 #-------------------------------------------------------------------------
-class NodeMap:
+class NodeMap(object):
    """
    Provide the Path to Iter mappings for a TreeView model. The implementation
    provides a list of nodes and a dictionary of handles. The datalist provides
@@ -107,7 +107,7 @@ class EventModel(BaseModel):
            return u''

    def column_type(self,data):
-        return str(gen.lib.EventType(data[COLUMN_TYPE]))
+        return unicode(gen.lib.EventType(data[COLUMN_TYPE]))

    def column_id(self,data):
        return unicode(data[COLUMN_ID])
@@ -46,6 +46,7 @@ import GrampsLocale
 import DateHandler
 from BasicUtils import name_displayer
 import gen.lib
+from gen.lib import EventRoleType
 import gen.utils

 from _BaseModel import BaseModel
@@ -126,10 +127,12 @@ class FamilyModel(BaseModel):
            return u""

    def column_type(self, data):
-        return str(gen.lib.FamilyRelType(data[5]))
+        return unicode(gen.lib.FamilyRelType(data[5]))

    def column_marriage(self, data):
        erlist = [ gen.lib.EventRef().unserialize(d) for d in data[6] ]
+        erlist = [x for x in erlist if x.get_role()==EventRoleType.FAMILY or 
+                                       x.get_role()==EventRoleType.PRIMARY]
        event = gen.utils.marriage_from_eventref_list(self.db, erlist)
        if event:
            return DateHandler.displayer.display(event.date)
@@ -40,7 +40,7 @@ import locale
 #
 #-------------------------------------------------------------------------
 import logging
-log = logging.getLogger(".")
+_LOG = logging.getLogger(".gui.peoplemodel")

 #-------------------------------------------------------------------------
 #
@@ -68,7 +68,7 @@ from Lru import LRU
 _CACHE_SIZE = 250
 invalid_date_format = Config.get(Config.INVALID_DATE_FORMAT)

-class NodeTreeMap:
+class NodeTreeMap(object):

    def __init__(self):

@@ -243,6 +243,7 @@ class PeopleModel(gtk.GenericTreeModel):
        """
        Initialize the model building the initial data
        """
+        cput = time.clock()
        gtk.GenericTreeModel.__init__(self)

        self.db = db
@@ -291,6 +292,8 @@ class PeopleModel(gtk.GenericTreeModel):
            data_filter = None
        self.current_filter = data_filter
        self.rebuild_data(data_filter, skip)
+        _LOG.debug(self.__class__.__name__ + ' __init__ ' +
+                    str(time.clock() - cput) + ' sec')

    def update_todo(self,client,cnxn_id,entry,data):
        self.todo_color = Config.get(Config.TODO_COLOR)
@@ -305,9 +308,12 @@ class PeopleModel(gtk.GenericTreeModel):
        """
        Convience function that calculates the new data and assigns it.
        """
+        cput = time.clock()
        self.calculate_data(data_filter, skip)
        self.assign_data()
        self.current_filter = data_filter
+        _LOG.debug(self.__class__.__name__ + ' rebuild_data ' +
+                    str(time.clock() - cput) + ' sec')
        
    def _build_search_sub(self,dfilter, skip):

@@ -521,7 +527,7 @@ class PeopleModel(gtk.GenericTreeModel):
            GrampsLocale.codeset)

    def column_gender(self, data, node):
-        return PeopleModel._GENDER[data[PeopleModel._GENDER_COL]]
+        return unicode(PeopleModel._GENDER[data[PeopleModel._GENDER_COL]])

    def column_birth_day(self, data, node):
        try:
@@ -104,7 +104,7 @@ class RepositoryModel(BaseModel):
        return unicode(data[1])

    def column_type(self,data):
-        return str(gen.lib.RepositoryType(data[2]))
+        return unicode(gen.lib.RepositoryType(data[2]))

    def column_name(self,data):
        return unicode(data[3])
@@ -192,7 +192,7 @@ _RCT_BTM = '</menu></menu></menubar></ui>'
 import RecentFiles
 import os

-class RecentDocsMenu:
+class RecentDocsMenu(object):
    def __init__(self, uistate, state, fileopen):
        self.action_group = gtk.ActionGroup('RecentFiles')
        self.active = DISABLED
@@ -87,8 +87,7 @@ class BackRefList(EmbeddedList):
        Method has signature of, and overrides create_buttons from _ButtonTab.py
        """
        self.edit_btn = SimpleButton(gtk.STOCK_EDIT, self.edit_button_clicked)
-        self.tooltips = gtk.Tooltips()
-        self.tooltips.set_tip(self.edit_btn, _('Edit reference'))
+        self.edit_btn.set_tooltip_text(_('Edit reference'))

        hbox = gtk.HBox()
        hbox.set_spacing(6)
@@ -98,7 +98,6 @@ class ButtonTab(GrampsTab):
        """
        self.dirty_selection = False
        GrampsTab.__init__(self,dbstate, uistate, track, name)
-        self.tooltips = gtk.Tooltips()
        self.create_buttons(share_button, move_buttons, jump_button)

    def create_buttons(self, share_button, move_buttons, jump_button):
@@ -113,22 +112,22 @@ class ButtonTab(GrampsTab):
        self.edit_btn = SimpleButton(gtk.STOCK_EDIT, self.edit_button_clicked)
        self.del_btn  = SimpleButton(gtk.STOCK_REMOVE, self.del_button_clicked)

-        self.tooltips.set_tip(self.add_btn, self._MSG['add'])
-        self.tooltips.set_tip(self.edit_btn, self._MSG['edit'])
-        self.tooltips.set_tip(self.del_btn, self._MSG['del'])
+        self.add_btn.set_tooltip_text(self._MSG['add'])
+        self.edit_btn.set_tooltip_text(self._MSG['edit'])
+        self.del_btn.set_tooltip_text(self._MSG['del'])
        
        if share_button:
            self.share_btn = SimpleButton(gtk.STOCK_INDEX, self.share_button_clicked)
-            self.tooltips.set_tip(self.share_btn, self._MSG['share'])
+            self.share_btn.set_tooltip_text(self._MSG['share'])
        else:
            self.share_btn = None
            
        if move_buttons:
            self.up_btn = SimpleButton(gtk.STOCK_GO_UP, self.up_button_clicked)
-            self.tooltips.set_tip(self.up_btn, self._MSG['up'])
+            self.up_btn.set_tooltip_text(self._MSG['up'])
            self.down_btn = SimpleButton(gtk.STOCK_GO_DOWN, 
                                                self.down_button_clicked)
-            self.tooltips.set_tip(self.down_btn, self._MSG['down'])
+            self.down_btn.set_tooltip_text(self._MSG['down'])
        else:
            self.up_btn = None
            self.down_btn = None
@@ -146,7 +145,7 @@ class ButtonTab(GrampsTab):

        if jump_button:
            self.jump_btn = SimpleButton(gtk.STOCK_JUMP_TO, self.jump_button_clicked)
-            self.tooltips.set_tip(self.jump_btn, self._MSG['jump'])
+            self.jump_btn.set_tooltip_text(self._MSG['jump'])
        else:
            self.jump_btn = None

@@ -240,11 +240,15 @@ class EmbeddedList(ButtonTab):
        pass

    def _find_row(self, x, y):
-        row = self.tree.get_path_at_pos(x, y)
+        row = self.tree.get_dest_row_at_pos(x, y)
        if row is None:
            return len(self.get_data())
        else:
-            return row[0][0]
+            if row[1] in (gtk.TREE_VIEW_DROP_BEFORE,
+                          gtk.TREE_VIEW_DROP_INTO_OR_BEFORE):
+                return row[0][0]
+            else:
+                return row[0][0]+1

    def _handle_drag(self, row, obj):
        self.get_data().insert(row, obj)
@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2000-2006  Donald N. Allingham
+# Copyright (C) 2009       Gary Burton
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -344,11 +345,11 @@ class GalleryTab(ButtonTab):
        dnd_types = [ self._DND_TYPE.target(), self._DND_EXTRA.target(),
                      DdTargets.MEDIAOBJ.target()]

-        self.iconlist.drag_dest_set(gtk.DEST_DEFAULT_ALL, dnd_types,
-                                    gtk.gdk.ACTION_COPY)
-        self.iconlist.drag_source_set(gtk.gdk.BUTTON1_MASK,
-                                      [self._DND_TYPE.target()],
-                                      gtk.gdk.ACTION_COPY)
+        self.iconlist.enable_model_drag_dest(dnd_types,
+                                         gtk.gdk.ACTION_COPY)
+        self.iconlist.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
+                                  [self._DND_TYPE.target()],
+                                  gtk.gdk.ACTION_COPY)
        self.iconlist.connect('drag_data_get', self.drag_data_get)
        if not self.dbstate.db.readonly:
            self.iconlist.connect('drag_data_received', self.drag_data_received)
@@ -39,7 +39,7 @@ class NoteModel(gtk.ListStore):
        self.db = db
        for handle in note_list:
            note = self.db.get_note_from_handle(handle)
-            text = note.get().replace('\n', ' ')
+            text = unicode(note.get().replace('\n', ' '))
            if len(text) > 80:
                text = text[:80]+"..."
            self.append(row=[
@@ -53,7 +53,7 @@ from DdTargets import DdTargets
 from Errors import WindowActiveError
 from Selectors import selector_factory

-class ObjEntry:
+class ObjEntry(object):
    """
    Handles the selection of a existing or new Object. Supports Drag and Drop
    to select the object.
@@ -87,7 +87,6 @@ class ObjEntry:
        self.set_val = set_val
        self.uistate = uistate
        self.track = track
-        self.tooltips = gtk.Tooltips()
        
        #connect drag and drop
        self._init_dnd()
@@ -219,25 +218,25 @@ class ObjEntry:
            image.set_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_BUTTON)
            image.show()
            self.share.add(image)
-            self.tooltips.set_tip(self.share, self.DEL_STR)
+            self.share.set_tooltip_text(self.DEL_STR)
            if self.add_edt is not None:
                image = gtk.Image()
                image.set_from_stock(gtk.STOCK_EDIT, gtk.ICON_SIZE_BUTTON)
                image.show()
                self.add_edt.add(image)
-                self.tooltips.set_tip(self.add_edt, self.EDIT_STR)
+                self.add_edt.set_tooltip_text(self.EDIT_STR)
        else:
            image = gtk.Image()
            image.set_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
            image.show()
            self.share.add(image)
-            self.tooltips.set_tip(self.share, self.SHARE_STR)
+            self.share.set_tooltip_text(self.SHARE_STR)
            if self.add_edt is not None:
                image = gtk.Image()
                image.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_BUTTON)
                image.show()
                self.add_edt.add(image)
-                self.tooltips.set_tip(self.add_edt, self.ADD_STR)
+                self.add_edt.set_tooltip_text(self.ADD_STR)

 class PlaceEntry(ObjEntry):
    """
@@ -384,10 +383,10 @@ class NoteEntry(ObjEntry):

    def get_label(self, note):
        txt = " ".join(note.get().split())
+        #String must be unicode for truncation to work for non ascii characters
+        txt = unicode(txt)
        if len(txt) > 35:
-            txt = txt[:35]+"..."
-        else:
-            txt = txt
+            txt = txt[:35] + "..."
        return "%s [%s]" % (txt, note.gramps_id)

    def call_editor(self, obj=None):
@@ -292,7 +292,7 @@ class EditFamilyEvent(EditEvent):
 # Delete Query class
 #
 #-------------------------------------------------------------------------
-class DelEventQuery:
+class DelEventQuery(object):
    def __init__(self, dbstate, uistate, event, person_list, family_list):
        self.event = event
        self.db = dbstate.db
@@ -380,7 +380,7 @@ class ChildEmbedList(EmbeddedList):
        else:
            return ("", "")

-class FastMaleFilter:
+class FastMaleFilter(object):

    def __init__(self, db):
        self.db = db
@@ -389,7 +389,7 @@ class FastMaleFilter:
        value = self.db.get_raw_person_data(handle)
        return value[2] == gen.lib.Person.MALE

-class FastFemaleFilter:
+class FastFemaleFilter(object):

    def __init__(self, db):
        self.db = db
@@ -409,7 +409,6 @@ class EditFamily(EditPrimary):
    
    def __init__(self, dbstate, uistate, track, family):
        
-        self.tooltips = gtk.Tooltips()
        EditPrimary.__init__(self, dbstate, uistate, track,
                             family, dbstate.db.get_family_from_handle,
                             dbstate.db.get_family_from_gramps_id)
@@ -543,12 +542,10 @@ class EditFamily(EditPrimary):
        self.mbutton_del = self.top.get_widget('mbutton_del')
        self.mbutton_edit = self.top.get_widget('mbutton_edit')

-        self.tooltips.set_tip(self.mbutton_index, 
-                              _("Select a person as the mother"))
-        self.tooltips.set_tip(self.mbutton_add, 
-                              _("Add a new person as the mother"))
-        self.tooltips.set_tip(self.mbutton_del, 
-                              _("Remove the person as the mother"))
+        self.mbutton_index.set_tooltip_text(_("Select a person as the mother"))
+        self.mbutton_add.set_tooltip_text(_("Add a new person as the mother"))
+        self.mbutton_del.set_tooltip_text(_("Remove the person as the mother"))
+

        self.mbutton_edit.connect('button-press-event', self.edit_mother)
        self.mbutton_edit.connect('key-press-event', self.edit_mother)
@@ -561,12 +558,9 @@ class EditFamily(EditPrimary):
        self.fbutton_del = self.top.get_widget('fbutton_del')
        self.fbutton_edit = self.top.get_widget('fbutton_edit')

-        self.tooltips.set_tip(self.fbutton_index, 
-                              _("Select a person as the father"))
-        self.tooltips.set_tip(self.fbutton_add, 
-                              _("Add a new person as the father"))
-        self.tooltips.set_tip(self.fbutton_del, 
-                              _("Remove the person as the father"))
+        self.fbutton_index.set_tooltip_text(_("Select a person as the father"))
+        self.fbutton_add.set_tooltip_text(_("Add a new person as the father"))
+        self.fbutton_del.set_tooltip_text(_("Remove the person as the father"))

        self.fbutton_edit.connect('button-press-event', self.edit_father)
        self.fbutton_edit.connect('key-press-event', self.edit_father)
@@ -856,7 +850,7 @@ class EditFamily(EditPrimary):
            if death and death.get_type() == gen.lib.EventType.BURIAL:
                death_label.set_label(_("Burial:"))

-            self.tooltips.set_tip(btn_edit, _('Edit %s') % name)
+            btn_edit.set_tooltip_text(_('Edit %s') % name)
            btn_index.hide()
            btn_add.hide()
            btn_del.show()
@@ -301,7 +301,7 @@ class EditMedia(EditPrimary):
            return cmp(cmp_obj.serialize(True)[1:],
                       self.obj.serialize()[1:]) != 0

-class DeleteMediaQuery:
+class DeleteMediaQuery(object):

    def __init__(self, dbstate, uistate, media_handle, the_lists):
        self.db = dbstate.db
@@ -315,7 +315,7 @@ class EditNote(EditPrimary):
            self.callback(self.obj.get_handle())
        self.close()

-class DeleteNoteQuery:
+class DeleteNoteQuery(object):
    def __init__(self, dbstate, uistate, note, the_lists):
        self.note = note
        self.db = dbstate.db
@@ -301,7 +301,7 @@ class EditPlace(EditPrimary):
 # DeletePlaceQuery
 #
 #-------------------------------------------------------------------------
-class DeletePlaceQuery:
+class DeletePlaceQuery(object):

    def __init__(self, dbstate, uistate, place, person_list, family_list, 
                 event_list):
@@ -176,7 +176,7 @@ class EditRepository(EditPrimary):
    def _cleanup_on_exit(self):
        self.backref_tab.close()

-class DelRepositoryQuery:
+class DelRepositoryQuery(object):
    def __init__(self, dbstate, uistate, repository, sources):
        self.obj = repository
        self.db = dbstate.db
@@ -193,7 +193,7 @@ class EditSource(EditPrimary):
    def _cleanup_on_exit(self):
        self.backref_tab.close()

-class DelSrcQuery:
+class DelSrcQuery(object):
    def __init__(self, dbstate, uistate, source, the_lists):
        self.source = source
        self.db = dbstate.db
@@ -2,7 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2004-2007 Donald N. Allingham
-# Copyright (C) 2008      Brian G. Matherly
+# Copyright (C) 2008-2009 Brian G. Matherly
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 import os
 import sys
 from gettext import gettext as _
+from xml.sax.saxutils import escape

 #-------------------------------------------------------------------------
 #
@@ -118,7 +119,9 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
        self.top_title = _("Export Assistant")
        ManagedWindow.ManagedWindow.__init__(self,uistate,[],
                                                 self.__class__)
-        self.set_window(self, None, self.top_title, isWindow=True)
+        #set_window is present in both parent classes
+        ManagedWindow.ManagedWindow.set_window(self, self, None,
+            self.top_title, isWindow=True)
        
        #set up callback method for the export plugins
        self.callback = self.pulse_progressbar
@@ -196,8 +199,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
        table.set_row_spacings(6)
        table.set_col_spacings(6)
        
-        tip = gtk.Tooltips()
-        
        group = None
        recent_type = Config.get(Config.RECENT_EXPORT_TYPE)
        
@@ -206,11 +207,11 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
            description= self.__exporters[ix].get_description()

            button = gtk.RadioButton(group,title)
+            button.set_tooltip_text(description)
            if not group:
                group = button
            self.format_buttons.append(button)
            table.attach(button,0,2,2*ix,2*ix+1)
-            tip.set_tip(button,description)
            if ix == recent_type :
                button.set_active(True)
        
@@ -446,7 +447,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
                'The data will be saved as follows:\n\n'
                'Format:\t%s\nName:\t%s\nFolder:\t%s\n\n'
                'Press Apply to proceed, Back to revisit '
-                'your options, or Cancel to abort') % (format, name, folder)
+                'your options, or Cancel to abort') % (format.replace("_",""), name, folder)
                self.set_page_complete(page, True)
            else :
                confirm_text = _(
@@ -456,7 +457,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
                ) 
                self.set_page_complete(page, False)
            
-            page.set_label(confirm_text)
+            page.set_label(escape(confirm_text))
                
        elif self.get_page_type(page) ==  gtk.ASSISTANT_PAGE_SUMMARY :
            # The summary page
@@ -488,7 +489,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
                'Note: your currently opened database is safe. '
                'It was only '
                'a copy of your data that failed to save.')
-            self.labelsum.set_label(conclusion_text)
+            self.labelsum.set_label(escape(conclusion_text))
            self.set_page_title(page, conclusion_title)
            self.set_page_complete(page, True)
        else :
@@ -46,7 +46,7 @@ from Filters import GenericFilter, Rules
 # WriterOptionBox
 #
 #-------------------------------------------------------------------------
-class WriterOptionBox:
+class WriterOptionBox(object):
    """
    Create a VBox with the option widgets and define methods to retrieve
    the options.
@@ -214,44 +214,6 @@ class MyLesserEqualGreater(gtk.ComboBox):
        else:
            self.set_active(self.clist.index('equal to'))

-#-------------------------------------------------------------------------
-#
-# MySource - Combo box with list of sources with a standard interface
-#
-#-------------------------------------------------------------------------
-class MySource(gtk.ComboBox):
-    
-    def __init__(self, db):
-        gtk.ComboBox.__init__(self)
-        self.db = db
-        store = gtk.ListStore(gobject.TYPE_STRING)
-        self.set_model(store)
-        cell = gtk.CellRendererText()
-        self.pack_start(cell, True)
-        self.add_attribute(cell, 'text', 0)
-
-        self.slist = []
-        for src_handle in self.db.get_source_handles(sort_handles=True):
-            src = self.db.get_source_from_handle(src_handle)
-            self.slist.append(src.get_gramps_id())
-            title = src.get_title()
-            if len(title) > 44:
-                title = title[:40] + "..."
-            store.append(row=["%s [%s]" % (title, src.get_gramps_id())])
-
-        self.set_active(0)
-        self.show()
-        
-    def get_text(self):
-        active = self.get_active()
-        if active < 0:
-            return ""
-        return self.slist[active]
-
-    def set_text(self, val):
-        if val in self.slist:
-            self.set_active(self.slist.index(val))
-
 #-------------------------------------------------------------------------
 #
 # MyPlaces - AutoCombo text entry with list of places attached. Provides
@@ -272,6 +234,8 @@ class MyPlaces(gtk.Entry):
 #
 #-------------------------------------------------------------------------
 class MyID(gtk.HBox):
+    _invalid_id_txt = _('Not a valid ID')
+    _empty_id_txt  = _invalid_id_txt

    obj_name = {
        'Person' : _('Person'),
@@ -300,10 +264,8 @@ class MyID(gtk.HBox):
        self.button.show()
        self.pack_start(self.entry)
        self.add(self.button)
-        self.tooltips = gtk.Tooltips()
-        self.tooltips.set_tip(self.button, _('Select %s from a list')
-                              % self.obj_name[namespace])
-        self.tooltips.enable()
+        self.button.set_tooltip_text(_('Select %s from a list')
+                               % self.obj_name[namespace])
        self.show()
        self.set_text('')

@@ -348,13 +310,30 @@ class MyID(gtk.HBox):
        return name

    def set_text(self, val):
-        try:
-            name = self.name_from_gramps_id(val)
-            self.tooltips.set_tip(self.entry, name)
-        except AttributeError:
-            self.tooltips.set_tip(self.entry, _('Not a valid ID'))
+        if not val:
+            self.entry.set_tooltip_text(self._empty_id_txt)
+        else:
+            try:
+                name = self.name_from_gramps_id(val)
+                self.entry.set_tooltip_text(name)
+            except AttributeError:
+                self.entry.set_tooltip_text(self._invalid_id_txt)
        self.entry.set_text(val)

+
+#-------------------------------------------------------------------------
+#
+# MySource - select ID of sources with a standard interface
+#
+#-------------------------------------------------------------------------
+class MySource(MyID):
+    
+    _empty_id_txt = _('Give or select a source ID, leave empty to find objects'
+              ' with no source.')
+    def __init__(self, dbstate, uistate, track):
+        MyID.__init__(self, dbstate, uistate, track, namespace='Source')
+        self.entry.set_tooltip_text(self._empty_id_txt)
+
 #-------------------------------------------------------------------------
 #
 #
@@ -486,7 +465,7 @@ class EditRule(ManagedWindow.ManagedWindow):
                    t = MyID(self.dbstate, self.uistate, self.track, 
                             self.namespace)
                elif v == _('Source ID:'):
-                    t = MySource(self.db)
+                    t = MySource(self.dbstate, self.uistate, self.track)
                elif v == _('Filter name:'):
                    t = MyFilters(self.filterdb.get_filters(self.namespace),
                                  self.filter_name)
@@ -578,12 +557,38 @@ class EditRule(ManagedWindow.ManagedWindow):
                tlist[i].set_text(r[i])
            
        self.selection.connect('changed', self.on_node_selected)
+        self.rname.connect('button-press-event', self._button_press)
+        self.rname.connect('key-press-event', self._key_press)
        self.get_widget('ok').connect('clicked', self.rule_ok)
        self.get_widget('cancel').connect('clicked', self.close_window)
        self.get_widget('help').connect('clicked', self.on_help_clicked)

        self.show()

+    def _button_press(self, obj, event):
+        if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
+            return self.expand_collapse()
+
+    def _key_press(self, obj, event):
+        if not event.state or event.state  in (gtk.gdk.MOD2_MASK, ):
+            if event.keyval in (gtk.keysyms.Return, gtk.keysyms.KP_Enter):
+                return self.expand_collapse()
+        return False    
+    
+    def expand_collapse(self):
+        """
+        Expand or collapse the selected parent name node.
+        Return True if change done, False otherwise
+        """
+        store, paths = self.selection.get_selected_rows()
+        if paths and len(paths[0]) == 1 :
+            if self.rname.row_expanded(paths[0]):
+                self.rname.collapse_row(paths[0])
+            else:
+                self.rname.expand_row(paths[0], 0)
+            return True
+        return False
+
    def on_help_clicked(self, obj):
        """
        Display the relevant portion of GRAMPS manual.
@@ -133,6 +133,8 @@ class ShowResults(ManagedWindow.ManagedWindow):
        elif self.namespace == 'Note':
            note = self.db.get_note_from_handle(handle)
            name = note.get().replace('\n', ' ')
+            #String must be unicode for truncation to work for non ascii characters
+            name = unicode(name)
            if len(name) > 80:
                name = name[:80]+"..."
            gid = note.get_gramps_id()
@@ -56,12 +56,15 @@ class HasCommonAncestorWith(Rule):
        # ancestor list once.
        # Start with filling the cache for root person (gramps_id in self.list[0])
        self.ancestor_cache = {}
-        self.root_person = db.get_person_from_gramps_id(self.list[0])
-        self.add_ancs(db, self.root_person)
+        root_person = db.get_person_from_gramps_id(self.list[0])
+        self.add_ancs(db, root_person)
+        self.with_people = [root_person.handle]

    def add_ancs(self, db, person):
        if person.handle not in self.ancestor_cache:
            self.ancestor_cache[person.handle] = set()
+        else:
+            return

        for fam_handle in person.get_parent_family_handle_list():
            fam = db.get_family_from_handle(fam_handle)
@@ -78,8 +81,10 @@ class HasCommonAncestorWith(Rule):
        self.ancestor_cache = {}

    def has_common_ancestor(self, other):
-        if self.ancestor_cache[self.root_person.handle] & self.ancestor_cache[other.handle]:
-            return True
+        for handle in self.with_people:
+            if self.ancestor_cache[handle] & \
+                    self.ancestor_cache[other.handle]:
+                return True
        return False

    def apply(self, db, person):
@@ -55,12 +55,22 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
        HasCommonAncestorWith.__init__(self,list)
        self.ancestor_cache = {}

-    def init_ancestor_cache(self,db):
+    def prepare(self, db):
+        self.db = db
+        # For each(!) person we keep track of who their ancestors
+        # are, in a set(). So we only have to compute a person's
+        # ancestor list once.
+        # Start with filling the cache for root person (gramps_id in self.list[0])
+        self.ancestor_cache = {}
+        self.with_people = []
        filt = MatchesFilter(self.list)
        filt.prepare(db)
-        def init(self, h): self.ancestor_cache[h] = 1
        for handle in db.get_person_handles(sort_handles=False):
-            if (handle not in self.ancestor_cache
-                and filt.apply (db, db.get_person_from_handle(handle))):
-                for_each_ancestor(db,[handle],init,self)
+            person = db.get_person_from_handle(handle)
+            if filt.apply (db, person):
+                #store all people in the filter so as to compare later
+                self.with_people.append(person.handle)
+                #fill list of ancestor of person if not present yet
+                if handle not in self.ancestor_cache:
+                    self.add_ancs(db, person)
        filt.reset()
@@ -48,12 +48,21 @@ class HasSourceOf(Rule):
    description = _('Matches people who have a particular source')
    
    def prepare(self,db):
+        if self.list[0] == '':
+            self.source_handle = None
+            self.nosource = True
+            return
+
+        self.nosource = False
        try:
            self.source_handle = db.get_source_from_gramps_id(self.list[0]).get_handle()
        except:
            self.source_handle = None

-    def apply(self,db,person):
+    def apply(self, db, person):
        if not self.source_handle:
-            return False
-        return person.has_source_reference( self.source_handle)
+            if self.nosource:
+                return len(person.get_source_references()) == 0
+            else:
+                return False
+        return person.has_source_reference(self.source_handle)
@@ -20,7 +20,7 @@ from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 class ChangedSince(ChangedSinceBase):
    """Rules that checks for places changed since a specific time."""

-    name    = ('Places changed after <date time>')
+    name    = _('Places changed after <date time>')
    description = _("Matches place records changed after a specified "
                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
                    "date-time is given")
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -32,7 +33,7 @@ from gettext import gettext as _
 # Rule
 #
 #-------------------------------------------------------------------------
-class Rule:
+class Rule(object):
    """Base rule class."""

    labels      = []
@@ -76,6 +77,9 @@ class Rule:
        return ';'.join(v)

    def match_substring(self, param_index, str_var):
+        # make str_var unicode so that search for ü works
+        # see issue 3188
+        str_var = unicode(str_var)
        if self.list[param_index] and \
               (str_var.upper().find(self.list[param_index].upper()) == -1):
            return False
@@ -30,7 +30,7 @@ import Config
 _RETURN = gtk.gdk.keyval_from_name("Return")
 _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")

-class SidebarFilter:
+class SidebarFilter(object):
    _FILTER_WIDTH = 200
    _FILTER_ELLIPSIZE = pango.ELLIPSIZE_END

@@ -41,7 +41,6 @@ class SidebarFilter:
        self.table.set_row_spacings(6)
        self.table.set_col_spacing(0, 6)
        self.table.set_col_spacing(1, 6)
-        self.tooltips = gtk.Tooltips()
        self.apply_btn = gtk.Button(stock=gtk.STOCK_FIND)
        self.clear_btn = gtk.Button()
        
@@ -119,7 +118,7 @@ class SidebarFilter:
        self.add_entry(name, widget)
        widget.connect('key-press-event', self.key_press)
        if tooltip:
-            self.tooltips.set_tip(widget, tooltip)
+            widget.set_tooltip_text(tooltip)

    def key_press(self, obj, event):
        if not event.state or event.state in (gtk.gdk.MOD2_MASK,):
@@ -40,7 +40,7 @@ from Filters._FilterParser import FilterParser
 # FilterList
 #
 #-------------------------------------------------------------------------
-class FilterList:
+class FilterList(object):
    """
    Container class for managing the generic filters.
    It stores, saves, and loads the filters.
@@ -30,7 +30,7 @@ import gen.lib
 # GenericFilter
 #
 #-------------------------------------------------------------------------
-class GenericFilter:
+class GenericFilter(object):
    """Filter class that consists of several rules."""
    
    logical_functions = ['or', 'and', 'xor', 'one']
@@ -41,7 +41,7 @@ _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")
 # SearchBar
 #
 #-------------------------------------------------------------------------
-class SearchBar:
+class SearchBar(object):
    def __init__( self, dbstate, uistate, on_apply, apply_done = None):
        self.on_apply_callback = on_apply
        self.apply_done_callback = apply_done
@@ -24,7 +24,7 @@
 Package providing filtering framework for GRAMPS.
 """

-class SearchFilter:
+class SearchFilter(object):
    def __init__(self, func, text, invert):
        self.func = func
        self.text = text.upper()
--- a/Show More
+++ b/Show More