From 514a52d81f4ad9e309c192642dcfbdb6e0dd85fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org> Date: Wed, 10 Aug 2022 18:48:20 +0300 Subject: [PATCH] Use system Liberation TTF fonts --- src/util/Font.cpp | 2 +- src/util/Util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/Font.cpp b/src/util/Font.cpp index ea1124c..bc6ead0 100644 --- a/src/util/Font.cpp +++ b/src/util/Font.cpp @@ -157,7 +157,7 @@ bool Font::loadFontFamily(const QString& fname) void Font::loadAllFonts() { - QString dirname = Util::pathFonts()+"liberation-fonts/"; + QString dirname = Util::pathFonts()+"liberation/"; int nb = 0; QDir dir(dirname); if (dir.exists()) { diff --git a/src/util/Util.h b/src/util/Util.h index 57b04b9..ac17c49 100644 --- a/src/util/Util.h +++ b/src/util/Util.h @@ -81,7 +81,7 @@ class Util : public QObject static QString pathData () ; static QString pathColors () {return pathData()+"data/colors/";} static QString pathConfig () {return pathData()+"data/config/";} - static QString pathFonts () {return pathData()+"data/fonts/";} + static QString pathFonts () {return "/usr/share/fonts/TTF/";} static QString pathGis () {return pathData()+"data/gis/";} static QString pathGshhs () {return pathData()+"data/maps/gshhs/";} static QString pathStuff () {return pathData()+"data/stuff/";} -- 2.37.1