Browse Source

Merge pull request #7463 from mavlink/koreanFonts

Load Korean fonts when needed
QGC4.4
Gus Grubba 6 years ago committed by GitHub
parent
commit
4d55d0c52d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      src/QGCApplication.cc

16
src/QGCApplication.cc

@ -391,12 +391,6 @@ void QGCApplication::setLanguage() @@ -391,12 +391,6 @@ void QGCApplication::setLanguage()
break;
case 12:
locale = QLocale(QLocale::Korean);
if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Regular") < 0) {
qWarning() << "Could not load /fonts/NanumGothic-Regular font";
}
if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Bold") < 0) {
qWarning() << "Could not load /fonts/NanumGothic-Bold font";
}
break;
case 13:
locale = QLocale(QLocale::Norwegian);
@ -421,6 +415,16 @@ void QGCApplication::setLanguage() @@ -421,6 +415,16 @@ void QGCApplication::setLanguage()
break;
}
}
//-- We have specific fonts for Korean
if(locale == QLocale::Korean) {
qDebug() << "Loading Korean fonts" << locale.name();
if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Regular") < 0) {
qWarning() << "Could not load /fonts/NanumGothic-Regular font";
}
if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Bold") < 0) {
qWarning() << "Could not load /fonts/NanumGothic-Bold font";
}
}
qDebug() << "Loading localization for" << locale.name();
_app->removeTranslator(&_QGCTranslator);
_app->removeTranslator(&_QGCTranslatorQt);

Loading…
Cancel
Save