Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow translations of post processing shaders (new section PostShaders).

Browse Source 
Minor tweaks.
This commit is contained in:
Henrik Rydgård 2013-11-29 11:36:47 +01:00
parent 33023a34d7
commit ba7536d5ce
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UI/GameSettingsScreen.cpp
View File

@ -183,11 +183,12 @@ void GameSettingsScreen::CreateViews() {
prescale->SetEnabled(false);
graphicsSettings->Add(new ItemHeader(gs->T("Overlay Information")));
static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"
static const char *fpsChoices[] = {
"None", "Speed", "FPS", "Both"
#ifdef BLACKBERRY
, "Statistics"
, "Statistics"
#endif
};
};
graphicsSettings->Add(new PopupMultiChoice(&g_Config.iShowFPSCounter, gs->T("Show FPS Counter"), fpsChoices, 0, ARRAY_SIZE(fpsChoices), gs, screenManager()));
graphicsSettings->Add(new CheckBox(&showDebugStats_, gs->T("Show Debug Statistics")));

2
UI/MainScreen.cpp
View File

@ -445,7 +445,7 @@ void MainScreen::CreateViews() {
m->T("How to get games"), "http://www.ppsspp.org/getgames.html",
new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
GameBrowser *tabHomebrew = new GameBrowser(GetSysDirectory(DIRECTORY_GAME), false, &g_Config.bGridView3,
m->T("How to get homebrew & demos"), "http://www.ppsspp.org/gethomebrew.html",
m->T("How to get homebrew & demos", "How to get homebrew && demos"), "http://www.ppsspp.org/gethomebrew.html",
new LinearLayoutParams(FILL_PARENT, FILL_PARENT));

3
UI/MiscScreens.cpp
View File

@ -192,13 +192,14 @@ UI::EventReturn PromptScreen::OnNo(UI::EventParams &e) {
}
PostProcScreen::PostProcScreen(const std::string &title) : ListPopupScreen(title) {
I18NCategory *ps = GetI18NCategory("PostShaders");
shaders_ = GetAllPostShaderInfo();
std::vector<std::string> items;
int selected = -1;
for (int i = 0; i < (int)shaders_.size(); i++) {
if (shaders_[i].section == g_Config.sPostShaderName)
selected = i;
items.push_back(shaders_[i].name);
items.push_back(ps->T(shaders_[i].name.c_str()));
}
adaptor_ = UI::StringVectorListAdaptor(items, selected);
}

1
UI/NativeApp.cpp
View File

@ -245,6 +245,7 @@ void NativeInit(int argc, const char *argv[],
// It's common to be in a build-xyz/ directory.
else
VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory() + "../assets/").c_str()));
VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory()).c_str()));
#endif
// We want this to be FIRST.

2
lang

@ -1 +1 @@
Subproject commit 2c2a88d0ef2a9d71b073248cd7a6a57355cfe1b3
Subproject commit 056b48b3568ba3d6cddcde04830dec84a9fdeaea

2
native

@ -1 +1 @@
Subproject commit 26eaba2157a44338e6c085065ca0471b2b4dea7d
Subproject commit 0e34574bd7de9fb21b4d403c28a515964909e4c1