From 5c6a0ebff3ae295f4d4bc3335935636a6b9dc0e5 Mon Sep 17 00:00:00 2001 From: Paul Culley Date: Wed, 31 Jul 2019 16:46:09 -0500 Subject: [PATCH] Fix graphs on Windows for font selection not working (#850) Fixes #11212 --- gramps/gen/config.py | 1 - gramps/gen/plug/docgen/graphdoc.py | 2 +- gramps/grampsapp.py | 7 ++----- gramps/gui/configure.py | 7 ------- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/gramps/gen/config.py b/gramps/gen/config.py index f845294cd..8a2ea79a3 100644 --- a/gramps/gen/config.py +++ b/gramps/gen/config.py @@ -241,7 +241,6 @@ register('preferences.quick-backup-include-mode', False) register('preferences.date-format', 0) register('preferences.calendar-format-report', 0) register('preferences.cprefix', 'C%04d') -register('preferences.alternate-fonthandler', False) register('preferences.default-source', False) register('preferences.tag-on-import', False) register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S")) diff --git a/gramps/gen/plug/docgen/graphdoc.py b/gramps/gen/plug/docgen/graphdoc.py index ac7168741..fdc7979a8 100644 --- a/gramps/gen/plug/docgen/graphdoc.py +++ b/gramps/gen/plug/docgen/graphdoc.py @@ -65,7 +65,7 @@ LOG = logging.getLogger(".graphdoc") # Private Constants # #------------------------------------------------------------------------- -_FONTS = [{'name' : _("Default"), 'value' : ""}, +_FONTS = [{'name' : _("Default"), 'value' : "serif"}, {'name' : _("PostScript / Helvetica"), 'value' : "Helvetica"}, {'name' : _("TrueType / FreeSans"), 'value' : "FreeSans"}] diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py index c0a1afb49..df9765ef7 100644 --- a/gramps/grampsapp.py +++ b/gramps/grampsapp.py @@ -452,14 +452,11 @@ def run(): # if in safe mode we should point the db dir back to the original dir. # It is ok to import config here, 'Defaults' command had its chance... - from .gen.config import config if 'SAFEMODE' in os.environ: config.set('database.path', os.path.join(ORIG_HOME_DIR, 'grampsdb')) - # On windows the fontconfig handler may be a better choice; ask user to - # choose for now. - if(win() and ('PANGOCAIRO_BACKEND' not in os.environ) and - config.get('preferences.alternate-fonthandler')): + # On windows the fontconfig handler is a better choice + if(win() and ('PANGOCAIRO_BACKEND' not in os.environ)): os.environ['PANGOCAIRO_BACKEND'] = "fontconfig" # Calls to LOG must be after setup_logging() and ArgParser() diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py index 7c0efad13..62b68335a 100644 --- a/gramps/gui/configure.py +++ b/gramps/gui/configure.py @@ -1550,13 +1550,6 @@ class GrampsPreferences(ConfigureDialog): justify=Gtk.Justification.CENTER, align=Gtk.Align.CENTER) current_line = 1 - if win(): - self.add_checkbox( - grid, _('Use alternate Font handler for GUI and Reports ' - '(requires restart)'), - current_line, 'preferences.alternate-fonthandler', stop=3, - tooltip=_("Can help to fix problems with fonts.")) - current_line += 1 self.add_checkbox(grid, _('Add default source on GEDCOM import'), current_line, 'preferences.default-source', stop=3)