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

* src/TreeViews/_PersonTreeView.py: Use name_displayer.

Browse Source 
* src/ReportBase/_ReportUtils.py: Use name_displayer.
	* src/ReportBase/_CommandLineReport.py: Use name_displayer.
	* src/ReportBase/_BareReportDialog.py: Use name_displayer.
	* src/PluginUtils/_Tool.py: Use name_displayer.
	* src/plugins/TimeLine.py: Use name_displayer.
	* src/plugins/RelCalc.py: Use name_displayer.
	* src/plugins/ReadGrdb.py: Use name_displayer.
	* src/plugins/NarrativeWeb.py: Use name_displayer.
	* src/plugins/IndivComplete.py: Use name_displayer.
	* src/plugins/GraphViz.py: Use name_displayer.
	* src/plugins/FindDupes.py: Use name_displayer.
	* src/plugins/FamilyGroup.py: Use name_displayer.
	* src/plugins/DetDescendantReport.py: Use name_displayer.
	* src/plugins/DetAncestralReport.py: Use name_displayer.
	* src/plugins/DesGraph.py: Use name_displayer.
	* src/plugins/DescendReport.py: Use name_displayer.
	* src/plugins/DescendChart.py: Use name_displayer.
	* src/plugins/Check.py: Use name_displayer.
	* src/plugins/Ancestors.py: Use name_displayer.
	* src/plugins/AncestorReport.py: Use name_displayer.
	* src/plugins/AncestorChart2.py: Use name_displayer.
	* src/ObjectSelector/_PersonTreeFrame.py: Use name_displayer.
	* src/ObjectSelector/_PersonFrame.py: Use name_displayer.
	* src/Merge/_MergePerson.py: Use name_displayer.
	* src/GrampsDbUtils/_WriteGedcom.py: Use name_displayer.
	* src/GrampsDbUtils/_ReadXML.py: Use name_displayer.
	* src/GrampsDbUtils/_GedcomParse.py: Use name_displayer.
	* src/FilterEditor/_ShowResults.py: Use name_displayer.
	* src/FilterEditor/_EditRule.py: Use name_displayer.
	* src/Editors/_EditPrimary.py: Use name_displayer.
	* src/Editors/_EditPersonRef.py: Use name_displayer.
	* src/Editors/_EditPerson.py: Use name_displayer.
	* src/Editors/_EditName.py: Use name_displayer.
	* src/Editors/_EditLdsOrd.py: Use name_displayer.
	* src/Editors/_EditFamily.py: Use name_displayer.
	* src/DisplayTabs/_PersonRefModel.py: Use name_displayer.
	* src/DisplayTabs/_NameModel.py: Use name_displayer.
	* src/DisplayTabs/_ChildModel.py: Use name_displayer.
	* src/DisplayTabs/_BackRefModel.py: Use name_displayer.
	* src/DisplayModels/_PeopleModel.py: Use name_displayer.
	* src/DisplayModels/_FamilyModel.py: Use name_displayer.
	* src/DataViews/_PersonView.py: Use name_displayer.
	* src/DataViews/_RelationView.py: Use name_displayer.
	* src/DataViews/_PedigreeView.py: Use name_displayer.
	* src/Utils.py: Use name_displayer.
	* src/SubstKeywords.py: Use name_displayer.
	* src/Sort.py: Use name_displayer.
	* src/Reorder.py: Use name_displayer.
	* src/PageView.py (BookMarkView.add_bookmark): Use name_displayer.
	* src/Navigation.py: Use name_displayer.
	* src/DisplayState.py: Use name_displayer.
	* src/GrampsCfg.py: Use name_displayer.
	* src/Bookmarks.py (Bookmarks.make_label): Use name_displayer.
	* src/GrampsDb/Makefile.am (pkgdata_PYTHON): Ship new files.
	* src/Makefile.am (gdir_PYTHON): Ship ProgressDialog.py


svn: r8680
This commit is contained in:
Alex Roitman
2007-06-28 05:41:40 +00:00
parent 6a5dc740a2
commit 74ad7b95a4
65 changed files with 291 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/SubstKeywords.py
View File

@@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-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
@@ -41,7 +41,7 @@ __version__ = "$Revision$"
#
#------------------------------------------------------------------------
from BasicUtils import NameDisplay
from BasicUtils import name_displayer
import DateHandler
import RelLib
@@ -72,8 +72,8 @@ class SubstKeywords:
"""Creates a new object and associates a person with it."""
person = database.get_person_from_handle(person_handle)
self.n = NameDisplay.displayer.display(person)
self.N = NameDisplay.displayer.sorted(person)
self.n = name_displayer.display(person)
self.N = name_displayer.sorted(person)
self.b = ""
self.B = ""
self.d = ""
@@ -107,13 +107,13 @@ class SubstKeywords:
if father_handle == person_handle:
if mother_handle:
mother = database.get_person_from_handle(mother_handle)
self.s = NameDisplay.displayer.display(mother)
self.S = NameDisplay.displayer.sorted(mother)
self.s = name_displayer.display(mother)
self.S = name_displayer.sorted(mother)
else:
if father_handle:
father = database.get_person_from_handle(father_handle)
self.s = NameDisplay.displayer.display(father)
self.S = NameDisplay.displayer.sorted(father)
self.s = name_displayer.display(father)
self.S = name_displayer.sorted(father)
for e_ref in f.get_event_ref_list():
if not e_ref:
continue