From 567f402845688dfce34f2d86cfc5d734c6e87a7b Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Tue, 20 Aug 2013 15:26:00 +0200 Subject: [PATCH] Change the links on the main page --- UI/GameSettingsScreen.cpp | 3 +-- UI/MainScreen.cpp | 6 +++--- native | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index f6ffe8d8fa..3679aafa34 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -230,8 +230,6 @@ void GameSettingsScreen::CreateViews() { static const char *renderingMode[] = { "Non-Buffered Rendering", "Buffered Rendering", "Read Framebuffers To Memory(CPU)", "Read Framebuffers To Memory(GPU)"}; graphicsSettings->Add(new PopupMultiChoice(&g_Config.iRenderingMode, gs->T("Mode"), renderingMode, 0, 4, gs, screenManager())); - graphicsSettings->Add(new CheckBox(&g_Config.bAntiAliasing, gs->T("Anti-Aliasing"))); - graphicsSettings->Add(new ItemHeader(gs->T("Frame Rate Control"))); static const char *frameSkip[] = {"Off", "Auto", "1", "2", "3", "4", "5", "6", "7", "8"}; graphicsSettings->Add(new PopupMultiChoice(&g_Config.iFrameSkip, gs->T("Frame Skipping"), frameSkip, 0, 9, gs, screenManager())); @@ -244,6 +242,7 @@ void GameSettingsScreen::CreateViews() { graphicsSettings->Add(new ItemHeader(gs->T("Features"))); graphicsSettings->Add(new CheckBox(&g_Config.bHardwareTransform, gs->T("Hardware Transform"))); graphicsSettings->Add(new CheckBox(&g_Config.bVertexCache, gs->T("Vertex Cache"))); + graphicsSettings->Add(new CheckBox(&g_Config.bAntiAliasing, gs->T("Anti-Aliasing"))); graphicsSettings->Add(new CheckBox(&g_Config.bStretchToDisplay, gs->T("Stretch to Display"))); #ifdef BLACKBERRY if (pixel_xres == pixel_yres) diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 173df0d154..b4870e063e 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -476,13 +476,13 @@ void MainScreen::CreateViews() { ScrollView *scrollHomebrew = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); GameBrowser *tabRecentGames = new GameBrowser( - "!RECENT", false, &g_Config.bGridView1, m->T("How to get games"), "http://www.ppsspp.org/faq.html", + "!RECENT", false, &g_Config.bGridView1, "", "", new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); GameBrowser *tabAllGames = new GameBrowser(g_Config.currentDirectory, true, &g_Config.bGridView2, - m->T("How to get games"), "http://www.ppsspp.org/faq.html", + m->T("How to get games"), "http://www.ppsspp.org/getgames.html", new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); GameBrowser *tabHomebrew = new GameBrowser(GetMemCardDirectory() + "PSP/GAME/", false, &g_Config.bGridView3, - "", "", + m->T("How to get homebrew & demos"), "http://www.ppsspp.org/gethomebrew.html", new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); scrollRecentGames->Add(tabRecentGames); diff --git a/native b/native index 8f0d82ffb7..3ea9d45299 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 8f0d82ffb72efb7fe138e7d1c83635691ba3f4e7 +Subproject commit 3ea9d45299a8066f451878e3ace127c947cc7a2f