MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

GLideN64-wtl: Add English entry to Language combobox when translation file list is empty

Browse Source
This commit is contained in:
oddMLan 2020-04-25 05:19:59 -07:00 committed by Sergey Lipskiy
parent 3fe5f50255
commit a97b387c68
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GLideNUI-wtl/Language.cpp
View File

@ -316,7 +316,7 @@ void LoadCurrentStrings(const char * path, const std::string & lang)
{ {
return; return;
} }
} } // default: attempt to use gliden64_en.Lang
std::string langFile = translationsFolder + "gliden64_en.Lang"; std::string langFile = translationsFolder + "gliden64_en.Lang";
LoadLanguageFile(langFile); LoadLanguageFile(langFile);
} }

14
src/GLideNUI-wtl/config-video.cpp
View File

@ -26,6 +26,7 @@ WindowedModes[] = {
{ 1600, 1200, _T("1600 x 1200") } { 1600, 1200, _T("1600 x 1200") }
}; };
static const unsigned int numWindowedModes = sizeof(WindowedModes) / sizeof(WindowedModes[0]); static const unsigned int numWindowedModes = sizeof(WindowedModes) / sizeof(WindowedModes[0]);
static const LPCTSTR englishLang = _T("English");
CVideoTab::CVideoTab(CConfigDlg & Dlg, const char * strIniPath) : CVideoTab::CVideoTab(CConfigDlg & Dlg, const char * strIniPath) :
CConfigTab(IDD_TAB_VIDEO), CConfigTab(IDD_TAB_VIDEO),
@ -82,6 +83,10 @@ BOOL CVideoTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/) {
int indx = translationsComboBox.AddString(ToUTF16(itr->LanguageName.c_str()).c_str()); int indx = translationsComboBox.AddString(ToUTF16(itr->LanguageName.c_str()).c_str());
translationsComboBox.SetItemData(indx, (DWORD_PTR)itr->Filename.c_str()); translationsComboBox.SetItemData(indx, (DWORD_PTR)itr->Filename.c_str());
} }
if (translationsComboBox.FindString(-1, englishLang) == CB_ERR) {
int indx = translationsComboBox.AddString(englishLang);
translationsComboBox.SetItemData(indx, (DWORD_PTR)"");
}
return true; return true;
} }
@ -243,7 +248,7 @@ void CVideoTab::OnFullScreenChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) {
LRESULT CVideoTab::OnLanguageChanged(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hwnd*/, BOOL& /*bHandled*/) { LRESULT CVideoTab::OnLanguageChanged(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hwnd*/, BOOL& /*bHandled*/) {
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE)); CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
std::string currentLang = translationsComboBox.GetCurSel() >= 0 ? (const char *)translationsComboBox.GetItemDataPtr(translationsComboBox.GetCurSel()) : ""; std::string currentLang = (const char *)translationsComboBox.GetItemDataPtr(translationsComboBox.GetCurSel());
m_Dlg.SetLanguage(currentLang); m_Dlg.SetLanguage(currentLang);
return 0; return 0;
} }
@ -354,7 +359,6 @@ void CVideoTab::LoadSettings(bool /*blockCustomSettings*/) {
CButton(GetDlgItem(IDC_CHK_HIRES_NOISE)).SetCheck(config.generalEmulation.enableHiresNoiseDithering == 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_HIRES_NOISE)).SetCheck(config.generalEmulation.enableHiresNoiseDithering == 0 ? BST_CHECKED : BST_UNCHECKED);
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE)); CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
std::string currentLang = translationsComboBox.GetCurSel() > 0 ? (const char *)translationsComboBox.GetItemDataPtr(translationsComboBox.GetCurSel()) : "";
translationsComboBox.SetCurSel(-1); translationsComboBox.SetCurSel(-1);
int englishIndx = -1; int englishIndx = -1;
for (int i = 0, n = translationsComboBox.GetCount(); i < n; i++) { for (int i = 0, n = translationsComboBox.GetCount(); i < n; i++) {
@ -366,9 +370,11 @@ void CVideoTab::LoadSettings(bool /*blockCustomSettings*/) {
translationsComboBox.SetCurSel(i); translationsComboBox.SetCurSel(i);
break; break;
} }
} } // default: attempt to use gliden64_en.Lang
if (englishIndx >= 0 && translationsComboBox.GetCurSel() < 0) if (englishIndx >= 0 && translationsComboBox.GetCurSel() < 0)
translationsComboBox.SetCurSel(englishIndx); translationsComboBox.SetCurSel(englishIndx);
else if (translationsComboBox.GetCurSel() < 0) // gliden64_en.Lang not found; select hardcoded english
translationsComboBox.SetCurSel(translationsComboBox.FindString(-1, englishLang));
} }
void CVideoTab::SaveSettings() void CVideoTab::SaveSettings()
@ -433,5 +439,5 @@ void CVideoTab::SaveSettings()
config.generalEmulation.enableHiresNoiseDithering = CButton(GetDlgItem(IDC_CHK_HIRES_NOISE)).GetCheck() == BST_CHECKED ? 1 : 0; config.generalEmulation.enableHiresNoiseDithering = CButton(GetDlgItem(IDC_CHK_HIRES_NOISE)).GetCheck() == BST_CHECKED ? 1 : 0;
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE)); CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
config.translationFile = translationsComboBox.GetCurSel() >= 0 ? (const char *)translationsComboBox.GetItemDataPtr(translationsComboBox.GetCurSel()) : ""; config.translationFile = (const char *)translationsComboBox.GetItemDataPtr(translationsComboBox.GetCurSel());
} }