From 23213e590bc35be5e02003ab92c3af9f8c4e460a Mon Sep 17 00:00:00 2001
From: SNoiraud <serge.noiraud@laposte.net>
Date: Tue, 13 Dec 2016 09:50:36 +0100
Subject: [PATCH] NarrativeWeb: Reduce the Report options window.

---
 gramps/plugins/webreport/narrativeweb.py | 36 ++++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py
index b178a80c5..d1757bc9b 100644
--- a/gramps/plugins/webreport/narrativeweb.py
+++ b/gramps/plugins/webreport/narrativeweb.py
@@ -9605,10 +9605,13 @@ class NavWebOptions(MenuReportOptions):
         @param: menu -- The menu for which we add options
         """
         self.__add_report_options(menu)
+        self.__add_report_options_2(menu)
         self.__add_page_generation_options(menu)
+        self.__add_images_generation_options(menu)
         self.__add_privacy_options(menu)
         self.__add_download_options(menu)
         self.__add_advanced_options(menu)
+        self.__add_advanced_options_2(menu)
         self.__add_place_map_options(menu)
         self.__add_others_options(menu)
 
@@ -9658,6 +9661,15 @@ class NavWebOptions(MenuReportOptions):
 
         stdoptions.add_name_format_option(menu, category_name)
 
+        stdoptions.add_localization_option(menu, category_name)
+
+    def __add_report_options_2(self, menu):
+        """
+        Continue Options on the "Report Options" tab.
+        """
+        category_name = _("Report Options (2)")
+        addopt = partial( menu.add_option, category_name )
+
         ext = EnumeratedListOption(_("File extension"), ".html")
         for etype in _WEB_EXT:
             ext.add_item(etype, etype)
@@ -9718,10 +9730,12 @@ class NavWebOptions(MenuReportOptions):
         self.__graphgens.set_help(_("The number of generations to include in "
                                     "the ancestor graph"))
         addopt("graphgens", self.__graphgens)
-
-        stdoptions.add_localization_option(menu, category_name)
         self.__graph_changed()
 
+        nogid = BooleanOption(_('Suppress Gramps ID'), False)
+        nogid.set_help(_('Whether to include the Gramps ID of objects'))
+        addopt( "nogid", nogid )
+
     def __add_page_generation_options(self, menu):
         """
         Options on the "Page Generation" tab.
@@ -9767,6 +9781,13 @@ class NavWebOptions(MenuReportOptions):
         footernote.set_help(_("A note to be used as the page footer"))
         addopt("footernote", footernote)
 
+    def __add_images_generation_options(self, menu):
+        """
+        Options on the "Page Generation" tab.
+        """
+        category_name = _("Images Generation")
+        addopt = partial(menu.add_option, category_name)
+
         self.__gallery = BooleanOption(_("Include images and media objects"),
                                        True)
         self.__gallery.set_help(_('Whether to include '
@@ -9807,10 +9828,6 @@ class NavWebOptions(MenuReportOptions):
 
         self.__gallery_changed()
 
-        nogid = BooleanOption(_('Suppress Gramps ID'), False)
-        nogid.set_help(_('Whether to include the Gramps ID of objects'))
-        addopt("nogid", nogid)
-
     def __add_privacy_options(self, menu):
         """
         Options on the "Privacy" tab.
@@ -9909,6 +9926,13 @@ class NavWebOptions(MenuReportOptions):
               "step-siblings with the parents and siblings"))
         addopt('showhalfsiblings', showallsiblings)
 
+    def __add_advanced_options_2(self, menu):
+        """
+        Continue options on the "Advanced" tab.
+        """
+        category_name = _("Advanced Options (2)")
+        addopt = partial(menu.add_option, category_name)
+
         birthorder = BooleanOption(
             _('Sort all children in birth order'), False)
         birthorder.set_help(