diff --git a/src/fonts/DroidSansFallback.ttf b/src/fonts/DroidSansFallback.ttf new file mode 100644 index 0000000..1099b17 Binary files /dev/null and b/src/fonts/DroidSansFallback.ttf differ diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp index a88dfdb..6260f17 100644 --- a/src/imagewriter.cpp +++ b/src/imagewriter.cpp @@ -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" */ diff --git a/src/main.cpp b/src/main.cpp index 5c00457..e3497c4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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) diff --git a/src/qml.qrc b/src/qml.qrc index 8c4da6e..1d09f94 100644 --- a/src/qml.qrc +++ b/src/qml.qrc @@ -35,5 +35,6 @@ qmlcomponents/ImButton.qml qmlcomponents/ImCheckBox.qml qmlcomponents/ImRadioButton.qml + fonts/DroidSansFallback.ttf