* 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:
@ -39,6 +39,7 @@ import GrampsCfg
|
||||
import ImageSelect
|
||||
import ListModel
|
||||
import RelLib
|
||||
import NameDisplay
|
||||
|
||||
from gettext import gettext as _
|
||||
|
||||
@ -57,6 +58,7 @@ class EditSource:
|
||||
self.source = RelLib.Source()
|
||||
self.db = db
|
||||
self.parent = parent
|
||||
self.name_display = NameDisplay.displayer.display
|
||||
if source:
|
||||
if self.parent.child_windows.has_key(source.get_handle()):
|
||||
self.parent.child_windows[source.get_handle()].present(None)
|
||||
@ -248,7 +250,7 @@ class EditSource:
|
||||
p_list.append(name)
|
||||
for key in self.db.get_person_handles(sort_handles=False):
|
||||
p = self.db.get_person_from_handle(key)
|
||||
name = GrampsCfg.get_nameof()(p)
|
||||
name = self.name_display(p)
|
||||
for event_handle in p.get_event_list() + [p.get_birth_handle(), p.get_death_handle()]:
|
||||
if event_handle:
|
||||
event = self.db.get_event_from_handle(event_handle)
|
||||
@ -283,12 +285,12 @@ class EditSource:
|
||||
m = self.db.get_person_from_handle(m_id)
|
||||
if f_id and m_id:
|
||||
name = _("%(father)s and %(mother)s") % {
|
||||
"father" : GrampsCfg.get_nameof()(f),
|
||||
"mother" : GrampsCfg.get_nameof()(m)}
|
||||
"father" : self.name_display(f),
|
||||
"mother" : self.name_display(m)}
|
||||
elif f_id:
|
||||
name = GrampsCfg.get_nameof()(f)
|
||||
name = self.name_display(f)
|
||||
else:
|
||||
name = GrampsCfg.get_nameof()(m)
|
||||
name = self.name_display(m)
|
||||
for v_id in p.get_event_list():
|
||||
v = self.db.get_event_from_handle(v_id)
|
||||
if not v:
|
||||
|
Reference in New Issue
Block a user