From 1ee74098669527c5aafc7e31c69d13ec4ad78932 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Wed, 1 Apr 2015 12:30:55 -0700 Subject: [PATCH] make reports' privacy option more prominent, harder to miss --- gramps/plugins/drawreport/ancestortree.py | 4 ++-- gramps/plugins/drawreport/calendarreport.py | 4 ++-- gramps/plugins/drawreport/descendtree.py | 4 ++-- gramps/plugins/drawreport/fanchart.py | 4 ++-- gramps/plugins/drawreport/statisticschart.py | 4 ++-- gramps/plugins/drawreport/timeline.py | 4 ++-- gramps/plugins/textreport/ancestorreport.py | 4 ++-- gramps/plugins/textreport/birthdayreport.py | 4 ++-- gramps/plugins/textreport/descendreport.py | 4 ++-- gramps/plugins/textreport/detancestralreport.py | 4 ++-- gramps/plugins/textreport/detdescendantreport.py | 4 ++-- gramps/plugins/textreport/familygroup.py | 4 ++-- gramps/plugins/textreport/kinshipreport.py | 4 ++-- gramps/plugins/textreport/placereport.py | 4 ++-- gramps/plugins/textreport/recordsreport.py | 4 ++-- gramps/plugins/webreport/webcal.py | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gramps/plugins/drawreport/ancestortree.py b/gramps/plugins/drawreport/ancestortree.py index 9fb6b90d7..8e54d6474 100644 --- a/gramps/plugins/drawreport/ancestortree.py +++ b/gramps/plugins/drawreport/ancestortree.py @@ -897,6 +897,8 @@ class AncestorTreeOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category_name) + stdoptions.add_private_data_option(menu, category_name) + self.max_gen = NumberOption(_("Generations"), 10, 1, 50) self.max_gen.set_help(_("The number of generations to include " "in the tree")) @@ -933,8 +935,6 @@ class AncestorTreeOptions(MenuReportOptions): centerDisp.set_help(_("Which Display format to use the center person")) menu.add_option(category_name, "center_uses", centerDisp) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) ################## diff --git a/gramps/plugins/drawreport/calendarreport.py b/gramps/plugins/drawreport/calendarreport.py index 8d58d6fa8..9dd811bc6 100644 --- a/gramps/plugins/drawreport/calendarreport.py +++ b/gramps/plugins/drawreport/calendarreport.py @@ -485,6 +485,8 @@ class CalendarOptions(MenuReportOptions): self.__update_filters() + stdoptions.add_private_data_option(menu, category_name) + country = EnumeratedListOption(_("Country for holidays"), 0) holiday_table = libholiday.HolidayTable() countries = holiday_table.get_countries() @@ -514,8 +516,6 @@ class CalendarOptions(MenuReportOptions): maiden_name.set_help(_("Select married women's displayed surname")) add_option("maiden_name", maiden_name) - stdoptions.add_private_data_option(menu, category_name) - alive = BooleanOption(_("Include only living people"), True) alive.set_help(_("Include only living people in the calendar")) add_option("alive", alive) diff --git a/gramps/plugins/drawreport/descendtree.py b/gramps/plugins/drawreport/descendtree.py index ca7617c8a..9c9c3b596 100644 --- a/gramps/plugins/drawreport/descendtree.py +++ b/gramps/plugins/drawreport/descendtree.py @@ -1504,6 +1504,8 @@ class DescendTreeOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category_name) + stdoptions.add_private_data_option(menu, category_name) + self.showparents = BooleanOption( _('Start with the parent(s) of the selected first'), False) @@ -1527,8 +1529,6 @@ class DescendTreeOptions(MenuReportOptions): "resulting in a smaller tree")) menu.add_option(category_name, "compress_tree", compresst) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) ################## diff --git a/gramps/plugins/drawreport/fanchart.py b/gramps/plugins/drawreport/fanchart.py index 98da7f248..b077773fc 100644 --- a/gramps/plugins/drawreport/fanchart.py +++ b/gramps/plugins/drawreport/fanchart.py @@ -653,6 +653,8 @@ class FanChartOptions(MenuReportOptions): pid.set_help(_("The center person for the report")) menu.add_option(category_name, "pid", pid) + stdoptions.add_private_data_option(menu, category_name) + max_gen = NumberOption(_("Generations"), 5, 1, self.MAX_GENERATIONS) max_gen.set_help(_("The number of generations " "to include in the report")) @@ -690,8 +692,6 @@ class FanChartOptions(MenuReportOptions): "for each generation in the style editor")) menu.add_option(category_name, "same_style", same_style) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) def make_default_style(self,default_style): diff --git a/gramps/plugins/drawreport/statisticschart.py b/gramps/plugins/drawreport/statisticschart.py index 5af510c57..271821a9c 100644 --- a/gramps/plugins/drawreport/statisticschart.py +++ b/gramps/plugins/drawreport/statisticschart.py @@ -964,6 +964,8 @@ class StatisticsChartOptions(MenuReportOptions): self.__update_filters() + stdoptions.add_private_data_option(menu, category_name) + sortby = EnumeratedListOption(_('Sort chart items by'), _options.SORT_VALUE ) for item_idx in range(len(_options.opt_sorts)): @@ -1007,8 +1009,6 @@ class StatisticsChartOptions(MenuReportOptions): "used instead of a bar chart.")) add_option("bar_items", bar_items) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) # ------------------------------------------------- diff --git a/gramps/plugins/drawreport/timeline.py b/gramps/plugins/drawreport/timeline.py index 1b4a5fa03..4d201a8fd 100644 --- a/gramps/plugins/drawreport/timeline.py +++ b/gramps/plugins/drawreport/timeline.py @@ -398,6 +398,8 @@ class TimeLineOptions(MenuReportOptions): self.__update_filters() + stdoptions.add_private_data_option(menu, category_name) + sortby = EnumeratedListOption(_('Sort by'), 0 ) idx = 0 for item in _get_sort_functions(Sort(self.__db)): @@ -406,8 +408,6 @@ class TimeLineOptions(MenuReportOptions): sortby.set_help( _("Sorting method to use")) menu.add_option(category_name,"sortby",sortby) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) def __update_filters(self): diff --git a/gramps/plugins/textreport/ancestorreport.py b/gramps/plugins/textreport/ancestorreport.py index eb45aab73..d660131b8 100644 --- a/gramps/plugins/textreport/ancestorreport.py +++ b/gramps/plugins/textreport/ancestorreport.py @@ -269,6 +269,8 @@ class AncestorOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category_name) + stdoptions.add_private_data_option(menu, category_name) + maxgen = NumberOption(_("Generations"), 10, 1, 100) maxgen.set_help(_("The number of generations to include in the report")) menu.add_option(category_name, "maxgen", maxgen) @@ -282,8 +284,6 @@ class AncestorOptions(MenuReportOptions): namebrk.set_help(_("Indicates if a line break should follow the name.")) menu.add_option(category_name, "namebrk", namebrk) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) def make_default_style(self, default_style): diff --git a/gramps/plugins/textreport/birthdayreport.py b/gramps/plugins/textreport/birthdayreport.py index 6c04f158d..f7b82e3aa 100644 --- a/gramps/plugins/textreport/birthdayreport.py +++ b/gramps/plugins/textreport/birthdayreport.py @@ -429,6 +429,8 @@ class BirthdayOptions(MenuReportOptions): self.__update_filters() + stdoptions.add_private_data_option(menu, category_name) + country = EnumeratedListOption(_("Country for holidays"), 0) holiday_table = libholiday.HolidayTable() countries = holiday_table.get_countries() @@ -458,8 +460,6 @@ class BirthdayOptions(MenuReportOptions): maiden_name.set_help(_("Select married women's displayed surname")) menu.add_option(category_name, "maiden_name", maiden_name) - stdoptions.add_private_data_option(menu, category_name) - alive = BooleanOption(_("Include only living people"), True) alive.set_help(_("Include only living people in the report")) menu.add_option(category_name, "alive", alive) diff --git a/gramps/plugins/textreport/descendreport.py b/gramps/plugins/textreport/descendreport.py index e5969ab91..26a41398e 100644 --- a/gramps/plugins/textreport/descendreport.py +++ b/gramps/plugins/textreport/descendreport.py @@ -403,6 +403,8 @@ class DescendantOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category_name) + stdoptions.add_private_data_option(menu, category_name) + numbering = EnumeratedListOption(_("Numbering system"), "Simple") numbering.set_items([ ("Simple", _("Simple numbering")), @@ -428,8 +430,6 @@ class DescendantOptions(MenuReportOptions): _("Whether to show duplicate Family Trees in the report.")) menu.add_option(category_name, "dups", dups) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) def make_default_style(self, default_style): diff --git a/gramps/plugins/textreport/detancestralreport.py b/gramps/plugins/textreport/detancestralreport.py index e5aa3c5e8..eccc45c88 100644 --- a/gramps/plugins/textreport/detancestralreport.py +++ b/gramps/plugins/textreport/detancestralreport.py @@ -757,12 +757,12 @@ class DetAncestorOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category) + stdoptions.add_private_data_option(menu, category) + gen = NumberOption(_("Generations"),10,1,100) gen.set_help(_("The number of generations to include in the report")) addopt("gen", gen) - stdoptions.add_private_data_option(menu, category) - pagebbg = BooleanOption(_("Page break between generations"),False) pagebbg.set_help( _("Whether to start a new page after each generation.")) diff --git a/gramps/plugins/textreport/detdescendantreport.py b/gramps/plugins/textreport/detdescendantreport.py index efd46f0e8..9c996d76d 100644 --- a/gramps/plugins/textreport/detdescendantreport.py +++ b/gramps/plugins/textreport/detdescendantreport.py @@ -909,6 +909,8 @@ class DetDescendantOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category) + stdoptions.add_private_data_option(menu, category) + numbering = EnumeratedListOption(_("Numbering system"), "Henry") numbering.set_items([ ("Henry", _("Henry numbering")), @@ -934,8 +936,6 @@ class DetDescendantOptions(MenuReportOptions): _("Whether to start a new page before the end notes.")) add_option("pageben", pageben) - stdoptions.add_private_data_option(menu, category) - stdoptions.add_localization_option(menu, category) # Content diff --git a/gramps/plugins/textreport/familygroup.py b/gramps/plugins/textreport/familygroup.py index 043becf82..b82270bb7 100644 --- a/gramps/plugins/textreport/familygroup.py +++ b/gramps/plugins/textreport/familygroup.py @@ -642,13 +642,13 @@ class FamilyGroupOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category_name) + stdoptions.add_private_data_option(menu, category_name) + recursive = BooleanOption(_('Recursive'),False) recursive.set_help(_("Create reports for all descendants " "of this family.")) add_option("recursive", recursive) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) ########################## diff --git a/gramps/plugins/textreport/kinshipreport.py b/gramps/plugins/textreport/kinshipreport.py index a9a981f1a..bdf31a0f5 100644 --- a/gramps/plugins/textreport/kinshipreport.py +++ b/gramps/plugins/textreport/kinshipreport.py @@ -342,6 +342,8 @@ class KinshipOptions(MenuReportOptions): stdoptions.add_name_format_option(menu, category_name) + stdoptions.add_private_data_option(menu, category_name) + maxdescend = NumberOption(_("Max Descendant Generations"), 2, 1, 20) maxdescend.set_help(_("The maximum number of descendant generations")) menu.add_option(category_name, "maxdescend", maxdescend) @@ -362,8 +364,6 @@ class KinshipOptions(MenuReportOptions): incaunts.set_help(_("Whether to include aunts/uncles/nephews/nieces")) menu.add_option(category_name, "incaunts", incaunts) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) def make_default_style(self, default_style): diff --git a/gramps/plugins/textreport/placereport.py b/gramps/plugins/textreport/placereport.py index 6abc1bc83..4d0a7901d 100644 --- a/gramps/plugins/textreport/placereport.py +++ b/gramps/plugins/textreport/placereport.py @@ -399,6 +399,8 @@ class PlaceOptions(MenuReportOptions): places.set_help(_("List of places to report on")) menu.add_option(category_name, "places", places) + stdoptions.add_private_data_option(menu, category_name) + stdoptions.add_name_format_option(menu, category_name) center = EnumeratedListOption(_("Center on"), "Event") @@ -408,8 +410,6 @@ class PlaceOptions(MenuReportOptions): center.set_help(_("If report is event or person centered")) menu.add_option(category_name, "center", center) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) def make_default_style(self, default_style): diff --git a/gramps/plugins/textreport/recordsreport.py b/gramps/plugins/textreport/recordsreport.py index 54d270756..2e1fd48e9 100644 --- a/gramps/plugins/textreport/recordsreport.py +++ b/gramps/plugins/textreport/recordsreport.py @@ -177,6 +177,8 @@ class RecordsReportOptions(MenuReportOptions): self.__update_filters() + stdoptions.add_private_data_option(menu, category_name) + top_size = NumberOption(_("Number of ranks to display"), 3, 1, 100) menu.add_option(category_name, "top_size", top_size) @@ -190,8 +192,6 @@ class RecordsReportOptions(MenuReportOptions): footer = StringOption(_("Footer text"), "") menu.add_option(category_name, "footer", footer) - stdoptions.add_private_data_option(menu, category_name) - stdoptions.add_localization_option(menu, category_name) for (text, varname, default) in RECORDS: diff --git a/gramps/plugins/webreport/webcal.py b/gramps/plugins/webreport/webcal.py index 43944f8e1..2cafc18c0 100644 --- a/gramps/plugins/webreport/webcal.py +++ b/gramps/plugins/webreport/webcal.py @@ -1358,6 +1358,8 @@ class WebCalOptions(MenuReportOptions): name_format.set_help(_("Select the format to display names")) menu.add_option(category_name, "name_format", name_format) + stdoptions.add_private_data_option(menu, category_name, default=False) + ext = EnumeratedListOption(_("File extension"), ".html" ) for etype in _WEB_EXT: ext.add_item(etype, etype) @@ -1445,8 +1447,6 @@ class WebCalOptions(MenuReportOptions): "the main page of the web site")) menu.add_option(category_name, "home_link", home_link) - stdoptions.add_private_data_option(menu, category_name, default=False) - alive = BooleanOption(_("Include only living people"), True) alive.set_help(_("Include only living people in the calendar")) menu.add_option(category_name, "alive", alive)