From a666dc0a1afa69b5b42aa3a487c8fa971c01cde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 1 Jan 2017 19:59:46 +0100 Subject: NOISSUE fix up translation selection in settings and add OS/sys arch reporting --- application/pages/global/MultiMCPage.cpp | 39 +++++++++++++------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'application/pages/global/MultiMCPage.cpp') diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp index 11129d86..b2ef325d 100644 --- a/application/pages/global/MultiMCPage.cpp +++ b/application/pages/global/MultiMCPage.cpp @@ -55,6 +55,7 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP defaultFormat = new QTextCharFormat(ui->fontPreview->currentCharFormat()); + m_languageModel = MMC->translations(); loadSettings(); if(BuildConfig.UPDATER_ENABLED) @@ -82,6 +83,7 @@ MultiMCPage::MultiMCPage(QWidget *parent) : QWidget(parent), ui(new Ui::MultiMCP } connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview())); connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview())); + connect(ui->languageBox, SIGNAL(currentIndexChanged(int)), SLOT(languageIndexChanged(int))); } MultiMCPage::~MultiMCPage() @@ -190,6 +192,19 @@ void MultiMCPage::on_lwjglDirBrowseBtn_clicked() } } +void MultiMCPage::languageIndexChanged(int index) +{ + auto languageCode = ui->languageBox->itemData(ui->languageBox->currentIndex()).toString(); + if(languageCode.isEmpty()) + { + qWarning() << "Unknown language at index" << index; + return; + } + auto translations = MMC->translations(); + translations->selectLanguage(languageCode); + translations->updateLanguage(languageCode); +} + void MultiMCPage::refreshUpdateChannelList() { // Stop listening for selection changes. It's going to change a lot while we update it and @@ -363,29 +378,7 @@ void MultiMCPage::loadSettings() auto s = MMC->settings(); // Language { - using LanguageItem = std::pair; - std::vector items; - - QLocale english("en"); - items.push_back(std::make_pair(english.nativeLanguageName(), "en")); - for(QString lang: QDir("translations").entryList(QStringList() << "*.qm", QDir::Files)) - { - lang.remove(".qm"); - lang.remove("mmc_"); - QLocale locale(lang); - QString fullLangName = locale.nativeLanguageName(); - qDebug() << fullLangName << lang; - items.push_back(std::make_pair(fullLangName, lang)); - } - std::sort(items.begin(), items.end(), [](const LanguageItem & a, const LanguageItem & b) - { - return a.first.localeAwareCompare(b.first) < 0; - }); - ui->languageBox->clear(); - for(auto & item: items) - { - ui->languageBox->addItem(item.first, item.second); - } + ui->languageBox->setModel(m_languageModel.get()); ui->languageBox->setCurrentIndex(ui->languageBox->findData(s->get("Language").toString())); } -- cgit v1.2.3