Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

popup language menu now shows native and english version of language name

This commit is contained in:
Mark Vejvoda 2013-10-29 21:32:19 +00:00
parent c04a73017c
commit 7011d49868
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/glest_game/main/main.cpp
View File

@ -858,8 +858,22 @@ void MainWindow::eventMouseDown(int x, int y, MouseButton mouseButton){
// Exit game
if(result.first != cancelLanguageSelection) {
//toggleLanguage(result.second);
this->triggerLanguageToggle = true;
this->triggerLanguage = result.second;
//this->triggerLanguageToggle = true;
//this->triggerLanguage = result.second;
Lang &lang= Lang::getInstance();
map<string,string> languageList = lang.getDiscoveredLanguageList(true);
for(map<string,string>::iterator iterMap = languageList.begin();
iterMap != languageList.end(); ++iterMap) {
string matchLanguage = iterMap->first + "-" + iterMap->second;
if(matchLanguage == result.second) {
this->triggerLanguageToggle = true;
this->triggerLanguage = iterMap->first;
//printf("Switching to lang [%s] [%s] [%s]\n",this->triggerLanguage.c_str(),iterMap->first.c_str(), iterMap->second.c_str());
break;
}
}
}
return;
@ -1028,8 +1042,9 @@ void MainWindow::render() {
}
void MainWindow::showLanguages() {
/*
Lang &lang= Lang::getInstance();
//PopupMenu popupMenu;
std::vector<string> menuItems;
vector<string> langResults;
@ -1056,6 +1071,24 @@ void MainWindow::showLanguages() {
menuItems.push_back(lang.getString("Exit"));
cancelLanguageSelection = menuItems.size()-1;
popupMenu.setW(100);
popupMenu.setH(100);
popupMenu.init(lang.getString("GameMenuTitle"),menuItems);
popupMenu.setEnabled(true);
popupMenu.setVisible(true);
*/
Lang &lang= Lang::getInstance();
std::vector<string> menuItems;
map<string,string> languageList = lang.getDiscoveredLanguageList(true);
for(map<string,string>::iterator iterMap = languageList.begin();
iterMap != languageList.end(); ++iterMap) {
menuItems.push_back(iterMap->first + "-" + iterMap->second);
}
menuItems.push_back(lang.getString("Exit"));
cancelLanguageSelection = menuItems.size()-1;
popupMenu.setW(100);
popupMenu.setH(100);
popupMenu.init(lang.getString("GameMenuTitle"),menuItems);