Embedded: fix font support for eastern countries

This commit is contained in:
Floris Bos 2022-02-21 17:47:06 +01:00
parent 0b130540f4
commit c4cfcd0604
4 changed files with 4 additions and 2 deletions

Binary file not shown.

View file

@ -160,8 +160,8 @@ ImageWriter::ImageWriter(QObject *parent)
{
QString langcode = tf.mid(11, tf.length()-14);
/* FIXME: we currently lack a font with support for Chinese characters in embedded mode */
if (isEmbeddedMode() && langcode == "zh")
continue;
//if (isEmbeddedMode() && langcode == "zh")
// continue;
QLocale loc(langcode);
/* Use "English" for "en" and not "American English" */

View file

@ -76,6 +76,7 @@ int main(int argc, char *argv[])
/* Set default font */
QStringList fontList = QFontDatabase::applicationFontFamilies(QFontDatabase::addApplicationFont(":/fonts/Roboto-Regular.ttf"));
QGuiApplication::setFont(QFont(fontList.first(), 10));
QFontDatabase::addApplicationFont(":/fonts/DroidSansFallback.ttf");
QLocale::Language l = QLocale::system().language();
if (l == QLocale::AnyLanguage || l == QLocale::C)

View file

@ -35,5 +35,6 @@
<file>qmlcomponents/ImButton.qml</file>
<file>qmlcomponents/ImCheckBox.qml</file>
<file>qmlcomponents/ImRadioButton.qml</file>
<file>fonts/DroidSansFallback.ttf</file>
</qresource>
</RCC>