tweak report's filter option to display per the report's name-format

This commit is contained in:
Paul Franklin 2015-03-30 12:47:30 -07:00
parent d1653be44d
commit f53d6482da

View File

@ -477,12 +477,13 @@ class CalendarOptions(MenuReportOptions):
self.__pid = PersonOption(_("Center Person")) self.__pid = PersonOption(_("Center Person"))
self.__pid.set_help(_("The center person for the report")) self.__pid.set_help(_("The center person for the report"))
add_option("pid", self.__pid) menu.add_option(category_name, "pid", self.__pid)
self.__pid.connect('value-changed', self.__update_filters) self.__pid.connect('value-changed', self.__update_filters)
self.__update_filters()
stdoptions.add_name_format_option(menu, category_name) self._nf = stdoptions.add_name_format_option(menu, category_name)
self._nf.connect('value-changed', self.__update_filters)
self.__update_filters()
country = EnumeratedListOption(_("Country for holidays"), 0) country = EnumeratedListOption(_("Country for holidays"), 0)
holiday_table = libholiday.HolidayTable() holiday_table = libholiday.HolidayTable()
@ -550,7 +551,10 @@ class CalendarOptions(MenuReportOptions):
""" """
gid = self.__pid.get_value() gid = self.__pid.get_value()
person = self.__db.get_person_from_gramps_id(gid) person = self.__db.get_person_from_gramps_id(gid)
filter_list = ReportUtils.get_person_filters(person, False) nfv = self._nf.get_value()
filter_list = ReportUtils.get_person_filters(person,
include_single=False,
name_format=nfv)
self.__filter.set_filters(filter_list) self.__filter.set_filters(filter_list)
def make_my_style(self, default_style, name, description, def make_my_style(self, default_style, name, description,