Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* configure.in, configure: Typo.

Browse Source 
* src/plugins/FtmStyleAncestors.py (endnotes): Do not add
redundant references.
* src/plugins/FtmStyleDescendants.py (endnotes): Do not add
redundant references.
* src/plugins/DetAncestralReport.py (_make_default_style):
Remove unused table definition.
* src/plugins/DetDescendantReport.py (_make_default_style):
Remove unused table definition.


svn: r2950
This commit is contained in:
Alex Roitman 2004-03-02 03:43:51 +00:00
parent 8be09bc3e3
commit 0680d6a4bc
7 changed files with 419 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps2/ChangeLog
View File

@ -2,6 +2,16 @@
* src/docgen/LPRDoc.py: Table support correction: transferring * src/docgen/LPRDoc.py: Table support correction: transferring
row to the next page. row to the next page.
* configure.in, configure: Typo.
* src/plugins/FtmStyleAncestors.py (endnotes): Do not add
redundant references.
* src/plugins/FtmStyleDescendants.py (endnotes): Do not add
redundant references.
* src/plugins/DetAncestralReport.py (_make_default_style):
Remove unused table definition.
* src/plugins/DetDescendantReport.py (_make_default_style):
Remove unused table definition.
2004-02-29 Don Allingham <dallingham@users.sourceforge.net> 2004-02-29 Don Allingham <dallingham@users.sourceforge.net>
* src/gramps_main.py: remove local media concept * src/gramps_main.py: remove local media concept
* src/RelLib.py: remove local media concept * src/RelLib.py: remove local media concept

598
gramps2/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
gramps2/configure.in
View File

@ -198,7 +198,7 @@ if test YES != "$has_pygtk"
then then
AC_MSG_ERROR([ AC_MSG_ERROR([
**** The python bindings for glade (pytgk2-libglade) could not be found.]) **** The python bindings for glade (pygtk2-libglade) could not be found.])
fi fi
AC_MSG_RESULT(ok) AC_MSG_RESULT(ok)

6
gramps2/src/plugins/DetAncestralReport.py
View File

@ -680,12 +680,6 @@ def _make_default_style(default_style):
para.set_description(_('The style used for the first personal entry.')) para.set_description(_('The style used for the first personal entry.'))
default_style.add_style("DAR-First-Entry",para) default_style.add_style("DAR-First-Entry",para)
table = BaseDoc.TableStyle()
table.set_width(1000)
table.set_columns(3)
table.set_column_width(1,"30%")
#self.default_style.add_style("Images",table)
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# #

6
gramps2/src/plugins/DetDescendantReport.py
View File

@ -688,12 +688,6 @@ def _make_default_style(default_style):
para.set_description(_('The style used for the first personal entry.')) para.set_description(_('The style used for the first personal entry.'))
default_style.add_style("DDR-First-Entry",para) default_style.add_style("DDR-First-Entry",para)
table = BaseDoc.TableStyle()
table.set_width(1000)
table.set_columns(3)
table.set_column_width(1,"30%")
#self.default_style.add_style("Images",table)
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# #

17
gramps2/src/plugins/FtmStyleAncestors.py
View File

@ -62,7 +62,7 @@ class FtmAncestorReport(Report.Report):
else: else:
self.standalone = 0 self.standalone = 0
self.sref_map = {} self.sref_map = {}
self.sref_index = 1 self.sref_index = 0
def apply_filter(self,person,index,generation=1): def apply_filter(self,person,index,generation=1):
if person == None or generation > self.max_generations: if person == None or generation > self.max_generations:
@ -463,9 +463,18 @@ class FtmAncestorReport(Report.Report):
if not first: if not first:
msg.write(',') msg.write(',')
first = 0 first = 0
msg.write("%d" % self.sref_index) ref_base = ref.get_base_id()
self.sref_map[self.sref_index] = ref the_key = 0
self.sref_index += 1 for key in self.sref_map.keys():
if ref_base == self.sref_map[key].get_base_id():
the_key = key
break
if the_key:
msg.write("%d" % the_key)
else:
self.sref_index += 1
self.sref_map[self.sref_index] = ref
msg.write("%d" % self.sref_index)
msg.write('</super>') msg.write('</super>')
str = msg.getvalue() str = msg.getvalue()
msg.close() msg.close()

17
gramps2/src/plugins/FtmStyleDescendants.py
View File

@ -71,7 +71,7 @@ class FtmDescendantReport(Report.Report):
else: else:
self.standalone = 0 self.standalone = 0
self.sref_map = {} self.sref_map = {}
self.sref_index = 1 self.sref_index = 0
def setup(self): def setup(self):
tbl = BaseDoc.TableStyle() tbl = BaseDoc.TableStyle()
@ -497,9 +497,18 @@ class FtmDescendantReport(Report.Report):
if not first: if not first:
msg.write(',') msg.write(',')
first = 0 first = 0
msg.write("%d" % self.sref_index) ref_base = ref.get_base_id()
self.sref_map[self.sref_index] = ref the_key = 0
self.sref_index += 1 for key in self.sref_map.keys():
if ref_base == self.sref_map[key].get_base_id():
the_key = key
break
if the_key:
msg.write("%d" % the_key)
else:
self.sref_index += 1
self.sref_map[self.sref_index] = ref
msg.write("%d" % self.sref_index)
msg.write('</super>') msg.write('</super>')
str = msg.getvalue() str = msg.getvalue()
msg.close() msg.close()