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

* src/NameDisplay: include nickname if available

Browse Source 
* src/plugins/ScratchPad.py: Handle null handle


svn: r5188
This commit is contained in:
Don Allingham
2005-09-12 03:18:08 +00:00
parent 02d2c7cd73
commit 1b7a21225f
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-09-11 Don Allingham <don@gramps-project.org>
* src/NameDisplay: include nickname if available
* src/plugins/ScratchPad.py: Handle null handle
2005-09-10 Don Allingham <don@gramps-project.org> 2005-09-10 Don Allingham <don@gramps-project.org>
* src/ImageSelect.py: fix adding a new image that is actually * src/ImageSelect.py: fix adding a new image that is actually
already in the database. already in the database.

28
gramps2/src/NameDisplay.py
View File

@@ -133,9 +133,9 @@ class NameDisplay:
""" """
name = person.get_primary_name() name = person.get_primary_name()
if name.display_as == RelLib.Name.LNFN: if name.display_as == RelLib.Name.LNFN:
return self._lnfn(name) return self._lnfn(name,person.get_nick_name())
else: else:
return self._fnln(name) return self._fnln(name,person.get_nick_name())
def display_name(self,name): def display_name(self,name):
""" """
@@ -182,17 +182,21 @@ class NameDisplay:
else: else:
return "%s %s, %s" % (last, name.suffix, first) return "%s %s, %s" % (last, name.suffix, first)
def _fnln(self,name): def _fnln(self,name,nickname=""):
""" """
Prints the Western style first name, last name style. Prints the Western style first name, last name style.
Typically this is:: Typically this is::
FirstName Patronymic SurnamePrefix Surname SurnameSuffix FirstName Patronymic SurnamePrefix Surname SurnameSuffix
""" """
first = name.first_name
if nickname:
first = '%s "%s"' % (first,nickname)
if name.patronymic: if name.patronymic:
first = "%s %s" % (name.first_name, name.patronymic) first = "%s %s" % (first, name.patronymic)
else:
first = name.first_name
if self.force_upper: if self.force_upper:
last = name.surname.upper() last = name.surname.upper()
@@ -225,17 +229,21 @@ class NameDisplay:
val = pn.first_name val = pn.first_name
return db.get_name_group_mapping(val) return db.get_name_group_mapping(val)
def _lnfn(self,name): def _lnfn(self,name,nickname=u""):
""" """
Prints the Western style last name, first name style. Prints the Western style last name, first name style.
Typically this is:: Typically this is::
SurnamePrefix Surname, FirstName Patronymic SurnameSuffix SurnamePrefix Surname, FirstName Patronymic SurnameSuffix
""" """
first = name.first_name
if nickname:
first = '%s "%s"' % (first,nickname)
if name.patronymic: if name.patronymic:
first = "%s %s" % (name.first_name, name.patronymic) first = "%s %s" % (first, name.patronymic)
else:
first = name.first_name
if self.force_upper: if self.force_upper:
last = name.surname.upper() last = name.surname.upper()

3
gramps2/src/plugins/ScratchPad.py
View File

@@ -690,6 +690,9 @@ class ScratchPadListView:
wrapper_class = self._target_type_to_wrapper_class_map[str(possible_wrappers[0])] wrapper_class = self._target_type_to_wrapper_class_map[str(possible_wrappers[0])]
if not sel_data:
return
o = wrapper_class(self._gramps_model,sel_data) o = wrapper_class(self._gramps_model,sel_data)
# If the wrapper object is a subclass of ScratchDropList then # If the wrapper object is a subclass of ScratchDropList then