diff --git a/gramps/gen/config.py b/gramps/gen/config.py index cbfa71b60..4355ccc71 100644 --- a/gramps/gen/config.py +++ b/gramps/gen/config.py @@ -294,6 +294,7 @@ register('paths.quick-backup-filename', 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/grampsapp.py b/gramps/grampsapp.py index 07dc53544..b460f7e45 100644 --- a/gramps/grampsapp.py +++ b/gramps/grampsapp.py @@ -46,6 +46,7 @@ from .gen.const import APP_GRAMPS, USER_DIRLIST, HOME_DIR from .gen.constfunc import mac from .version import VERSION_TUPLE from .gen.constfunc import win, get_env_var +from gramps.gen.config import config #------------------------------------------------------------------------- # @@ -473,6 +474,9 @@ def main(): resource_path, filename = os.path.split(os.path.abspath(__file__)) resource_path, dirname = os.path.split(resource_path) os.environ['GRAMPS_RESOURCES'] = resource_path + if win() and ('PANGOCAIRO_BACKEND' not in os.environ) and \ + config.get('preferences.alternate-fonthandler'): + os.environ['PANGOCAIRO_BACKEND'] = "fontconfig" errors = run() if errors and isinstance(errors, list): for error in errors: diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py index 337f39df7..6b7eea7f0 100644 --- a/gramps/gui/configure.py +++ b/gramps/gui/configure.py @@ -66,6 +66,7 @@ from gramps.gen.plug.utils import available_updates from .plug import PluginWindows from gramps.gen.errors import WindowActiveError from .spell import HAVE_GTKSPELL +from gramps.gen.constfunc import win _ = glocale.translation.gettext #------------------------------------------------------------------------- @@ -1291,6 +1292,12 @@ class GrampsPreferences(ConfigureDialog): grid.set_row_spacing(6) 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, _('Add default source on GEDCOM import'), current_line, 'preferences.default-source')