From db9bb2246ecf1e55f31ffd122a6c104694906fa0 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Tue, 5 Jun 2001 04:40:37 +0000
Subject: [PATCH] Better handling of output format types, including user's
 preference

svn: r91
---
 gramps/src/FindDoc.py                   | 120 +++++
 gramps/src/HtmlDoc.py                   |   5 +-
 gramps/src/config.glade                 |   1 -
 gramps/src/plugins/AncestorReport.py    |  62 +--
 gramps/src/plugins/DescendReport.py     |  43 +-
 gramps/src/plugins/FamilyGroup.py       |  61 +--
 gramps/src/plugins/IndivSummary.py      |  45 +-
 gramps/src/plugins/ancestorreport.glade | 644 ++++++++++++------------
 gramps/src/plugins/desreport.glade      | 408 ++++++++-------
 gramps/src/plugins/familygroup.glade    | 409 ++++++++-------
 gramps/src/plugins/indsum.glade         | 392 ++++++++-------
 11 files changed, 1138 insertions(+), 1052 deletions(-)
 create mode 100644 gramps/src/FindDoc.py

diff --git a/gramps/src/FindDoc.py b/gramps/src/FindDoc.py
new file mode 100644
index 000000000..4ff8d6669
--- /dev/null
+++ b/gramps/src/FindDoc.py
@@ -0,0 +1,120 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2000  Donald N. Allingham
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+from TextDoc import *
+import gtk
+import Config
+import intl
+_ = intl.gettext
+
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+_OpenOffice = _("OpenOffice")
+_AbiWord    = _("AbiWord")
+_PDF        = _("PDF")
+_HTML       = _("HTML")
+
+_has_tables = 1
+_no_tables  = 0
+
+_paper      = 1
+_template   = 0
+
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+_textdoc = []
+
+try:
+    import OpenOfficeDoc
+    _textdoc.append((_OpenOffice, _has_tables, _paper))
+except:
+    pass
+
+try:
+    import AbiWordDoc
+    _textdoc.append((_AbiWord, _no_tables, _paper))
+except:
+    pass
+
+try:
+    import PdfDoc
+    _textdoc.append((_PDF, _has_tables, _paper))
+except:
+    pass
+
+try:
+    import HtmlDoc
+    _textdoc.append((_HTML, _has_tables, _template))
+except:
+    pass
+
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+def get_text_doc_menu(main_menu,tables,callback,obj=None):
+
+    index = 0
+    myMenu = gtk.GtkMenu()
+    for item in _textdoc:
+        if tables and item[1] == 0:
+            continue
+        name = item[0]
+        menuitem = gtk.GtkMenuItem(name)
+        menuitem.set_data("name",name)
+        menuitem.set_data("paper",item[2])
+        menuitem.set_data("obj",obj)
+        if callback:
+            menuitem.connect("activate",callback)
+        menuitem.show()
+        myMenu.append(menuitem)
+        if name == Config.output_preference:
+            myMenu.set_active(index)
+            callback(menuitem)
+        index = index + 1
+    main_menu.set_menu(myMenu)
+
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+def make_text_doc(name,paper,orien,template):
+    if name == _OpenOffice:
+        return OpenOfficeDoc.OpenOfficeDoc(paper,orien)
+    elif name == _AbiWord:
+        return AbiWordDoc.AbiWordDoc(paper,orien)
+    elif name == _PDF:
+        return PdfDoc.PdfDoc(paper,orien)
+    else:
+        return HtmlDoc.HtmlDoc(template)
+
diff --git a/gramps/src/HtmlDoc.py b/gramps/src/HtmlDoc.py
index 63e93d3a4..9770bde5f 100644
--- a/gramps/src/HtmlDoc.py
+++ b/gramps/src/HtmlDoc.py
@@ -22,6 +22,9 @@ import os
 import tempfile
 import string
 import re
+import intl
+
+_ = intl.gettext
 
 from TextDoc import *
 import const
@@ -69,7 +72,7 @@ class HtmlDoc(TextDoc):
         top_add = 1
         bottom_add = 0
 
-        if self.template != "":
+        if self.template and self.template != "":
             try:
                 templateFile = open(self.template,"r")
                 for line in templateFile.readlines():
diff --git a/gramps/src/config.glade b/gramps/src/config.glade
index 3df8133e3..0aa8a98fd 100644
--- a/gramps/src/config.glade
+++ b/gramps/src/config.glade
@@ -1340,7 +1340,6 @@ A4
       <widget>
 	<class>GtkOptionMenu</class>
 	<name>output_format</name>
-	<sensitive>False</sensitive>
 	<can_focus>True</can_focus>
 	<items>OpenOffice
 HTML
diff --git a/gramps/src/plugins/AncestorReport.py b/gramps/src/plugins/AncestorReport.py
index 692880d25..dcd0e8f8f 100644
--- a/gramps/src/plugins/AncestorReport.py
+++ b/gramps/src/plugins/AncestorReport.py
@@ -32,15 +32,7 @@ import intl
 _ = intl.gettext
 
 from TextDoc import *
-from OpenOfficeDoc import *
-from HtmlDoc import *
-from AbiWordDoc import *
-
-try:
-    from PdfDoc import *
-    no_pdf = 0
-except:
-    no_pdf = 1
+import FindDoc
 
 from gtk import *
 from gnome.ui import *
@@ -79,7 +71,7 @@ class AncestorReport:
         15: _("Fifteenth"),
         16: _("Sixteenth"),
         17: _("Seventeenth"),
-        18: _("Eigthteenth"),
+        18: _("Eightteenth"),
         19: _("Nineteenth"),
         20: _("Twentieth"),
         21: _("Twenty-first"),
@@ -322,39 +314,32 @@ def report(database,person):
     base = os.path.dirname(__file__)
     glade_file = base + os.sep + "ancestorreport.glade"
     topDialog = GladeXML(glade_file,"dialog1")
-    topDialog.get_widget("htmltemplate").set_sensitive(0)
 
     name = person.getPrimaryName().getRegularName()
 
     PaperMenu.make_paper_menu(topDialog.get_widget("papersize"))
     PaperMenu.make_orientation_menu(topDialog.get_widget("orientation"))
-
-    if no_pdf:
-        topDialog.get_widget("pdf").set_sensitive(0)
+    FindDoc.get_text_doc_menu(topDialog.get_widget("format"),0,option_switch)
         
     topDialog.get_widget("labelTitle").set_text("Ahnentafel Report for " + name)
     topDialog.signal_autoconnect({
         "destroy_passed_object" : utils.destroy_passed_object,
-        "on_save_clicked" : on_save_clicked,
-        "on_html_toggled" : on_html_toggled
+        "on_save_clicked" : on_save_clicked
         })
 
-
-#-------------------------------------------------------------------------
+#------------------------------------------------------------------------
 #
+# 
 #
-#
-#-------------------------------------------------------------------------
-def on_html_toggled(obj):
-    if obj.get_active():
-        topDialog.get_widget("htmltemplate").set_sensitive(1)
-        topDialog.get_widget("papersize").set_sensitive(0)
-        topDialog.get_widget("orientation").set_sensitive(0)
-    else:    
-        topDialog.get_widget("htmltemplate").set_sensitive(0)
-        topDialog.get_widget("papersize").set_sensitive(1)
-        topDialog.get_widget("orientation").set_sensitive(1)
-
+#------------------------------------------------------------------------
+def option_switch(obj):
+    val = obj.get_data("paper")
+    notebook = topDialog.get_widget("option_notebook")
+    if val == 1:
+        notebook.set_page(0)
+    else:
+        notebook.set_page(1)
+    
 #------------------------------------------------------------------------
 #
 # 
@@ -365,7 +350,7 @@ def on_save_clicked(obj):
     global db
 
     outputName = topDialog.get_widget("fileentry1").get_full_path(0)
-    if outputName == "":
+    if not outputName:
         return
 
     max_gen = topDialog.get_widget("generations").get_value_as_int()
@@ -376,17 +361,12 @@ def on_save_clicked(obj):
     orien_obj = topDialog.get_widget("orientation").get_menu().get_active()
     orien = orien_obj.get_data("i")
     
-    if topDialog.get_widget("openoffice").get_active():
-        document = OpenOfficeDoc(paper,orien)
-    elif topDialog.get_widget("abiword").get_active():
-        document = AbiWordDoc(paper,orien)
-    elif topDialog.get_widget("pdf").get_active():
-        document = PdfDoc(paper,orien)
-    else:
-        document = HtmlDoc(template)
+    item = topDialog.get_widget("format").get_menu().get_active()
+    format = item.get_data("name")
+    
+    doc = FindDoc.make_text_doc(format,paper,orien,template)
 
-    MyReport = AncestorReport(db,active_person,outputName,\
-                              max_gen, pgbrk, document)
+    MyReport = AncestorReport(db,active_person,outputName,max_gen,pgbrk,doc)
     MyReport.write_report()
         
     utils.destroy_passed_object(obj)
diff --git a/gramps/src/plugins/DescendReport.py b/gramps/src/plugins/DescendReport.py
index dea5eee1f..a8dac158a 100644
--- a/gramps/src/plugins/DescendReport.py
+++ b/gramps/src/plugins/DescendReport.py
@@ -33,15 +33,7 @@ import const
 import utils
 import const
 from TextDoc import *
-from OpenOfficeDoc import *
-from AbiWordDoc import *
-from HtmlDoc import *
-try:
-    import reportlab.platypus.tables
-    from PdfDoc import *
-    no_pdf = 0
-except:
-    no_pdf = 1
+import FindDoc
 
 from gtk import *
 from gnome.ui import *
@@ -158,16 +150,29 @@ class DesReportWindow:
 
         PaperMenu.make_paper_menu(self.top.get_widget("papersize"))
         PaperMenu.make_orientation_menu(self.top.get_widget("orientation"))
+        FindDoc.get_text_doc_menu(self.top.get_widget("format"),0,\
+                                  option_switch,\
+                                  self.top.get_widget("option_notebook"))
         
         mytop = self.top.get_widget("dialog1")
 
-        if no_pdf:
-            self.top.get_widget("pdf").set_sensitive(0)
-
         mytop.set_data("o",self)
         mytop.set_data("d",db)
         mytop.show()
         
+#------------------------------------------------------------------------
+#
+# 
+#
+#------------------------------------------------------------------------
+def option_switch(obj):
+    val = obj.get_data("paper")
+    notebook = obj.get_data("obj")
+    if val == 1:
+        notebook.set_page(0)
+    else:
+        notebook.set_page(1)
+        
 #------------------------------------------------------------------------
 #
 # 
@@ -195,14 +200,14 @@ def on_save_clicked(obj):
     orien_obj = myobj.top.get_widget("orientation")
     orien = orien_obj.get_menu().get_active().get_data("i")
 
-    if myobj.top.get_widget("openoffice").get_active():
-        document = OpenOfficeDoc(paper,orien)
-    elif myobj.top.get_widget("abiword").get_active():
-        document = AbiWordDoc(paper,orien)
-    else:
-        document = PdfDoc(paper,orien)
+    template = myobj.top.get_widget("htmltemplate").get_full_path(0)
 
-    report = DescendantReport(file,myobj.person,db,document)
+    item = myobj.top.get_widget("format").get_menu().get_active()
+    format = item.get_data("name")
+    
+    doc = FindDoc.make_text_doc(format,paper,orien,template)
+
+    report = DescendantReport(file,myobj.person,db,doc)
     report.setup()
     report.report()
     report.end()
diff --git a/gramps/src/plugins/FamilyGroup.py b/gramps/src/plugins/FamilyGroup.py
index 34518b77b..1b50a8d94 100644
--- a/gramps/src/plugins/FamilyGroup.py
+++ b/gramps/src/plugins/FamilyGroup.py
@@ -26,20 +26,12 @@ import os
 import re
 import sort
 import string
+import FindDoc
 import utils
 import intl
 
-_ = intl.gettext
-
 from TextDoc import *
-from OpenOfficeDoc import *
-from HtmlDoc import *
-try:
-    import reportlab.platypus.tables
-    from PdfDoc import *
-    no_pdf = 0
-except:
-    no_pdf = 1
+_ = intl.gettext
 
 from gtk import *
 from gnome.ui import *
@@ -403,18 +395,15 @@ def report(database,person):
     family_list = person.getFamilyList()
     label = topDialog.get_widget("labelTitle")
     
-    if no_pdf == 1:
-        topDialog.get_widget("pdf").set_sensitive(0)
-    
     label.set_text(_("Family Group Report for %s") % name)
     topDialog.signal_autoconnect({
         "destroy_passed_object" : utils.destroy_passed_object,
-        "on_save_clicked" : on_save_clicked,
-        "on_html_toggled" : on_html_toggled
+        "on_save_clicked" : on_save_clicked
         })
 
     PaperMenu.make_paper_menu(topDialog.get_widget("papersize"))
     PaperMenu.make_orientation_menu(topDialog.get_widget("orientation"))
+    FindDoc.get_text_doc_menu(topDialog.get_widget("format"),1,option_switch)
 
     frame = topDialog.get_widget("spouse")
     option_menu = topDialog.get_widget("spouse_menu")
@@ -436,14 +425,20 @@ def report(database,person):
         my_menu.append(item)
     option_menu.set_menu(my_menu)
 
-#-------------------------------------------------------------------------
+#------------------------------------------------------------------------
 #
+# 
 #
-#
-#-------------------------------------------------------------------------
-def on_html_toggled(obj):
-    topDialog.get_widget("htmltemplate").set_sensitive(obj.get_active())
-
+#------------------------------------------------------------------------
+def option_switch(obj):
+    val = obj.get_data("paper")
+    notebook = topDialog.get_widget("option_notebook")
+    
+    if val == 1:
+        notebook.set_page(0)
+    else:
+        notebook.set_page(1)
+    
 #------------------------------------------------------------------------
 #
 # 
@@ -454,7 +449,7 @@ def on_save_clicked(obj):
     global db
 
     outputName = topDialog.get_widget("fileentry1").get_full_path(0)
-    if outputName == "":
+    if not outputName:
         return
 
     menu = topDialog.get_widget("spouse_menu").get_menu()
@@ -463,15 +458,13 @@ def on_save_clicked(obj):
     paper = paper_obj.get_menu().get_active().get_data("i")
     orien_obj = topDialog.get_widget("orientation")
     orien = orien_obj.get_menu().get_active().get_data("i")
+    template = topDialog.get_widget("htmlfile").get_text()
 
-    if topDialog.get_widget("html").get_active():
-        template = topDialog.get_widget("htmlfile").get_text()
-        doc = HtmlDoc(template)
-    elif topDialog.get_widget("openoffice").get_active():
-        doc = OpenOfficeDoc(paper,orien)
-    else:
-        doc = PdfDoc(paper,orien)
-
+    item = topDialog.get_widget("format").get_menu().get_active()
+    format = item.get_data("name")
+    
+    doc = FindDoc.make_text_doc(format,paper,orien,template)
+    
     MyReport = FamilyGroup(db,family,outputName,doc)
 
     MyReport.setup()
@@ -489,11 +482,3 @@ def get_description():
 
 def get_name():
     return _("Generate files/Family Group Report")
-
-
-
-
-
-
-
-
diff --git a/gramps/src/plugins/IndivSummary.py b/gramps/src/plugins/IndivSummary.py
index 9e7610117..e86cb85fc 100644
--- a/gramps/src/plugins/IndivSummary.py
+++ b/gramps/src/plugins/IndivSummary.py
@@ -32,15 +32,7 @@ import intl
 _ = intl.gettext
 
 from TextDoc import *
-from OpenOfficeDoc import *
-from HtmlDoc import *
-from AbiWordDoc import *
-try:
-    import reportlab.platypus.tables
-    from PdfDoc import *
-    no_pdf = 0
-except:
-    no_pdf = 1
+import FindDoc
 
 from gtk import *
 from gnome.ui import *
@@ -381,25 +373,28 @@ def report(database,person):
     label = topDialog.get_widget("labelTitle")
     
     label.set_text("Individual Summary for " + name)
-    if no_pdf:
-        topDialog.get_widget("pdf").set_sensitive(0)
 
     PaperMenu.make_paper_menu(topDialog.get_widget("papersize"))
     PaperMenu.make_orientation_menu(topDialog.get_widget("orientation"))
+    FindDoc.get_text_doc_menu(topDialog.get_widget("format"),0,option_switch)
 
     topDialog.signal_autoconnect({
         "destroy_passed_object" : utils.destroy_passed_object,
-        "on_save_clicked" : on_save_clicked,
-        "on_html_toggled" : on_html_toggled
+        "on_save_clicked" : on_save_clicked
         })
 
-#-------------------------------------------------------------------------
+#------------------------------------------------------------------------
 #
+# 
 #
-#
-#-------------------------------------------------------------------------
-def on_html_toggled(obj):
-    topDialog.get_widget("htmltemplate").set_sensitive(obj.get_active())
+#------------------------------------------------------------------------
+def option_switch(obj):
+    val = obj.get_data("paper")
+    notebook = topDialog.get_widget("option_notebook")
+    if val == 1:
+        notebook.set_page(0)
+    else:
+        notebook.set_page(1)
 
 #------------------------------------------------------------------------
 #
@@ -411,21 +406,19 @@ def on_save_clicked(obj):
     global db
 
     outputName = topDialog.get_widget("fileentry1").get_full_path(0)
-    if outputName == "":
+    if not outputName:
         return
 
     paper_obj = topDialog.get_widget("papersize")
     paper = paper_obj.get_menu().get_active().get_data("i")
     orien_obj = topDialog.get_widget("orientation")
     orien = orien_obj.get_menu().get_active().get_data("i")
+    template = topDialog.get_widget("htmltemplate").get_full_path(0)
 
-    if topDialog.get_widget("html").get_active():
-        template = topDialog.get_widget("htmlfile").get_text()
-        doc = HtmlDoc(template)
-    elif topDialog.get_widget("pdf").get_active():
-        doc = PdfDoc(paper,orien)
-    else:
-        doc = OpenOfficeDoc(paper,orien)
+    item = topDialog.get_widget("format").get_menu().get_active()
+    format = item.get_data("name")
+    
+    doc = FindDoc.make_text_doc(format,paper,orien,template)
 
     MyReport = IndivSummary(db,active_person,outputName,doc)
 
diff --git a/gramps/src/plugins/ancestorreport.glade b/gramps/src/plugins/ancestorreport.glade
index d9c2c8c5e..b42b30d8f 100644
--- a/gramps/src/plugins/ancestorreport.glade
+++ b/gramps/src/plugins/ancestorreport.glade
@@ -191,143 +191,13 @@
 	</child>
 
 	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>openoffice</name>
-	    <can_focus>True</can_focus>
-	    <label>OpenOffice </label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>abiword</name>
-	    <can_focus>True</can_focus>
-	    <label>AbiWord</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>pdf</name>
-	    <can_focus>True</can_focus>
-	    <label>PDF</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox5</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>html</name>
-	      <can_focus>True</can_focus>
-	      <signal>
-		<name>toggled</name>
-		<handler>on_html_toggled</handler>
-		<last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	      </signal>
-	      <label>HTML</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>format</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox1</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label11</name>
-		<label>Template</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>5</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GnomeFileEntry</class>
-		<name>htmltemplate</name>
-		<sensitive>False</sensitive>
-		<history_id>HtmlTemplate</history_id>
-		<max_saved>10</max_saved>
-		<title>Choose the HTML template</title>
-		<directory>False</directory>
-		<modal>False</modal>
-		<child>
-		  <padding>5</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <child_name>GnomeEntry:entry</child_name>
-		  <name>htmlfile</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
+	  <class>GtkOptionMenu</class>
+	  <name>format</name>
+	  <border_width>10</border_width>
+	  <can_focus>True</can_focus>
+	  <items>
+</items>
+	  <initial_choice>0</initial_choice>
 	</widget>
       </widget>
 
@@ -362,13 +232,10 @@
 	    </child>
 
 	    <widget>
-	      <class>GtkTable</class>
-	      <name>table1</name>
-	      <rows>4</rows>
-	      <columns>2</columns>
+	      <class>GtkVBox</class>
+	      <name>vbox6</name>
 	      <homogeneous>False</homogeneous>
-	      <row_spacing>0</row_spacing>
-	      <column_spacing>0</column_spacing>
+	      <spacing>0</spacing>
 	      <child>
 		<padding>0</padding>
 		<expand>True</expand>
@@ -376,180 +243,335 @@
 	      </child>
 
 	      <widget>
-		<class>GtkLabel</class>
-		<name>label14</name>
-		<label>Paper</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>5</xpad>
-		<ypad>0</ypad>
+		<class>GtkTable</class>
+		<name>table1</name>
+		<rows>3</rows>
+		<columns>2</columns>
+		<homogeneous>False</homogeneous>
+		<row_spacing>0</row_spacing>
+		<column_spacing>0</column_spacing>
 		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <name>label13</name>
+		  <label>Generations</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>1</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>5</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <left_attach>0</left_attach>
+		    <right_attach>1</right_attach>
+		    <top_attach>0</top_attach>
+		    <bottom_attach>1</bottom_attach>
+		    <xpad>0</xpad>
+		    <ypad>0</ypad>
+		    <xexpand>False</xexpand>
+		    <yexpand>False</yexpand>
+		    <xshrink>False</xshrink>
+		    <yshrink>False</yshrink>
+		    <xfill>True</xfill>
+		    <yfill>False</yfill>
+		  </child>
+		</widget>
+
+		<widget>
+		  <class>GtkCheckButton</class>
+		  <name>pagebreak</name>
+		  <can_focus>True</can_focus>
+		  <label>Page break between generations</label>
+		  <active>False</active>
+		  <draw_indicator>True</draw_indicator>
+		  <child>
+		    <left_attach>1</left_attach>
+		    <right_attach>2</right_attach>
+		    <top_attach>1</top_attach>
+		    <bottom_attach>2</bottom_attach>
+		    <xpad>5</xpad>
+		    <ypad>5</ypad>
+		    <xexpand>False</xexpand>
+		    <yexpand>False</yexpand>
+		    <xshrink>False</xshrink>
+		    <yshrink>False</yshrink>
+		    <xfill>True</xfill>
+		    <yfill>False</yfill>
+		  </child>
+		</widget>
+
+		<widget>
+		  <class>GtkSpinButton</class>
+		  <name>generations</name>
+		  <can_focus>True</can_focus>
+		  <climb_rate>1</climb_rate>
+		  <digits>0</digits>
+		  <numeric>True</numeric>
+		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+		  <snap>False</snap>
+		  <wrap>False</wrap>
+		  <value>10</value>
+		  <lower>1</lower>
+		  <upper>28</upper>
+		  <step>1</step>
+		  <page>10</page>
+		  <page_size>10</page_size>
+		  <child>
+		    <left_attach>1</left_attach>
+		    <right_attach>2</right_attach>
+		    <top_attach>0</top_attach>
+		    <bottom_attach>1</bottom_attach>
+		    <xpad>5</xpad>
+		    <ypad>5</ypad>
+		    <xexpand>True</xexpand>
+		    <yexpand>False</yexpand>
+		    <xshrink>False</xshrink>
+		    <yshrink>False</yshrink>
+		    <xfill>True</xfill>
+		    <yfill>False</yfill>
+		  </child>
+		</widget>
+
+		<widget>
+		  <class>GtkHSeparator</class>
+		  <name>hseparator2</name>
+		  <child>
+		    <left_attach>0</left_attach>
+		    <right_attach>2</right_attach>
+		    <top_attach>2</top_attach>
+		    <bottom_attach>3</bottom_attach>
+		    <xpad>0</xpad>
+		    <ypad>5</ypad>
+		    <xexpand>False</xexpand>
+		    <yexpand>True</yexpand>
+		    <xshrink>False</xshrink>
+		    <yshrink>False</yshrink>
+		    <xfill>True</xfill>
+		    <yfill>True</yfill>
+		  </child>
+		</widget>
+	      </widget>
+
+	      <widget>
+		<class>GtkNotebook</class>
+		<name>option_notebook</name>
+		<show_tabs>False</show_tabs>
+		<show_border>False</show_border>
+		<tab_pos>GTK_POS_TOP</tab_pos>
+		<scrollable>False</scrollable>
+		<tab_hborder>2</tab_hborder>
+		<tab_vborder>2</tab_vborder>
+		<popup_enable>False</popup_enable>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+
+		<widget>
+		  <class>GtkTable</class>
+		  <name>table2</name>
+		  <rows>2</rows>
+		  <columns>2</columns>
+		  <homogeneous>False</homogeneous>
+		  <row_spacing>0</row_spacing>
+		  <column_spacing>0</column_spacing>
+
+		  <widget>
+		    <class>GtkLabel</class>
+		    <name>label14</name>
+		    <label>Paper</label>
+		    <justify>GTK_JUSTIFY_CENTER</justify>
+		    <wrap>False</wrap>
+		    <xalign>1</xalign>
+		    <yalign>0.5</yalign>
+		    <xpad>5</xpad>
+		    <ypad>0</ypad>
+		    <child>
+		      <left_attach>0</left_attach>
+		      <right_attach>1</right_attach>
+		      <top_attach>0</top_attach>
+		      <bottom_attach>1</bottom_attach>
+		      <xpad>0</xpad>
+		      <ypad>0</ypad>
+		      <xexpand>False</xexpand>
+		      <yexpand>False</yexpand>
+		      <xshrink>False</xshrink>
+		      <yshrink>False</yshrink>
+		      <xfill>True</xfill>
+		      <yfill>False</yfill>
+		    </child>
+		  </widget>
+
+		  <widget>
+		    <class>GtkLabel</class>
+		    <name>label15</name>
+		    <label>Orientation</label>
+		    <justify>GTK_JUSTIFY_CENTER</justify>
+		    <wrap>False</wrap>
+		    <xalign>1</xalign>
+		    <yalign>0.5</yalign>
+		    <xpad>5</xpad>
+		    <ypad>0</ypad>
+		    <child>
+		      <left_attach>0</left_attach>
+		      <right_attach>1</right_attach>
+		      <top_attach>1</top_attach>
+		      <bottom_attach>2</bottom_attach>
+		      <xpad>0</xpad>
+		      <ypad>0</ypad>
+		      <xexpand>False</xexpand>
+		      <yexpand>False</yexpand>
+		      <xshrink>False</xshrink>
+		      <yshrink>False</yshrink>
+		      <xfill>True</xfill>
+		      <yfill>False</yfill>
+		    </child>
+		  </widget>
+
+		  <widget>
+		    <class>GtkOptionMenu</class>
+		    <name>papersize</name>
+		    <can_focus>True</can_focus>
+		    <items>
+</items>
+		    <initial_choice>0</initial_choice>
+		    <child>
+		      <left_attach>1</left_attach>
+		      <right_attach>2</right_attach>
+		      <top_attach>0</top_attach>
+		      <bottom_attach>1</bottom_attach>
+		      <xpad>5</xpad>
+		      <ypad>5</ypad>
+		      <xexpand>True</xexpand>
+		      <yexpand>False</yexpand>
+		      <xshrink>False</xshrink>
+		      <yshrink>False</yshrink>
+		      <xfill>True</xfill>
+		      <yfill>False</yfill>
+		    </child>
+		  </widget>
+
+		  <widget>
+		    <class>GtkOptionMenu</class>
+		    <name>orientation</name>
+		    <can_focus>True</can_focus>
+		    <items>
+</items>
+		    <initial_choice>0</initial_choice>
+		    <child>
+		      <left_attach>1</left_attach>
+		      <right_attach>2</right_attach>
+		      <top_attach>1</top_attach>
+		      <bottom_attach>2</bottom_attach>
+		      <xpad>5</xpad>
+		      <ypad>5</ypad>
+		      <xexpand>False</xexpand>
+		      <yexpand>False</yexpand>
+		      <xshrink>False</xshrink>
+		      <yshrink>False</yshrink>
+		      <xfill>True</xfill>
+		      <yfill>False</yfill>
+		    </child>
+		  </widget>
+		</widget>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <child_name>Notebook:tab</child_name>
+		  <name>label14</name>
+		  <label>Paper</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
+		</widget>
 
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label13</name>
-		<label>Generations</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>5</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>2</top_attach>
-		  <bottom_attach>3</bottom_attach>
+		<widget>
+		  <class>GtkVBox</class>
+		  <name>vbox7</name>
+		  <homogeneous>False</homogeneous>
+		  <spacing>0</spacing>
+
+		  <widget>
+		    <class>GtkHBox</class>
+		    <name>hbox1</name>
+		    <homogeneous>False</homogeneous>
+		    <spacing>0</spacing>
+		    <child>
+		      <padding>5</padding>
+		      <expand>False</expand>
+		      <fill>True</fill>
+		    </child>
+
+		    <widget>
+		      <class>GtkLabel</class>
+		      <name>label11</name>
+		      <label>Template</label>
+		      <justify>GTK_JUSTIFY_CENTER</justify>
+		      <wrap>False</wrap>
+		      <xalign>1</xalign>
+		      <yalign>0.5</yalign>
+		      <xpad>5</xpad>
+		      <ypad>0</ypad>
+		      <child>
+			<padding>0</padding>
+			<expand>False</expand>
+			<fill>True</fill>
+		      </child>
+		    </widget>
+
+		    <widget>
+		      <class>GnomeFileEntry</class>
+		      <name>htmltemplate</name>
+		      <history_id>HtmlTemplate</history_id>
+		      <max_saved>10</max_saved>
+		      <title>Choose the HTML template</title>
+		      <directory>False</directory>
+		      <modal>False</modal>
+		      <child>
+			<padding>5</padding>
+			<expand>True</expand>
+			<fill>True</fill>
+		      </child>
+
+		      <widget>
+			<class>GtkEntry</class>
+			<child_name>GnomeEntry:entry</child_name>
+			<name>htmlfile</name>
+			<can_focus>True</can_focus>
+			<editable>True</editable>
+			<text_visible>True</text_visible>
+			<text_max_length>0</text_max_length>
+			<text></text>
+		      </widget>
+		    </widget>
+		  </widget>
+
+		  <widget>
+		    <class>Placeholder</class>
+		  </widget>
+		</widget>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <child_name>Notebook:tab</child_name>
+		  <name>label15</name>
+		  <label>Template</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>pagebreak</name>
-		<can_focus>True</can_focus>
-		<label>Page break between generations</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>3</top_attach>
-		  <bottom_attach>4</bottom_attach>
-		  <xpad>5</xpad>
-		  <ypad>5</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>generations</name>
-		<can_focus>True</can_focus>
-		<climb_rate>1</climb_rate>
-		<digits>0</digits>
-		<numeric>True</numeric>
-		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		<snap>False</snap>
-		<wrap>False</wrap>
-		<value>10</value>
-		<lower>1</lower>
-		<upper>28</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>2</top_attach>
-		  <bottom_attach>3</bottom_attach>
-		  <xpad>5</xpad>
-		  <ypad>5</ypad>
-		  <xexpand>True</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>papersize</name>
-		<can_focus>True</can_focus>
-		<items></items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
-		  <xpad>5</xpad>
-		  <ypad>5</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label15</name>
-		<label>Orientation</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>5</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>orientation</name>
-		<can_focus>True</can_focus>
-		<items></items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>5</xpad>
-		  <ypad>5</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
+		</widget>
 	      </widget>
 	    </widget>
 	  </widget>
diff --git a/gramps/src/plugins/desreport.glade b/gramps/src/plugins/desreport.glade
index 7eb5dfd86..f7c02d230 100644
--- a/gramps/src/plugins/desreport.glade
+++ b/gramps/src/plugins/desreport.glade
@@ -190,141 +190,24 @@
 
 	<widget>
 	  <class>GtkVBox</class>
-	  <name>vbox4</name>
+	  <name>vbox6</name>
+	  <border_width>5</border_width>
 	  <homogeneous>False</homogeneous>
 	  <spacing>0</spacing>
 
 	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>openoffice</name>
+	    <class>GtkOptionMenu</class>
+	    <name>format</name>
 	    <can_focus>True</can_focus>
-	    <label>OpenOffice </label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
+	    <items>
+</items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
 	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>abiword</name>
-	    <can_focus>True</can_focus>
-	    <label>AbiWord</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>pdf</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <object>dialog1</object>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>PDF</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>html</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <object>dialog1</object>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>HTML</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label11</name>
-	      <label>Template</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>5</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeFileEntry</class>
-	      <name>htmltemplate</name>
-	      <sensitive>False</sensitive>
-	      <history_id>HtmlTemplate</history_id>
-	      <max_saved>10</max_saved>
-	      <title>Choose the HTML template</title>
-	      <directory>False</directory>
-	      <modal>False</modal>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<child_name>GnomeEntry:entry</child_name>
-		<name>htmlfile</name>
-		<can_focus>True</can_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>0</text_max_length>
-		<text></text>
-	      </widget>
-	    </widget>
-	  </widget>
 	</widget>
       </widget>
 
@@ -341,110 +224,215 @@
 	</child>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>table1</name>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <class>GtkNotebook</class>
+	  <name>option_notebook</name>
+	  <show_tabs>False</show_tabs>
+	  <show_border>False</show_border>
+	  <tab_pos>GTK_POS_TOP</tab_pos>
+	  <scrollable>False</scrollable>
+	  <tab_hborder>2</tab_hborder>
+	  <tab_vborder>2</tab_vborder>
+	  <popup_enable>False</popup_enable>
+
+	  <widget>
+	    <class>GtkTable</class>
+	    <name>table1</name>
+	    <rows>2</rows>
+	    <columns>2</columns>
+	    <homogeneous>False</homogeneous>
+	    <row_spacing>0</row_spacing>
+	    <column_spacing>0</column_spacing>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label13</name>
+	      <label>Paper</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>5</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label14</name>
+	      <label>Orientation</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>5</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>papersize</name>
+	      <can_focus>True</can_focus>
+	      <items>
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>orientation</name>
+	      <can_focus>True</can_focus>
+	      <items>
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
 	    <name>label13</name>
 	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>1</xalign>
+	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>5</xpad>
+	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox5</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox1</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>10</padding>
+		<expand>False</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label11</name>
+		<label>Template</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>5</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GnomeFileEntry</class>
+		<name>htmltemplate</name>
+		<sensitive>False</sensitive>
+		<history_id>HtmlTemplate</history_id>
+		<max_saved>10</max_saved>
+		<title>Choose the HTML template</title>
+		<directory>False</directory>
+		<modal>False</modal>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+
+		<widget>
+		  <class>GtkEntry</class>
+		  <child_name>GnomeEntry:entry</child_name>
+		  <name>htmlfile</name>
+		  <can_focus>True</can_focus>
+		  <editable>True</editable>
+		  <text_visible>True</text_visible>
+		  <text_max_length>0</text_max_length>
+		  <text></text>
+		</widget>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>Placeholder</class>
+	    </widget>
 	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
 	    <name>label14</name>
-	    <label>Orientation</label>
+	    <label>Template</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>1</xalign>
+	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>5</xpad>
+	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>papersize</name>
-	    <can_focus>True</can_focus>
-	    <items>
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>orientation</name>
-	    <can_focus>True</can_focus>
-	    <items>
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
 	  </widget>
 	</widget>
       </widget>
diff --git a/gramps/src/plugins/familygroup.glade b/gramps/src/plugins/familygroup.glade
index 489d9d255..d1cf865da 100644
--- a/gramps/src/plugins/familygroup.glade
+++ b/gramps/src/plugins/familygroup.glade
@@ -15,6 +15,7 @@
 <widget>
   <class>GnomeDialog</class>
   <name>dialog1</name>
+  <title>Gramps - Family Group Report</title>
   <type>GTK_WINDOW_DIALOG</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
@@ -219,139 +220,19 @@
 	  <spacing>0</spacing>
 
 	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>openoffice</name>
+	    <class>GtkOptionMenu</class>
+	    <name>format</name>
+	    <border_width>10</border_width>
 	    <can_focus>True</can_focus>
-	    <label>OpenOffice </label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
+	    <items>
+</items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
 	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>abiword</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>AbiWord</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>pdf</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>PDF</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>html</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>HTML</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label11</name>
-	      <label>Template</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>5</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeFileEntry</class>
-	      <name>htmltemplate</name>
-	      <sensitive>False</sensitive>
-	      <history_id>HtmlTemplate</history_id>
-	      <max_saved>10</max_saved>
-	      <title>Choose the HTML template</title>
-	      <directory>False</directory>
-	      <modal>False</modal>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<child_name>GnomeEntry:entry</child_name>
-		<name>htmlfile</name>
-		<can_focus>True</can_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>0</text_max_length>
-		<text></text>
-	      </widget>
-	    </widget>
-	  </widget>
 	</widget>
       </widget>
 
@@ -368,110 +249,214 @@
 	</child>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>table1</name>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <class>GtkNotebook</class>
+	  <name>option_notebook</name>
+	  <show_tabs>False</show_tabs>
+	  <show_border>False</show_border>
+	  <tab_pos>GTK_POS_TOP</tab_pos>
+	  <scrollable>False</scrollable>
+	  <tab_hborder>2</tab_hborder>
+	  <tab_vborder>2</tab_vborder>
+	  <popup_enable>False</popup_enable>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label14</name>
-	    <label>Orientation</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>1</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>5</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
+	    <class>GtkTable</class>
+	    <name>table1</name>
+	    <rows>2</rows>
+	    <columns>2</columns>
+	    <homogeneous>False</homogeneous>
+	    <row_spacing>0</row_spacing>
+	    <column_spacing>0</column_spacing>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label14</name>
+	      <label>Orientation</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label13</name>
+	      <label>Paper</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>5</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>orientation</name>
+	      <can_focus>True</can_focus>
+	      <items>
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>papersize</name>
+	      <can_focus>True</can_focus>
+	      <items>
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
 	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label13</name>
+	    <child_name>Notebook:tab</child_name>
+	    <name>label14</name>
 	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>1</xalign>
+	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>5</xpad>
+	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>orientation</name>
-	    <can_focus>True</can_focus>
-	    <items>
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <class>GtkVBox</class>
+	    <name>vbox5</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox1</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>5</padding>
+		<expand>False</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label11</name>
+		<label>Template</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>5</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GnomeFileEntry</class>
+		<name>htmltemplate</name>
+		<history_id>HtmlTemplate</history_id>
+		<max_saved>10</max_saved>
+		<title>Choose the HTML template</title>
+		<directory>False</directory>
+		<modal>False</modal>
+		<child>
+		  <padding>5</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+
+		<widget>
+		  <class>GtkEntry</class>
+		  <child_name>GnomeEntry:entry</child_name>
+		  <name>htmlfile</name>
+		  <can_focus>True</can_focus>
+		  <editable>True</editable>
+		  <text_visible>True</text_visible>
+		  <text_max_length>0</text_max_length>
+		  <text></text>
+		</widget>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>Placeholder</class>
+	    </widget>
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>papersize</name>
-	    <can_focus>True</can_focus>
-	    <items>
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
+	    <name>label15</name>
+	    <label>Template</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
 	  </widget>
 	</widget>
       </widget>
diff --git a/gramps/src/plugins/indsum.glade b/gramps/src/plugins/indsum.glade
index 7d3b26019..87ebd420b 100644
--- a/gramps/src/plugins/indsum.glade
+++ b/gramps/src/plugins/indsum.glade
@@ -15,6 +15,7 @@
 <widget>
   <class>GnomeDialog</class>
   <name>dialog1</name>
+  <title>Gramps - Individual Summary</title>
   <type>GTK_WINDOW_DIALOG</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
@@ -190,124 +191,24 @@
 
 	<widget>
 	  <class>GtkVBox</class>
-	  <name>vbox4</name>
+	  <name>vbox6</name>
 	  <homogeneous>False</homogeneous>
 	  <spacing>0</spacing>
 
 	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>openoffice</name>
+	    <class>GtkOptionMenu</class>
+	    <name>format</name>
+	    <border_width>5</border_width>
 	    <can_focus>True</can_focus>
-	    <label>OpenOffice </label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
+	    <items>
+</items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
 	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>pdf</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>PDF</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkRadioButton</class>
-	    <name>html</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>on_html_toggled</handler>
-	      <last_modification_time>Tue, 20 Mar 2001 17:02:37 GMT</last_modification_time>
-	    </signal>
-	    <label>HTML</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <group>format</group>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label11</name>
-	      <label>Template</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>5</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeFileEntry</class>
-	      <name>htmltemplate</name>
-	      <sensitive>False</sensitive>
-	      <history_id>HtmlTemplate</history_id>
-	      <max_saved>10</max_saved>
-	      <title>Choose the HTML template</title>
-	      <directory>False</directory>
-	      <modal>False</modal>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkEntry</class>
-		<child_name>GnomeEntry:entry</child_name>
-		<name>htmlfile</name>
-		<can_focus>True</can_focus>
-		<editable>True</editable>
-		<text_visible>True</text_visible>
-		<text_max_length>0</text_max_length>
-		<text></text>
-	      </widget>
-	    </widget>
-	  </widget>
 	</widget>
       </widget>
 
@@ -324,110 +225,215 @@
 	</child>
 
 	<widget>
-	  <class>GtkTable</class>
-	  <name>table1</name>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>0</row_spacing>
-	  <column_spacing>0</column_spacing>
+	  <class>GtkNotebook</class>
+	  <name>option_notebook</name>
+	  <show_tabs>False</show_tabs>
+	  <show_border>False</show_border>
+	  <tab_pos>GTK_POS_TOP</tab_pos>
+	  <scrollable>False</scrollable>
+	  <tab_hborder>2</tab_hborder>
+	  <tab_vborder>2</tab_vborder>
+	  <popup_enable>False</popup_enable>
+
+	  <widget>
+	    <class>GtkTable</class>
+	    <name>table1</name>
+	    <rows>2</rows>
+	    <columns>2</columns>
+	    <homogeneous>False</homogeneous>
+	    <row_spacing>0</row_spacing>
+	    <column_spacing>0</column_spacing>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label13</name>
+	      <label>Paper</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>5</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label14</name>
+	      <label>Orientation</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>1</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>5</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>orientation</name>
+	      <can_focus>True</can_focus>
+	      <items>
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>papersize</name>
+	      <can_focus>True</can_focus>
+	      <items>
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>5</xpad>
+		<ypad>5</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
 	    <name>label13</name>
 	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>1</xalign>
+	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>5</xpad>
+	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox5</name>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox1</name>
+	      <homogeneous>False</homogeneous>
+	      <spacing>0</spacing>
+	      <child>
+		<padding>5</padding>
+		<expand>False</expand>
+		<fill>True</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label11</name>
+		<label>Template</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>5</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GnomeFileEntry</class>
+		<name>htmltemplate</name>
+		<sensitive>False</sensitive>
+		<history_id>HtmlTemplate</history_id>
+		<max_saved>10</max_saved>
+		<title>Choose the HTML template</title>
+		<directory>False</directory>
+		<modal>False</modal>
+		<child>
+		  <padding>0</padding>
+		  <expand>True</expand>
+		  <fill>True</fill>
+		</child>
+
+		<widget>
+		  <class>GtkEntry</class>
+		  <child_name>GnomeEntry:entry</child_name>
+		  <name>htmlfile</name>
+		  <can_focus>True</can_focus>
+		  <editable>True</editable>
+		  <text_visible>True</text_visible>
+		  <text_max_length>0</text_max_length>
+		  <text></text>
+		</widget>
+	      </widget>
+	    </widget>
+
+	    <widget>
+	      <class>Placeholder</class>
+	    </widget>
 	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
+	    <child_name>Notebook:tab</child_name>
 	    <name>label14</name>
-	    <label>Orientation</label>
+	    <label>Template</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>1</xalign>
+	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>5</xpad>
+	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>orientation</name>
-	    <can_focus>True</can_focus>
-	    <items>
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>papersize</name>
-	    <can_focus>True</can_focus>
-	    <items>
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
 	  </widget>
 	</widget>
       </widget>