Merge pull request #4678 from thedax/win32ShaderTranslations

Win32 Menubar: Allow postprocessing shader names to be translated.
This commit is contained in:
Henrik Rydgård committed 2013-11-29 09:58:11 -08:00
commit d87399a2fd
2 files changed
+7 -4

No files matched your search

+1 -2
View File
@@ -109,8 +109,7 @@ void DoState(PointerWrap &p)
if (!g_RemasterMode)
g_MemorySize = RAM_NORMAL_SIZE;
g_PSPModel = PSP_MODEL_FAT;
}
else {
} else {
p.Do(g_PSPModel);
p.DoMarker("PSPModel");
if (!g_RemasterMode)
+6 -2
View File
@@ -472,7 +472,7 @@ namespace MainWindow
void CreateShadersSubmenu() {
I18NCategory *des = GetI18NCategory("DesktopUI");
I18NCategory *shdr = GetI18NCategory("PostShaders");
const std::wstring key = ConvertUTF8ToWString(des->T("Postprocessing Shader"));
HMENU optionsMenu = GetSubMenu(menu, MENU_OPTIONS);
@@ -488,6 +488,8 @@ namespace MainWindow
int item = ID_SHADERS_BASE + 1;
int checkedStatus = -1;
const char *translatedShaderName = nullptr;
for (auto i = info.begin(); i != info.end(); ++i) {
checkedStatus = MF_UNCHECKED;
availableShaders.push_back(i->section);
@@ -495,7 +497,9 @@ namespace MainWindow
checkedStatus = MF_CHECKED;
}
AppendMenu(shaderMenu, MF_STRING | MF_BYPOSITION | checkedStatus, item++, ConvertUTF8ToWString(i->name).c_str());
translatedShaderName = shdr->T(i->section.c_str());
AppendMenu(shaderMenu, MF_STRING | MF_BYPOSITION | checkedStatus, item++, ConvertUTF8ToWString(translatedShaderName).c_str());
}
}