mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 18:41:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'qt_fix' into 'master'

Browse source 
Register language selector properly

Closes #7727

See merge request OpenMW/openmw!3666
This commit is contained in:
Alexei Kotov 2023-12-20 04:15:17 +00:00
commit 7074ea02b7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/wizard/installationpage.cpp
View file

@ -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<QComboBox*>()->currentData().toString());
QString language(field(QLatin1String("installation.language")).toString());
if (language == QLatin1String("Polish"))
{

2
apps/wizard/languageselectionpage.cpp
View file

@ -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()

4
apps/wizard/mainwizard.cpp
View file

@ -270,7 +270,7 @@ void Wizard::MainWizard::runSettingsImporter()
arguments.append(QLatin1String("--encoding"));
// Set encoding
QString language(field(QLatin1String("installation.language")).value<QComboBox*>()->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<QComboBox*>()->currentData().toString());
QString language(field(QLatin1String("installation.language")).toString());
mLauncherSettings.setLanguage(language);
if (language == QLatin1String("Polish"))