From 9756ac2f7c0a0d71704445eaf3820e08832c76e2 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sun, 9 Oct 2005 03:18:41 +0000
Subject: [PATCH] * src/Bookmarks.py: use GrampsDisplay for help *
 src/MergeData.py: use GrampsDisplay for help * src/MergePeople.py: use
 GrampsDisplay for help

svn: r5295
---
 gramps2/ChangeLog                         | 5 +++++
 gramps2/src/Bookmarks.py                  | 4 ++--
 gramps2/src/MergeData.py                  | 4 ++--
 gramps2/src/MergePeople.py                | 6 +++---
 gramps2/src/plugins/DetAncestralReport.py | 6 ++++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 29495facd..92c06f694 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-08  Don Allingham  <don@gramps-project.org>
+	* src/Bookmarks.py: use GrampsDisplay for help
+	* src/MergeData.py: use GrampsDisplay for help
+	* src/MergePeople.py: use GrampsDisplay for help
+
 2005-10-07  Alex Roitman  <shura@gramps-project.org>
 	* doc/grampsxml.dtd: Fix order, add missing contents.
 
diff --git a/gramps2/src/Bookmarks.py b/gramps2/src/Bookmarks.py
index 4c5751730..533c83f29 100644
--- a/gramps2/src/Bookmarks.py
+++ b/gramps2/src/Bookmarks.py
@@ -38,13 +38,13 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gtk
-import gnome 
 
 #-------------------------------------------------------------------------
 #
 # gramps modules
 #
 #-------------------------------------------------------------------------
+import GrampsDisplay
 import NameDisplay
 import ListModel
 
@@ -211,5 +211,5 @@ class Bookmarks :
 
     def help_clicked(self):
         """Display the relevant portion of GRAMPS manual"""
-        gnome.help_display('gramps-manual','gramps-nav')
+        GrampsDisplay.help('gramps-nav')
         self.response = self.top.run()
diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py
index 14944aa51..860a06871 100644
--- a/gramps2/src/MergeData.py
+++ b/gramps2/src/MergeData.py
@@ -33,7 +33,6 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gtk
-from gnome import help_display
 
 #-------------------------------------------------------------------------
 #
@@ -42,6 +41,7 @@ from gnome import help_display
 #-------------------------------------------------------------------------
 import Utils
 import const
+import GrampsDisplay
 
 #-------------------------------------------------------------------------
 #
@@ -80,7 +80,7 @@ class MergePlaces:
 
     def help(self,obj):
         """Display the relevant portion of GRAMPS manual"""
-        help_display('gramps-manual','adv-merge-places')
+        GrampsDisplay.help('adv-merge-places')
 
     def on_merge_places_clicked(self,obj):
         """
diff --git a/gramps2/src/MergePeople.py b/gramps2/src/MergePeople.py
index 6241b3b97..82556bf16 100644
--- a/gramps2/src/MergePeople.py
+++ b/gramps2/src/MergePeople.py
@@ -35,7 +35,6 @@ import sets
 #-------------------------------------------------------------------------
 import gtk
 import pango
-from gnome import help_display
 
 #-------------------------------------------------------------------------
 #
@@ -48,6 +47,7 @@ import Utils
 import NameDisplay
 import const
 import QuestionDialog
+import GrampsDisplay
 
 sex = ( _("female"), _("male"), _("unknown"))
 
@@ -78,7 +78,7 @@ class Compare:
 
     def help(self,obj):
         """Display the relevant portion of GRAMPS manual"""
-        help_display('gramps-manual','adv-merge-people')
+        GrampsDisplay.help('adv-merge-people')
 
     def merge(self,obj):
 
@@ -293,7 +293,7 @@ class MergePeopleUI:
 
     def help(self,obj):
         """Display the relevant portion of GRAMPS manual"""
-        help_display('gramps-manual','adv-merge-people')
+        GrampsDisplay.help('adv-merge-people')
 
 
 def name_of(p):
diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py
index 311ea753d..5dbf6a244 100644
--- a/gramps2/src/plugins/DetAncestralReport.py
+++ b/gramps2/src/plugins/DetAncestralReport.py
@@ -29,6 +29,7 @@
 #
 #------------------------------------------------------------------------
 from gettext import gettext as _
+import cStringIO
 
 #------------------------------------------------------------------------
 #
@@ -48,9 +49,9 @@ import BaseDoc
 import ReportOptions
 import const
 import ReportUtils
+
 from DateHandler import displayer as _dd
 from NameDisplay import displayer as _nd
-import cStringIO
 
 #------------------------------------------------------------------------
 #
@@ -495,7 +496,8 @@ class DetAncestorReport(Report.Report):
             self.doc.start_paragraph('DAR-Endnotes',"%d." % key)
             self.doc.write_text(base.get_title())
 
-            for item in [ base.get_author(), base.get_publication_info(), base.get_abbreviation(),
+            for item in [ base.get_author(), base.get_publication_info(),
+                          base.get_abbreviation(),
                           _dd.display(srcref.get_date_object()),]:
                 if item:
                     self.doc.write_text('; %s' % item)