From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 application/setupwizard/LanguageWizardPage.cpp | 54 +++++++++-----------------
 1 file changed, 18 insertions(+), 36 deletions(-)

(limited to 'application/setupwizard/LanguageWizardPage.cpp')

diff --git a/application/setupwizard/LanguageWizardPage.cpp b/application/setupwizard/LanguageWizardPage.cpp
index b884c91a..ca93c6f5 100644
--- a/application/setupwizard/LanguageWizardPage.cpp
+++ b/application/setupwizard/LanguageWizardPage.cpp
@@ -2,25 +2,19 @@
 #include <MultiMC.h>
 #include <translations/TranslationsModel.h>
 
+#include "widgets/LanguageSelectionWidget.h"
 #include <QVBoxLayout>
-#include <QListView>
 
 LanguageWizardPage::LanguageWizardPage(QWidget *parent)
-	: BaseWizardPage(parent)
+    : BaseWizardPage(parent)
 {
-	setObjectName(QStringLiteral("languagePage"));
-	verticalLayout = new QVBoxLayout(this);
-	verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
-	languageView = new QListView(this);
-	languageView->setObjectName(QStringLiteral("languageView"));
-	verticalLayout->addWidget(languageView);
-	retranslate();
+    setObjectName(QStringLiteral("languagePage"));
+    auto layout = new QVBoxLayout(this);
+    mainWidget = new LanguageSelectionWidget(this);
+    layout->setContentsMargins(0,0,0,0);
+    layout->addWidget(mainWidget);
 
-	auto translations = MMC->translations();
-	auto index = translations->selectedIndex();
-	languageView->setModel(translations.get());
-	languageView->setCurrentIndex(index);
-	connect(languageView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LanguageWizardPage::languageRowChanged);
+    retranslate();
 }
 
 LanguageWizardPage::~LanguageWizardPage()
@@ -29,38 +23,26 @@ LanguageWizardPage::~LanguageWizardPage()
 
 bool LanguageWizardPage::wantsRefreshButton()
 {
-	return true;
+    return true;
 }
 
 void LanguageWizardPage::refresh()
 {
-	auto translations = MMC->translations();
-	translations->downloadIndex();
+    auto translations = MMC->translations();
+    translations->downloadIndex();
 }
 
 bool LanguageWizardPage::validatePage()
 {
-	auto settings = MMC->settings();
-	auto translations = MMC->translations();
-	QString key = translations->data(languageView->currentIndex(), Qt::UserRole).toString();
-	settings->set("Language", key);
-	return true;
+    auto settings = MMC->settings();
+    QString key = mainWidget->getSelectedLanguageKey();
+    settings->set("Language", key);
+    return true;
 }
 
 void LanguageWizardPage::retranslate()
 {
-	setTitle(tr("Language"));
-	setSubTitle(tr("Select the language to use in MultiMC"));
-}
-
-void LanguageWizardPage::languageRowChanged(const QModelIndex &current, const QModelIndex &previous)
-{
-	if (current == previous)
-	{
-		return;
-	}
-	auto translations = MMC->translations();
-	QString key = translations->data(current, Qt::UserRole).toString();
-	translations->selectLanguage(key);
-	translations->updateLanguage(key);
+    setTitle(tr("Language"));
+    setSubTitle(tr("Select the language to use in MultiMC"));
+    mainWidget->retranslate();
 }
-- 
cgit v1.2.3