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

* 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

View File

@@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2006 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
@@ -60,7 +60,7 @@ import gtk
#-------------------------------------------------------------------------
import const
from RelLib import *
from BasicUtils import NameDisplay
from BasicUtils import name_displayer
import DateHandler
import ToolTips
import GrampsLocale
@@ -320,8 +320,8 @@ class PeopleModel(gtk.GenericTreeModel):
def _build_search_sub(self,dfilter, skip):
ngn = NameDisplay.displayer.name_grouping_data
nsn = NameDisplay.displayer.raw_sorted_name
ngn = name_displayer.name_grouping_data
nsn = name_displayer.raw_sorted_name
self.mapper.clear_sort_names()
@@ -347,8 +347,8 @@ class PeopleModel(gtk.GenericTreeModel):
def _build_filter_sub(self,dfilter, skip):
ngn = NameDisplay.displayer.name_grouping_data
nsn = NameDisplay.displayer.raw_sorted_name
ngn = name_displayer.name_grouping_data
nsn = name_displayer.raw_sorted_name
plist = self.db.get_person_handles()
@@ -494,7 +494,7 @@ class PeopleModel(gtk.GenericTreeModel):
def column_sort_name(self, data, node):
n = Name()
n.unserialize(data[PeopleModel._NAME_COL])
return NameDisplay.displayer.sort_string(n)
return name_displayer.sort_string(n)
def column_spouse(self, data, node):
spouses_names = u""
@@ -510,14 +510,14 @@ class PeopleModel(gtk.GenericTreeModel):
spouse = self.db.get_person_from_handle(spouse_id)
if len(spouses_names) > 0:
spouses_names += ", "
spouses_names += NameDisplay.displayer.display(spouse)
spouses_names += name_displayer.display(spouse)
return spouses_names
def column_name(self, data, node):
try:
name = self.lru_name[node]
except:
name = NameDisplay.displayer.raw_sorted_name(data[PeopleModel._NAME_COL])
name = name_displayer.raw_sorted_name(data[PeopleModel._NAME_COL])
if not self.in_build:
self.lru_name[node] = name
return name