piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4117 from JosJuice/wx-language-code

Browse Source 
Save GUI language as string instead of wxLanguage enum
This commit is contained in:
shuffle2
2016-10-02 21:23:36 -07:00
committed by GitHub
parent f71966866b f63461175c
commit 0082fa527b
4 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/ConfigManager.cpp
View File

@ -138,7 +138,7 @@ void SConfig::SaveInterfaceSettings(IniFile& ini)
interface->Set("MainWindowPosY", (iPosY == -32000) ? 0 : iPosY); // TODO - HAX
interface->Set("MainWindowWidth", iWidth);
interface->Set("MainWindowHeight", iHeight);
interface->Set("Language", m_InterfaceLanguage);
interface->Set("LanguageCode", m_InterfaceLanguage);
interface->Set("ShowToolbar", m_InterfaceToolbar);
interface->Set("ShowStatusbar", m_InterfaceStatusbar);
interface->Set("ShowLogWindow", m_InterfaceLogWindow);
@ -405,7 +405,7 @@ void SConfig::LoadInterfaceSettings(IniFile& ini)
interface->Get("MainWindowPosY", &iPosY, 100);
interface->Get("MainWindowWidth", &iWidth, 800);
interface->Get("MainWindowHeight", &iHeight, 600);
interface->Get("Language", &m_InterfaceLanguage, 0);
interface->Get("LanguageCode", &m_InterfaceLanguage, "");
interface->Get("ShowToolbar", &m_InterfaceToolbar, true);
interface->Get("ShowStatusbar", &m_InterfaceStatusbar, true);
interface->Get("ShowLogWindow", &m_InterfaceLogWindow, false);

2
Source/Core/Core/ConfigManager.h
View File

@ -217,7 +217,7 @@ struct SConfig : NonCopyable
std::string m_bba_mac;
// interface language
int m_InterfaceLanguage;
std::string m_InterfaceLanguage;
float m_EmulationSpeed;
bool m_OCEnable;
float m_OCFactor;