diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 7ade32bd7..58e25ecff 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,14 @@ +2003-07-06 Alex Roitman + * src/plugins/BookReport.py: Make a list of options from a tuple. + * src/plugins/AncestorReport.py: Register options as a tuple. + * src/plugins/Ancestors.py: Register options as a tuple. + * src/plugins/DescendReport.py: Register options as a tuple. + * src/plugins/FtmStyleAncestors.py: Register options as a tuple. + * src/plugins/FtmStyleDescendants.py: Register options as a tuple. + * src/plugins/IndivComplete.py: Register options as a tuple. + * src/plugins/IndivSummary.py: Register options as a tuple. + * src/plugins/SimpleBookTitle.py: Register options as a tuple. + 2003-07-05 Don Allingham * src/ImageSelect.py: eliminate recursive error loop when a thumbnail cannot be created. diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index 0d624b4a7..319eeace5 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -290,7 +290,7 @@ _style_name = "default" _person_id = "" _max_gen = 10 _pg_brk = 0 -_options = [ _person_id, _max_gen, _pg_brk ] +_options = ( _person_id, _max_gen, _pg_brk ) #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index a35db1583..865bd9d94 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -754,7 +754,7 @@ _max_gen = 10 _pg_brk = 0 _opt_cite = gtk.TRUE -_options = [ _person_id, _max_gen, _pg_brk, _opt_cite ] +_options = ( _person_id, _max_gen, _pg_brk, _opt_cite ) #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/BookReport.py b/gramps2/src/plugins/BookReport.py index da77f0fcc..6b629315a 100644 --- a/gramps2/src/plugins/BookReport.py +++ b/gramps2/src/plugins/BookReport.py @@ -90,16 +90,10 @@ class BookItem: from the book item registry using name for lookup """ - self.name = "" - self.category = "" - self.dialog = None - self.write_item = None - self.options = [] - self.style_file = "" - self.style_name = "default" - self.make_default_style = None if name: self.get_registered_item(name) + else: + self.clear() def clear(self): """ @@ -130,7 +124,7 @@ class BookItem: self.category = item[1] self.dialog = item[2] self.write_item = item[3] - self.options = item[4] + self.options = list(item[4]) self.style_name = item[5] self.style_file = item[6] self.make_default_style = item[7] diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index a7388cf09..eec8b55bf 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -184,7 +184,7 @@ _style_name = "default" _person_id = "" _max_gen = 1 _pg_brk = 0 -_options = [ _person_id, _max_gen, _pg_brk ] +_options = ( _person_id, _max_gen, _pg_brk ) #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FtmStyleAncestors.py b/gramps2/src/plugins/FtmStyleAncestors.py index 073acdb5e..516540e90 100644 --- a/gramps2/src/plugins/FtmStyleAncestors.py +++ b/gramps2/src/plugins/FtmStyleAncestors.py @@ -837,7 +837,7 @@ _style_name = "default" _person_id = "" _max_gen = 10 _pg_brk = 0 -_options = [ _person_id, _max_gen, _pg_brk ] +_options = ( _person_id, _max_gen, _pg_brk ) #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FtmStyleDescendants.py b/gramps2/src/plugins/FtmStyleDescendants.py index fd0f00330..05485693d 100644 --- a/gramps2/src/plugins/FtmStyleDescendants.py +++ b/gramps2/src/plugins/FtmStyleDescendants.py @@ -60,7 +60,7 @@ class FtmDescendantReport(Report.Report): self.max_generations = max self.pgbrk = pgbrk self.doc = doc - self.setup() + #self.setup() self.newpage = newpage if output: self.standalone = 1 @@ -1243,7 +1243,7 @@ _style_name = "default" _person_id = "" _max_gen = 10 _pg_brk = 0 -_options = [ _person_id, _max_gen, _pg_brk ] +_options = ( _person_id, _max_gen, _pg_brk ) #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 90153b21d..29636d614 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -57,7 +57,7 @@ _person_id = "" _max_gen = 0 _pg_brk = 0 _filter_num = 0 -_options = [ _person_id, _max_gen, _pg_brk, _filter_num ] +_options = ( _person_id, _max_gen, _pg_brk, _filter_num ) #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index 85e7805b6..9d2f9cd15 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -57,7 +57,7 @@ from intl import gettext as _ _person_id = "" _max_gen = 0 _pg_brk = 0 -_options = [ _person_id, _max_gen, _pg_brk ] +_options = ( _person_id, _max_gen, _pg_brk ) #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/SimpleBookTitle.py b/gramps2/src/plugins/SimpleBookTitle.py index 8f96a0e8f..784d65e9c 100644 --- a/gramps2/src/plugins/SimpleBookTitle.py +++ b/gramps2/src/plugins/SimpleBookTitle.py @@ -119,7 +119,7 @@ _person_id = "" _title_string = "" _copyright_string = "" -_options = [ _person_id, _title_string, _copyright_string ] +_options = ( _person_id, _title_string, _copyright_string ) #------------------------------------------------------------------------