Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/Bookmarks.py: use GrampsDisplay for help

Browse Source 
* src/MergeData.py: use GrampsDisplay for help
* src/MergePeople.py: use GrampsDisplay for help


svn: r5295
This commit is contained in:
Don Allingham 2005-10-09 03:18:41 +00:00
parent f616218be0
commit 9756ac2f7c
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -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> 2005-10-07 Alex Roitman <shura@gramps-project.org>
* doc/grampsxml.dtd: Fix order, add missing contents. * doc/grampsxml.dtd: Fix order, add missing contents.

4
gramps2/src/Bookmarks.py
View File

@ -38,13 +38,13 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
import gnome
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import GrampsDisplay
import NameDisplay import NameDisplay
import ListModel import ListModel
@ -211,5 +211,5 @@ class Bookmarks :
def help_clicked(self): def help_clicked(self):
"""Display the relevant portion of GRAMPS manual""" """Display the relevant portion of GRAMPS manual"""
gnome.help_display('gramps-manual','gramps-nav') GrampsDisplay.help('gramps-nav')
self.response = self.top.run() self.response = self.top.run()

4
gramps2/src/MergeData.py
View File

@ -33,7 +33,6 @@ from gettext import gettext as _
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
from gnome import help_display
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -42,6 +41,7 @@ from gnome import help_display
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import Utils import Utils
import const import const
import GrampsDisplay
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -80,7 +80,7 @@ class MergePlaces:
def help(self,obj): def help(self,obj):
"""Display the relevant portion of GRAMPS manual""" """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): def on_merge_places_clicked(self,obj):
""" """

6
gramps2/src/MergePeople.py
View File

@ -35,7 +35,6 @@ import sets
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
import pango import pango
from gnome import help_display
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -48,6 +47,7 @@ import Utils
import NameDisplay import NameDisplay
import const import const
import QuestionDialog import QuestionDialog
import GrampsDisplay
sex = ( _("female"), _("male"), _("unknown")) sex = ( _("female"), _("male"), _("unknown"))
@ -78,7 +78,7 @@ class Compare:
def help(self,obj): def help(self,obj):
"""Display the relevant portion of GRAMPS manual""" """Display the relevant portion of GRAMPS manual"""
help_display('gramps-manual','adv-merge-people') GrampsDisplay.help('adv-merge-people')
def merge(self,obj): def merge(self,obj):
@ -293,7 +293,7 @@ class MergePeopleUI:
def help(self,obj): def help(self,obj):
"""Display the relevant portion of GRAMPS manual""" """Display the relevant portion of GRAMPS manual"""
help_display('gramps-manual','adv-merge-people') GrampsDisplay.help('adv-merge-people')
def name_of(p): def name_of(p):

6
gramps2/src/plugins/DetAncestralReport.py
View File

@ -29,6 +29,7 @@
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
import cStringIO
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -48,9 +49,9 @@ import BaseDoc
import ReportOptions import ReportOptions
import const import const
import ReportUtils import ReportUtils
from DateHandler import displayer as _dd from DateHandler import displayer as _dd
from NameDisplay import displayer as _nd 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.start_paragraph('DAR-Endnotes',"%d." % key)
self.doc.write_text(base.get_title()) 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()),]: _dd.display(srcref.get_date_object()),]:
if item: if item:
self.doc.write_text('; %s' % item) self.doc.write_text('; %s' % item)