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

2007-09-28 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

Browse Source 
* src/docgen/CairoDoc.py (fontstyle_to_fontdescription): Fix deprecated
        warning.
        * src/ReportBase/_PaperMenu.py:
        * src/data/papersize.xml:
        Fix "C" and "D" paper size values.
        * src/const.py.in: Correct PAPERSIZE path constant.



svn: r9026
This commit is contained in:
Zsolt Foldvari 2007-09-28 12:24:27 +00:00
parent 88c35d8fa9
commit faaaf7e858
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-09-28 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/docgen/CairoDoc.py (fontstyle_to_fontdescription): Fix deprecated
warning.
* src/ReportBase/_PaperMenu.py:
* src/data/papersize.xml:
Fix "C" and "D" paper size values.
* src/const.py.in: Correct PAPERSIZE path constant.
2007-09-28 Gary Burton <gary.burton@zen.co.uk> 2007-09-28 Gary Burton <gary.burton@zen.co.uk>
* src/plugins/NarrativeWeb.py: provide fallback dates on Narrative Web pages * src/plugins/NarrativeWeb.py: provide fallback dates on Narrative Web pages
Issue #0001258 Issue #0001258

6
src/ReportBase/_PaperMenu.py
View File

@ -197,8 +197,8 @@ except (IOError,OSError,SAXParseException):
BaseDoc.PaperSize("B5",25.0,17.6), BaseDoc.PaperSize("B5",25.0,17.6),
BaseDoc.PaperSize("B6",17.6,12.5), BaseDoc.PaperSize("B6",17.6,12.5),
BaseDoc.PaperSize("B",43.18,27.94), BaseDoc.PaperSize("B",43.18,27.94),
BaseDoc.PaperSize("C",56.1,43.18), BaseDoc.PaperSize("C",55.88,43.18),
BaseDoc.PaperSize("D",86.36, 56.1), BaseDoc.PaperSize("D",86.36, 55.88),
BaseDoc.PaperSize("E",111.76,86.36), BaseDoc.PaperSize("E",111.76,86.36),
BaseDoc.PaperSize(_("Custom Size"),-1,-1) BaseDoc.PaperSize(_("Custom Size"),-1,-1)
] ]

2
src/const.py.in
View File

@ -117,7 +117,7 @@ SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml")
TEMPLATE_DIR = os.path.join(DATA_DIR, "templates") TEMPLATE_DIR = os.path.join(DATA_DIR, "templates")
TIP_DATA = os.path.join(DATA_DIR, "tips.xml") TIP_DATA = os.path.join(DATA_DIR, "tips.xml")
PAPERSIZE = "file:%s/papersize.xml" % DATA_DIR PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml")
USE_TIPS = False USE_TIPS = False

4
src/data/papersize.xml
View File

@ -16,7 +16,7 @@
<page name="B5" height="25.0" width="17.6"/> <page name="B5" height="25.0" width="17.6"/>
<page name="B6" height="17.6" width="12.5"/> <page name="B6" height="17.6" width="12.5"/>
<page name="B" height="43.18" width="27.94"/> <page name="B" height="43.18" width="27.94"/>
<page name="C" height="56.1" width="43.18"/> <page name="C" height="55.88" width="43.18"/>
<page name="D" height="86.36" width="56.1"/> <page name="D" height="86.36" width="55.88"/>
<page name="E" height="111.76" width="86.36"/> <page name="E" height="111.76" width="86.36"/>
</paper> </paper>

5
src/docgen/CairoDoc.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2007 Zsolt Foldvari
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -96,6 +96,7 @@ _GNOME_FONT = {
font_families = _GNOME_FONT font_families = _GNOME_FONT
# FIXME debug logging does not work here.
def set_font_families(): def set_font_families():
##def set_font_families(pango_context): ##def set_font_families(pango_context):
"""Set the used font families depending on availability. """Set the used font families depending on availability.
@ -152,7 +153,7 @@ def fontstyle_to_fontdescription(font_style):
f_style = pango.STYLE_NORMAL f_style = pango.STYLE_NORMAL
font_description = pango.FontDescription(font_families[font_style.face]) font_description = pango.FontDescription(font_families[font_style.face])
font_description.set_size(font_style.get_size() * pango.SCALE) font_description.set_size(int(round(font_style.get_size() * pango.SCALE)))
font_description.set_weight(f_weight) font_description.set_weight(f_weight)
font_description.set_style(f_style) font_description.set_style(f_style)