From f072dd889e7af36c87163a281a2a65f12318641c Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Fri, 9 Dec 2016 19:49:32 -0800 Subject: [PATCH] make report dialog height less than 600, for smaller displays [FGR] --- gramps/plugins/textreport/familygroup.py | 29 ++++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/gramps/plugins/textreport/familygroup.py b/gramps/plugins/textreport/familygroup.py index d6b44ade3..d4edde62f 100644 --- a/gramps/plugins/textreport/familygroup.py +++ b/gramps/plugins/textreport/familygroup.py @@ -733,19 +733,13 @@ class FamilyGroupOptions(MenuReportOptions): stdoptions.add_localization_option(menu, category_name) ########################## - add_option = partial(menu.add_option, _("Include")) + add_option = partial(menu.add_option, _("Include 1")) ########################## gramps_ids = BooleanOption(_('Gramps ID'), False) gramps_ids.set_help(_("Whether to include Gramps ID next to names.")) add_option("gramps_ids", gramps_ids) - generations = BooleanOption(_("Generation numbers " - "(recursive only)"), True) - generations.set_help(_("Whether to include the generation on each " - "report (recursive only).")) - add_option("generations", generations) - inc_par_events = BooleanOption(_("Parent Events"), False) inc_par_events.set_help(_("Whether to include events for parents.")) add_option("incParEvents", inc_par_events) @@ -772,6 +766,10 @@ class FamilyGroupOptions(MenuReportOptions): _("Whether to include marriage information for parents.")) add_option("incParMar", inc_par_mar) + ########################## + add_option = partial(menu.add_option, _("Include 2")) + ########################## + inc_fam_notes = BooleanOption(_("Family Notes"), False) inc_fam_notes.set_help(_("Whether to include notes for families.")) add_option("incFamNotes", inc_fam_notes) @@ -786,6 +784,12 @@ class FamilyGroupOptions(MenuReportOptions): _("Whether to include marriage information for children.")) add_option("incChiMar", inc_chi_mar) + generations = BooleanOption(_("Generation numbers " + "(recursive only)"), False) + generations.set_help(_("Whether to include the generation on each " + "report (recursive only).")) + add_option("generations", generations) # TODO make insensitive if ... + ########################## add_option = partial(menu.add_option, _("Missing Information")) ########################## @@ -804,8 +808,8 @@ class FamilyGroupOptions(MenuReportOptions): family = self.__db.get_family_from_gramps_id(fid) nfv = self._nf.get_value() filter_list = utils.get_family_filters(self.__db, family, - include_single=True, - name_format=nfv) + include_single=True, + name_format=nfv) self.__filter.set_filters(filter_list) def __filter_changed(self): @@ -814,10 +818,11 @@ class FamilyGroupOptions(MenuReportOptions): If the filter is not family-specific, disable the family option """ filter_value = self.__filter.get_value() - if filter_value in [0, 2, 3]: # filters that rely on the center family - self.__fid.set_available(True) - else: # filters that don't + if filter_value == 1: # "Entire Database" (as "include_single=True") self.__fid.set_available(False) + else: + # The other filters need a center family (assume custom ones do) + self.__fid.set_available(True) # only allow recursion if the center family is the only family if self.__recursive and filter_value == 0: