mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Add a None item for cases when there is no secondary localization

Browse Source
This commit is contained in:
Andrei Kortunov 2022-07-27 10:51:36 +04:00
parent cf90581995
commit 4ac3c347ad
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apps/openmw/mwgui/settingswindow.cpp
View File

@ -384,9 +384,13 @@ namespace MWGui
icu::Locale primaryLocale(currentLocales[0].c_str()); icu::Locale primaryLocale(currentLocales[0].c_str());
mPrimaryLanguage->removeAllItems(); mPrimaryLanguage->removeAllItems();
mSecondaryLanguage->removeAllItems(); mPrimaryLanguage->setIndexSelected(MyGUI::ITEM_NONE);
size_t i = 0, primaryLocaleIndex = MyGUI::ITEM_NONE, secondaryLocaleIndex = MyGUI::ITEM_NONE; mSecondaryLanguage->removeAllItems();
mSecondaryLanguage->addItem(MyGUI::LanguageManager::getInstance().replaceTags("#{sNone}"), std::string());
mSecondaryLanguage->setIndexSelected(0);
size_t i = 0;
for (const auto& language : availableLanguages) for (const auto& language : availableLanguages)
{ {
icu::Locale locale(language.c_str()); icu::Locale locale(language.c_str());
@ -395,22 +399,17 @@ namespace MWGui
locale.getDisplayName(primaryLocale, str); locale.getDisplayName(primaryLocale, str);
std::string localeString; std::string localeString;
str.toUTF8String(localeString); str.toUTF8String(localeString);
mPrimaryLanguage->addItem(localeString);
mSecondaryLanguage->addItem(localeString); mPrimaryLanguage->addItem(localeString, language);
mSecondaryLanguage->addItem(localeString, language);
if (language == currentLocales[0]) if (language == currentLocales[0])
primaryLocaleIndex = i; mPrimaryLanguage->setIndexSelected(i);
if (currentLocales.size() > 1 && language == currentLocales[1]) if (currentLocales.size() > 1 && language == currentLocales[1])
secondaryLocaleIndex = i; mSecondaryLanguage->setIndexSelected(i + 1);
i++; i++;
} }
mPrimaryLanguage->setUserData(availableLanguages);
mSecondaryLanguage->setUserData(availableLanguages);
mPrimaryLanguage->setIndexSelected(primaryLocaleIndex);
mSecondaryLanguage->setIndexSelected(secondaryLocaleIndex);
} }
void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/) void SettingsWindow::onTabChanged(MyGUI::TabControl* /*_sender*/, size_t /*index*/)
@ -522,12 +521,16 @@ namespace MWGui
_sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected())); _sender->setCaptionWithReplacing(_sender->getItemNameAt(_sender->getIndexSelected()));
MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true); MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true);
const auto languageNames = _sender->getUserData<std::vector<std::string>>();
std::vector<std::string> currentLocales = Settings::Manager::getStringArray("preferred locales", "General"); std::vector<std::string> currentLocales = Settings::Manager::getStringArray("preferred locales", "General");
if (currentLocales.size() <= langPriority) if (currentLocales.size() <= langPriority)
currentLocales.resize(langPriority + 1, "en"); currentLocales.resize(langPriority + 1, "en");
currentLocales[langPriority] = languageNames->at(pos);
const auto& languageCode = *_sender->getItemDataAt<std::string>(pos);
if (!languageCode.empty())
currentLocales[langPriority] = *_sender->getItemDataAt<std::string>(pos);
else
currentLocales.resize(1);
Settings::Manager::setStringArray("preferred locales", "General", currentLocales); Settings::Manager::setStringArray("preferred locales", "General", currentLocales);
} }