* src/gramps.glade: remove name display options
* src/GrampsCfg.py: remove name displaying functions * src/Makefile.am: add NameDisplay.py to list * src/NameDisplay.py: New name displaying class * src/Utils.py: use new NameDisplay class * src/AddSpouse.py: use new NameDisplay class * src/AddrEdit.py: use new NameDisplay class * src/Bookmarks.py: use new NameDisplay class * src/ChooseParents.py: use new NameDisplay class * src/DisplayModels.py: use new NameDisplay class * src/EditPerson.py: use new NameDisplay class * src/EditPlace.py: use new NameDisplay class * src/EditSource.py: use new NameDisplay class * src/FamilyView.py: use new NameDisplay class * src/GenericFilter.py: use new NameDisplay class * src/ImageSelect.py: use new NameDisplay class * src/Marriage.py: use new NameDisplay class * src/MergeData.py: use new NameDisplay class * src/NameEdit.py: use new NameDisplay class * src/PedView.py: use new NameDisplay class * src/PeopleModel.py: use new NameDisplay class * src/ReadGedcom.py: use new NameDisplay class * src/Report.py: use new NameDisplay class * src/SelectChild.py: use new NameDisplay class * src/SubstKeywords.py: use new NameDisplay class * src/Witness.py: use new NameDisplay class * src/WriteGedcom.py: use new NameDisplay class * src/gramps_main.py: use new NameDisplay class * src/plugins/Desbrowser.py: use new NameDisplay class * src/plugins/Merge.py: use new NameDisplay class * src/plugins/RelCalc.py: use new NameDisplay class svn: r3852
This commit is contained in:
@@ -42,6 +42,8 @@ __version__ = "$Revision$"
|
||||
#------------------------------------------------------------------------
|
||||
import string
|
||||
|
||||
import NameDisplay
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
# SubstKeywords
|
||||
@@ -69,8 +71,8 @@ class SubstKeywords:
|
||||
"""Creates a new object and associates a person with it."""
|
||||
|
||||
person = database.get_person_from_handle(person_handle)
|
||||
self.n = person.get_primary_name().get_regular_name()
|
||||
self.N = person.get_primary_name().get_name()
|
||||
self.n = NameDisplay.displayer.display(person)
|
||||
self.N = NameDisplay.displayer.sorted(person)
|
||||
self.b = ""
|
||||
self.B = ""
|
||||
self.d = ""
|
||||
@@ -104,13 +106,13 @@ class SubstKeywords:
|
||||
if father_handle == person_handle:
|
||||
if mother_handle:
|
||||
mother = database.get_person_from_handle(mother_handle)
|
||||
self.s = mother.get_primary_name().get_regular_name()
|
||||
self.S = mother.get_primary_name().get_name()
|
||||
self.s = NameDisplay.displayer.display(mother)
|
||||
self.S = NameDIsplay.displayer.sorted(mother)
|
||||
else:
|
||||
if father_handle:
|
||||
father = database.get_person_from_handle(father_handle)
|
||||
self.s = father.get_primary_name().get_regular_name()
|
||||
self.S = father.get_primary_name().get_name()
|
||||
self.s = NameDisplay.displayer.display(father)
|
||||
self.S = NameDisplay.displayer.sorted(father)
|
||||
for e_id in f.get_event_list():
|
||||
if not e_id:
|
||||
continue
|
||||
|
Reference in New Issue
Block a user