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

Fix graphs on Windows for font selection not working (#849)

Browse Source 
Fixes #11212
This commit is contained in:
Paul Culley 2019-07-31 16:45:15 -05:00 committed by GitHub
parent 15e033c02c
commit 949296a801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/gen/config.py
View File

@ -236,7 +236,6 @@ register('preferences.quick-backup-include-mode', False)
register('preferences.date-format', 0) register('preferences.date-format', 0)
register('preferences.calendar-format-report', 0) register('preferences.calendar-format-report', 0)
register('preferences.cprefix', 'C%04d') register('preferences.cprefix', 'C%04d')
register('preferences.alternate-fonthandler', False)
register('preferences.default-source', False) register('preferences.default-source', False)
register('preferences.tag-on-import', False) register('preferences.tag-on-import', False)
register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S")) register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S"))

2
gramps/gen/plug/docgen/graphdoc.py
View File

@ -63,7 +63,7 @@ LOG = logging.getLogger(".graphdoc")
# Private Constants # Private Constants
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_FONTS = [{'name' : _("Default"), 'value' : ""}, _FONTS = [{'name' : _("Default"), 'value' : "serif"},
{'name' : _("PostScript / Helvetica"), 'value' : "Helvetica"}, {'name' : _("PostScript / Helvetica"), 'value' : "Helvetica"},
{'name' : _("TrueType / FreeSans"), 'value' : "FreeSans"}] {'name' : _("TrueType / FreeSans"), 'value' : "FreeSans"}]

3
gramps/grampsapp.py
View File

@ -477,8 +477,7 @@ def main():
resource_path, filename = os.path.split(os.path.abspath(__file__)) resource_path, filename = os.path.split(os.path.abspath(__file__))
resource_path, dirname = os.path.split(resource_path) resource_path, dirname = os.path.split(resource_path)
os.environ['GRAMPS_RESOURCES'] = resource_path os.environ['GRAMPS_RESOURCES'] = resource_path
if win() and ('PANGOCAIRO_BACKEND' not in os.environ) and \ if win() and ('PANGOCAIRO_BACKEND' not in os.environ):
config.get('preferences.alternate-fonthandler'):
os.environ['PANGOCAIRO_BACKEND'] = "fontconfig" os.environ['PANGOCAIRO_BACKEND'] = "fontconfig"
errors = run() errors = run()
if errors and isinstance(errors, list): if errors and isinstance(errors, list):

7
gramps/gui/configure.py
View File

@ -1359,13 +1359,6 @@ class GrampsPreferences(ConfigureDialog):
grid.set_row_spacing(6) grid.set_row_spacing(6)
current_line = 0 current_line = 0
if win():
self.add_checkbox(grid,
_('Use alternate Font handler for GUI and Reports '
'(requires restart)'),
current_line, 'preferences.alternate-fonthandler')
current_line += 1
self.add_checkbox(grid, self.add_checkbox(grid,
_('Add default source on GEDCOM import'), _('Add default source on GEDCOM import'),
current_line, 'preferences.default-source') current_line, 'preferences.default-source')