From 8d06a9950739367de8cd5549473d16d745c3c78d Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Tue, 19 Dec 2023 10:20:31 +0400 Subject: [PATCH] Register language selector properly --- apps/wizard/installationpage.cpp | 2 +- apps/wizard/languageselectionpage.cpp | 2 +- apps/wizard/mainwizard.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp index 2dd796ab3f..60e9f3ccf9 100644 --- a/apps/wizard/installationpage.cpp +++ b/apps/wizard/installationpage.cpp @@ -124,7 +124,7 @@ void Wizard::InstallationPage::startInstallation() mUnshield->setPath(path); // Set the right codec to use for Morrowind.ini - QString language(field(QLatin1String("installation.language")).value()->currentData().toString()); + QString language(field(QLatin1String("installation.language")).toString()); if (language == QLatin1String("Polish")) { diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp index 38050b1cab..7dcf642dd6 100644 --- a/apps/wizard/languageselectionpage.cpp +++ b/apps/wizard/languageselectionpage.cpp @@ -9,7 +9,7 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent) setupUi(this); - registerField(QLatin1String("installation.language"), languageComboBox); + registerField(QLatin1String("installation.language"), languageComboBox, "currentData", "currentDataChanged"); } void Wizard::LanguageSelectionPage::initializePage() diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp index 5fd316d17a..2f1f373cfd 100644 --- a/apps/wizard/mainwizard.cpp +++ b/apps/wizard/mainwizard.cpp @@ -270,7 +270,7 @@ void Wizard::MainWizard::runSettingsImporter() arguments.append(QLatin1String("--encoding")); // Set encoding - QString language(field(QLatin1String("installation.language")).value()->currentData().toString()); + QString language(field(QLatin1String("installation.language")).toString()); if (language == QLatin1String("Polish")) { arguments.append(QLatin1String("win1250")); @@ -391,7 +391,7 @@ void Wizard::MainWizard::reject() void Wizard::MainWizard::writeSettings() { // Write the encoding and language settings - QString language(field(QLatin1String("installation.language")).value()->currentData().toString()); + QString language(field(QLatin1String("installation.language")).toString()); mLauncherSettings.setLanguage(language); if (language == QLatin1String("Polish"))