Commit 0cace323 authored by Gus Grubba's avatar Gus Grubba

Don't load custom fonts when using Chinese or Korean

parent 7eeffd6e
......@@ -474,11 +474,17 @@ void QGCApplication::_initCommon()
bool QGCApplication::_initForNormalAppBoot()
{
if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) {
qWarning() << "Could not load /fonts/opensans font";
}
if(QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) {
qWarning() << "Could not load /fonts/opensans-demibold font";
//-- See App.SettinsGroup.json for index
int langID = toolbox()->settingsManager()->appSettings()->language()->rawValue().toInt();
//-- Don't load custom fonts if not using standard character set
if(langID != 6 /*Korean*/ && langID != 9 /*Chinese*/) {
if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) {
qWarning() << "Could not load /fonts/opensans font";
}
if(QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) {
qWarning() << "Could not load /fonts/opensans-demibold font";
}
}
QSettings settings;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment