merge changes from gramps20

svn: r5482

src/plugins/BookReport.py

@@ -56,7 +56,6 @@ import gtk.glade
 #-------------------------------------------------------------------------
 from RelLib import Person
 
-import const
 import Utils
 import ListModel
 import PluginMgr
@@ -115,7 +114,10 @@ class BookItem:
         for item in PluginMgr.bkitems_list:
             if item[4] == name:
                 self.translated_name = item[0]
-                self.category = item[1]
+                if item[5]:
+                    self.category = Plugins.UNSUPPORTED
+                else:
+                    self.category = item[1]
                 self.write_item = item[2]
                 self.name = item[4]
                 self.option_class = item[3](self.name)
@@ -655,7 +657,12 @@ class BookReportSelector:
             return
 
         for book_item in PluginMgr.bkitems_list:
-            data = [ book_item[0], book_item[1], book_item[4] ] 
+            if book_item[5]:
+                category = Plugins.UNSUPPORTED
+            else:
+                category = book_item[1]
+            
+            data = [ book_item[0], category, book_item[4] ] 
             new_iter = self.av_model.add(data)
 
         self.av_model.connect_model()
@@ -955,8 +962,9 @@ class BookReportDialog(Report.ReportDialog):
 
     def __init__(self,database,person,book,options):
         self.options = options
+        self.page_html_added = False
         Report.BareReportDialog.__init__(self,database,person,options,
-                    'book',_("Book Report"))
+                                         'book',_("Book Report"))
         self.book = book
         self.database = database 
         self.person = person
@@ -1109,13 +1117,13 @@ def cl_report(database,name,category,options_str_dict):
 #------------------------------------------------------------------------
 PluginMgr.register_report(
     name = 'book',
-    category = const.CATEGORY_BOOK,
+    category = Report.CATEGORY_BOOK,
     report_class = BookReportSelector,
     options_class = cl_report,
     modes = Report.MODE_GUI | Report.MODE_CLI,
     translated_name = _("Book Report"),
-    status = _("Beta"),
+    status = _("Stable"),
     description = _("Creates a book containing several reports."),
     author_name = "Alex Roitman",
-    author_email = "shura@alex.neuro.umn.edu"
+    author_email = "shura@gramps-project.org"
     )