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

update for feature 5854.

Browse Source 
Added a new Notes style so the user can modify this separately


svn: r19884
This commit is contained in:
Craig J. Anderson 2012-06-19 22:21:36 +00:00
parent 846a46ee7f
commit 32fbd754fb
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/drawreport/AncestorTree.py
View File

@ -731,7 +731,7 @@ class AncestorTree(Report):
#Note? #Note?
if self.connect.get_val("inc_note"): if self.connect.get_val("inc_note"):
note_box = NoteBox(self.doc, "AC2-fam-box", note_box = NoteBox(self.doc, "AC2-note-box",
self.connect.get_val("note_place")) self.connect.get_val("note_place"))
subst = SubstKeywords(self.database, None, None) subst = SubstKeywords(self.database, None, None)
note_box.text = subst.replace_and_clean( note_box.text = subst.replace_and_clean(
@ -828,12 +828,24 @@ class AncestorTree(Report):
graph_style.set_line_width(graph_style.get_line_width() * scale) graph_style.set_line_width(graph_style.get_line_width() * scale)
style_sheet.add_draw_style("AC2-fam-box", graph_style) style_sheet.add_draw_style("AC2-fam-box", graph_style)
graph_style = style_sheet.get_draw_style("AC2-note-box")
#graph_style.set_shadow(graph_style.get_shadow(),
# self.doc.report_opts.box_shadow * scale)
graph_style.set_line_width(graph_style.get_line_width() * scale)
style_sheet.add_draw_style("AC2-note-box", graph_style)
para_style = style_sheet.get_paragraph_style("AC2-Normal") para_style = style_sheet.get_paragraph_style("AC2-Normal")
font = para_style.get_font() font = para_style.get_font()
font.set_size(font.get_size() * scale) font.set_size(font.get_size() * scale)
para_style.set_font(font) para_style.set_font(font)
style_sheet.add_paragraph_style("AC2-Normal", para_style) style_sheet.add_paragraph_style("AC2-Normal", para_style)
para_style = style_sheet.get_paragraph_style("AC2-Note")
font = para_style.get_font()
font.set_size(font.get_size() * scale)
para_style.set_font(font)
style_sheet.add_paragraph_style("AC2-Note", para_style)
para_style = style_sheet.get_paragraph_style("AC2-Title") para_style = style_sheet.get_paragraph_style("AC2-Title")
font = para_style.get_font() font = para_style.get_font()
font.set_size(font.get_size() * scale) font.set_size(font.get_size() * scale)
@ -1085,6 +1097,15 @@ class AncestorTreeOptions(MenuReportOptions):
default_style.add_paragraph_style("AC2-Normal", para_style) default_style.add_paragraph_style("AC2-Normal", para_style)
box_shadow = PT2CM(font.get_size()) * .6 box_shadow = PT2CM(font.get_size()) * .6
font = FontStyle()
font.set_size(9)
font.set_type_face(FONT_SANS_SERIF)
para_style = ParagraphStyle()
para_style.set_font(font)
para_style.set_description(_('The basic style used for the '
'note display.'))
default_style.add_paragraph_style("AC2-Note", para_style)
font = FontStyle() font = FontStyle()
font.set_size(16) font.set_size(16)
font.set_type_face(FONT_SANS_SERIF) font.set_type_face(FONT_SANS_SERIF)
@ -1108,6 +1129,11 @@ class AncestorTreeOptions(MenuReportOptions):
graph_style.set_fill_color((255, 255, 255)) graph_style.set_fill_color((255, 255, 255))
default_style.add_draw_style("AC2-fam-box", graph_style) default_style.add_draw_style("AC2-fam-box", graph_style)
graph_style = GraphicsStyle()
graph_style.set_paragraph_style("AC2-Note")
graph_style.set_fill_color((255, 255, 255))
default_style.add_draw_style("AC2-note-box", graph_style)
graph_style = GraphicsStyle() graph_style = GraphicsStyle()
graph_style.set_paragraph_style("AC2-Title") graph_style.set_paragraph_style("AC2-Title")
graph_style.set_color((0, 0, 0)) graph_style.set_color((0, 0, 0))

28
src/plugins/drawreport/DescendTree.py
View File

@ -1305,7 +1305,7 @@ class DescendTree(Report):
#note? #note?
if self.Connect.get_val("inc_note"): if self.Connect.get_val("inc_note"):
note_box = NoteBox(self.doc, "CG2-fam-box", note_box = NoteBox(self.doc, "CG2-note-box",
self.Connect.get_val("note_place")) self.Connect.get_val("note_place"))
subst = SubstKeywords(self.database, None, None) subst = SubstKeywords(self.database, None, None)
note_box.text = subst.replace_and_clean( note_box.text = subst.replace_and_clean(
@ -1403,6 +1403,11 @@ class DescendTree(Report):
graph_style.set_line_width(graph_style.get_line_width() * amount) graph_style.set_line_width(graph_style.get_line_width() * amount)
style_sheet.add_draw_style("CG2b-box", graph_style) style_sheet.add_draw_style("CG2b-box", graph_style)
graph_style = style_sheet.get_draw_style("CG2-note-box")
graph_style.set_shadow(graph_style.get_shadow(), 0)
graph_style.set_line_width(graph_style.get_line_width() * amount)
style_sheet.add_draw_style("CG2-note-box", graph_style)
para_style = style_sheet.get_paragraph_style("CG2-Title") para_style = style_sheet.get_paragraph_style("CG2-Title")
font = para_style.get_font() font = para_style.get_font()
font.set_size(font.get_size() * amount) font.set_size(font.get_size() * amount)
@ -1422,6 +1427,12 @@ class DescendTree(Report):
para_style.set_font(font) para_style.set_font(font)
style_sheet.add_paragraph_style("CG2-Bold", para_style) style_sheet.add_paragraph_style("CG2-Bold", para_style)
para_style = style_sheet.get_paragraph_style("CG2-Note")
font = para_style.get_font()
font.set_size(font.get_size() * amount)
para_style.set_font(font)
style_sheet.add_paragraph_style("CG2-Note", para_style)
self.doc.set_style_sheet(style_sheet) self.doc.set_style_sheet(style_sheet)
@ -1698,6 +1709,16 @@ class DescendTreeOptions(MenuReportOptions):
) )
default_style.add_paragraph_style("CG2-Bold", para_style) default_style.add_paragraph_style("CG2-Bold", para_style)
font = FontStyle()
font.set_size(9)
font.set_type_face(FONT_SANS_SERIF)
para_style = ParagraphStyle()
para_style.set_font(font)
para_style.set_description(
_('The basic style used for the note display.')
)
default_style.add_paragraph_style("CG2-Note", para_style)
graph_style = GraphicsStyle() graph_style = GraphicsStyle()
graph_style.set_paragraph_style("CG2-Title") graph_style.set_paragraph_style("CG2-Title")
graph_style.set_color((0, 0, 0)) graph_style.set_color((0, 0, 0))
@ -1723,6 +1744,11 @@ class DescendTreeOptions(MenuReportOptions):
graph_style.set_fill_color((255, 255, 255)) graph_style.set_fill_color((255, 255, 255))
default_style.add_draw_style("CG2b-box", graph_style) default_style.add_draw_style("CG2b-box", graph_style)
graph_style = GraphicsStyle()
graph_style.set_paragraph_style("CG2-Note")
graph_style.set_fill_color((255, 255, 255))
default_style.add_draw_style("CG2-note-box", graph_style)
graph_style = GraphicsStyle() graph_style = GraphicsStyle()
default_style.add_draw_style("CG2-line", graph_style) default_style.add_draw_style("CG2-line", graph_style)