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

Merge branch 'maintenance/gramps34' of ssh://git.code.sf.net/p/gramps/source into maintenance/gramps34

Browse Source
This commit is contained in:
kulath 2015-01-08 17:44:42 +00:00
commit 7c3094b5b5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/const.py.in
View File

@ -199,7 +199,7 @@ else:
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
COPYRIGHT_MSG = u"\u00A9 2001-2006 Donald N. Allingham\n" \ COPYRIGHT_MSG = u"\u00A9 2001-2006 Donald N. Allingham\n" \
u"\u00A9 2007-2014 The Gramps Developers" u"\u00A9 2007-2015 The Gramps Developers"
COMMENTS = _("Gramps (Genealogical Research and Analysis " COMMENTS = _("Gramps (Genealogical Research and Analysis "
"Management Programming System) is a personal " "Management Programming System) is a personal "
"genealogy program.") "genealogy program.")

1
src/gui/editors/displaytabs/Makefile.am
View File

@ -31,6 +31,7 @@ pkgpython_PYTHON = \
locationembedlist.py \ locationembedlist.py \
locationmodel.py \ locationmodel.py \
mediabackreflist.py \ mediabackreflist.py \
mediaattrembedlist.py \
nameembedlist.py \ nameembedlist.py \
namemodel.py \ namemodel.py \
notebackreflist.py \ notebackreflist.py \

15
src/plugins/docgen/SvgDrawDoc.py
View File

@ -86,7 +86,7 @@ class SvgDrawDoc(BaseDoc, DrawDoc):
'<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n' + '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n' +
'<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" ' + '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" ' +
'"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\n' + '"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\n' +
'<svg width="%5.2fcm" height="%5.2fcm" ' '<svg width="%4.2fcm" height="%4.2fcm" '
% (self.paper.get_size().get_width(), % (self.paper.get_size().get_width(),
self.paper.get_size().get_height()) + self.paper.get_size().get_height()) +
'xmlns="http://www.w3.org/2000/svg">\n' 'xmlns="http://www.w3.org/2000/svg">\n'
@ -120,7 +120,7 @@ class SvgDrawDoc(BaseDoc, DrawDoc):
self.t.write('font-weight:bold;') self.t.write('font-weight:bold;')
if font.get_italic(): if font.get_italic():
self.t.write('font-style:italic;') self.t.write('font-style:italic;')
self.t.write('font-size:%d; ' % size) self.t.write('font-size:%dpt; ' % size)
if font.get_type_face() == FONT_SANS_SERIF: if font.get_type_face() == FONT_SANS_SERIF:
self.t.write('font-family:sans-serif;') self.t.write('font-family:sans-serif;')
else: else:
@ -193,12 +193,13 @@ class SvgDrawDoc(BaseDoc, DrawDoc):
style_sheet = self.get_style_sheet() style_sheet = self.get_style_sheet()
box_style = style_sheet.get_draw_style(style) box_style = style_sheet.get_draw_style(style)
shadow_width = box_style.get_shadow_space()
if box_style.get_shadow(): if box_style.get_shadow() and shadow_width > 0:
self.f.write( self.f.write(
'<rect ' + '<rect ' +
'x="%4.2fcm" ' % (x+0.15) + 'x="%4.2fcm" ' % (x + shadow_width) +
'y="%4.2fcm" ' % (y+0.15) + 'y="%4.2fcm" ' % (y + shadow_width) +
'width="%4.2fcm" ' % w + 'width="%4.2fcm" ' % w +
'height="%4.2fcm" ' % h + 'height="%4.2fcm" ' % h +
'style="fill:#808080; stroke:#808080; stroke-width:1;"/>\n' 'style="fill:#808080; stroke:#808080; stroke-width:1;"/>\n'
@ -241,7 +242,7 @@ class SvgDrawDoc(BaseDoc, DrawDoc):
self.t.write(' font-weight:bold;') self.t.write(' font-weight:bold;')
if font.get_italic(): if font.get_italic():
self.t.write(' font-style:italic;') self.t.write(' font-style:italic;')
self.t.write(' font-size:%d;' % font_size) self.t.write(' font-size:%dpt;' % font_size)
if font.get_type_face() == FONT_SANS_SERIF: if font.get_type_face() == FONT_SANS_SERIF:
self.t.write(' font-family:sans-serif;') self.t.write(' font-family:sans-serif;')
else: else:
@ -274,7 +275,7 @@ class SvgDrawDoc(BaseDoc, DrawDoc):
self.t.write('font-weight:bold;') self.t.write('font-weight:bold;')
if font.get_italic(): if font.get_italic():
self.t.write('font-style:italic;') self.t.write('font-style:italic;')
self.t.write('font-size:%d; ' % font_size) self.t.write('font-size:%dpt; ' % font_size)
if font.get_type_face() == FONT_SANS_SERIF: if font.get_type_face() == FONT_SANS_SERIF:
self.t.write('font-family:sans-serif;') self.t.write('font-family:sans-serif;')
else: else: