Get rid of Windows LCIDs as numeric language IDs
This commit is contained in:
@@ -45,18 +45,45 @@ extern MainWindow *main_window;
|
||||
ProgSettings::CustomTranslator *ProgSettings::translator = nullptr;
|
||||
QTranslator *ProgSettings::qtTranslator = nullptr;
|
||||
|
||||
QVector<QPair<QString, QString>> ProgSettings::languages = {
|
||||
{ "system", "(System Default)" },
|
||||
{ "ca-ES", "Catalan (Spain)" },
|
||||
{ "zh-CN", "Chinese (Simplified)" },
|
||||
{ "zh-TW", "Chinese (Traditional)" },
|
||||
{ "hr-HR", "Croatian (Croatia)" },
|
||||
{ "cs-CZ", "Czech (Czech Republic)" },
|
||||
{ "de-DE", "German (Germany)" },
|
||||
{ "en-GB", "English (United Kingdom)" },
|
||||
{ "en-US", "English (United States)" },
|
||||
{ "fi-FI", "Finnish (Finland)" },
|
||||
{ "fr-FR", "French (France)" },
|
||||
{ "hu-HU", "Hungarian (Hungary)" },
|
||||
{ "it-IT", "Italian (Italy)" },
|
||||
{ "ja-JP", "Japanese (Japan)" },
|
||||
{ "ko-KR", "Korean (Korea)" },
|
||||
{ "nl-NL", "Dutch (Netherlands)" },
|
||||
{ "pl-PL", "Polish (Poland)" },
|
||||
{ "pt-BR", "Portuguese (Brazil)" },
|
||||
{ "pt-PT", "Portuguese (Portugal)" },
|
||||
{ "ru-RU", "Russian (Russia)" },
|
||||
{ "sk-SK", "Slovak (Slovakia)" },
|
||||
{ "sl-SI", "Slovenian (Slovenia)" },
|
||||
{ "es-ES", "Spanish (Spain)" },
|
||||
{ "tr-TR", "Turkish (Turkey)" },
|
||||
{ "uk-UA", "Ukrainian (Ukraine)" },
|
||||
{ "vi-VN", "Vietnamese (Vietnam)" },
|
||||
};
|
||||
|
||||
ProgSettings::ProgSettings(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
, ui(new Ui::ProgSettings)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->comboBoxLanguage->setItemData(0, 0xFFFF);
|
||||
for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++) {
|
||||
if (i.key() == 0xFFFF)
|
||||
continue;
|
||||
ui->comboBoxLanguage->addItem(lcid_langcode[i.key()].second, i.key());
|
||||
if (i.key() == lang_id) {
|
||||
ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
|
||||
ui->comboBoxLanguage->setItemData(0, 0);
|
||||
for (int i = 1; i < languages.length(); i++) {
|
||||
ui->comboBoxLanguage->addItem(languages[i].second, i);
|
||||
if (i == lang_id) {
|
||||
ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i));
|
||||
}
|
||||
}
|
||||
ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder);
|
||||
@@ -78,7 +105,7 @@ ProgSettings::ProgSettings(QWidget *parent)
|
||||
void
|
||||
ProgSettings::accept()
|
||||
{
|
||||
lang_id = ui->comboBoxLanguage->currentData().toUInt();
|
||||
lang_id = ui->comboBoxLanguage->currentData().toInt();
|
||||
open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0;
|
||||
confirm_exit = ui->checkBoxConfirmExit->isChecked() ? 1 : 0;
|
||||
confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0;
|
||||
@@ -113,27 +140,46 @@ ProgSettings::~ProgSettings()
|
||||
/* Return the standard font name on Windows, which is overridden per-language
|
||||
to prevent CJK fonts with embedded bitmaps being chosen as a fallback. */
|
||||
QString
|
||||
ProgSettings::getFontName(uint32_t lcid)
|
||||
ProgSettings::getFontName(int langId)
|
||||
{
|
||||
switch (lcid) {
|
||||
case 0x0404: /* zh-TW */
|
||||
return "Microsoft JhengHei";
|
||||
case 0x0411: /* ja-JP */
|
||||
/* Check for Windows 10 or later to choose the appropriate system font */
|
||||
if (QVersionNumber::fromString(QSysInfo::kernelVersion()).majorVersion() >= 10)
|
||||
return "Yu Gothic UI";
|
||||
else
|
||||
return "Meiryo UI";
|
||||
case 0x0412: /* ko-KR */
|
||||
return "Malgun Gothic";
|
||||
case 0x0804: /* zh-CN */
|
||||
return "Microsoft YaHei";
|
||||
default:
|
||||
return "Segoe UI";
|
||||
}
|
||||
QString langCode = languageIdToCode(lang_id);
|
||||
if (langCode == "ja-JP") {
|
||||
/* Check for Windows 10 or later to choose the appropriate system font */
|
||||
if (QVersionNumber::fromString(QSysInfo::kernelVersion()).majorVersion() >= 10)
|
||||
return "Yu Gothic UI";
|
||||
else
|
||||
return "Meiryo UI";
|
||||
} else if (langCode == "ko-KR")
|
||||
return "Malgun Gothic";
|
||||
else if (langCode == "zh-CN")
|
||||
return "Microsoft YaHei";
|
||||
else if (langCode == "zh-TW")
|
||||
return "Microsoft JhengHei";
|
||||
else
|
||||
return "Segoe UI";
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
ProgSettings::languageCodeToId(QString langCode)
|
||||
{
|
||||
for (int i = 0; i < languages.length(); i++) {
|
||||
if (languages[i].first == langCode) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
QString
|
||||
ProgSettings::languageIdToCode(int id)
|
||||
{
|
||||
if ((id == 0) || (id >= languages.length())) {
|
||||
return "system";
|
||||
}
|
||||
return languages[id].first;
|
||||
}
|
||||
|
||||
void
|
||||
ProgSettings::loadTranslators(QObject *parent)
|
||||
{
|
||||
@@ -148,7 +194,7 @@ ProgSettings::loadTranslators(QObject *parent)
|
||||
qtTranslator = new QTranslator(parent);
|
||||
translator = new CustomTranslator(parent);
|
||||
QString localetofilename = "";
|
||||
if (lang_id == 0xFFFF || lcid_langcode.contains(lang_id) == false) {
|
||||
if (lang_id == 0 || lang_id >= languages.length()) {
|
||||
for (int i = 0; i < QLocale::system().uiLanguages().size(); i++) {
|
||||
localetofilename = QLocale::system().uiLanguages()[i];
|
||||
if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/"))) {
|
||||
@@ -166,12 +212,12 @@ ProgSettings::loadTranslators(QObject *parent)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
translator->load(QLatin1String("86box_") + lcid_langcode[lang_id].first, QLatin1String(":/"));
|
||||
translator->load(QLatin1String("86box_") + languages[lang_id].first, QLatin1String(":/"));
|
||||
QCoreApplication::installTranslator(translator);
|
||||
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
|
||||
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).left(QString(lcid_langcode[lang_id].first).indexOf('-')), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
|
||||
if(!qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/"))
|
||||
qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLatin1String(":/"));
|
||||
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(languages[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
|
||||
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(languages[lang_id].first).left(QString(languages[lang_id].first).indexOf('-')), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
|
||||
if(!qtTranslator->load(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/"))
|
||||
qtTranslator->load(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_'), QLatin1String(":/"));
|
||||
|
||||
QCoreApplication::installTranslator(qtTranslator);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user