archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: fix localization in change_microphone_type

Browse source 
Don't rely on localized text at all. Use the setting's index and formatted string instead
This commit is contained in:
Megamouse 2020-04-17 10:28:19 +02:00
parent ec4e8eda04
commit 171367fe88
2 changed files with 66 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

39
rpcs3/rpcs3qt/emu_settings.cpp
View file

@ -227,10 +227,10 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
{
const QStringList settings = GetSettingOptions(type);
for (const QString& setting : settings)
for (int i = 0; i < settings.count(); i++)
{
const QString localized_setting = GetLocalizedSetting(setting, type, combobox->count());
combobox->addItem(localized_setting, QVariant(setting));
const QString localized_setting = GetLocalizedSetting(settings[i], type, combobox->count());
combobox->addItem(localized_setting, QVariant({settings[i], i}));
}
if (sorted)
@ -240,7 +240,27 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
}
const std::string selected = GetSetting(type);
const int index = combobox->findData(qstr(selected));
const QString selected_q = qstr(selected);
int index = -1;
if (is_ranged)
{
index = combobox->findData(selected_q);
}
else
{
for (int i = 0; i < combobox->count(); i++)
{
const QVariantList var_list = combobox->itemData(i).toList();
ASSERT(var_list.size() == 2 && var_list[0].canConvert<QString>());
if (selected_q == var_list[0].toString())
{
index = i;
break;
}
}
}
if (index == -1)
{
@ -256,7 +276,16 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
connect(combobox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=, this](int index)
{
SetSetting(type, sstr(combobox->itemData(index)));
if (is_ranged)
{
SetSetting(type, sstr(combobox->itemData(index)));
}
else
{
const QVariantList var_list = combobox->itemData(index).toList();
ASSERT(var_list.size() == 2 && var_list[0].canConvert<QString>());
SetSetting(type, sstr(var_list[0]));
}
});
}