From 556eeef22288341e03388647f88e67339de78903 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Fri, 12 Jun 2015 20:37:42 +0200
Subject: [PATCH] Move savedata manager to a new Tools category in Settings

---
 UI/GameSettingsScreen.cpp | 16 ++++++++++++++++
 UI/GameSettingsScreen.h   |  2 ++
 UI/MainScreen.cpp         |  8 +-------
 UI/MainScreen.h           |  1 -
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 1b2d997d9f..b28e07ab1e 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -33,6 +33,7 @@
 #include "UI/MiscScreens.h"
 #include "UI/ControlMappingScreen.h"
 #include "UI/DevScreens.h"
+#include "UI/SavedataScreen.h"
 #include "UI/TouchControlLayoutScreen.h"
 #include "UI/TouchControlVisibilityScreen.h"
 #include "UI/TiltAnalogSettingsScreen.h"
@@ -464,6 +465,15 @@ void GameSettingsScreen::CreateViews() {
 	networkingSettings->Add(new CheckBox(&g_Config.bEnableAdhocServer, n->T("Enable built-in PRO Adhoc Server", "Enable built-in PRO Adhoc Server")));
 	networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, n->T("Change Mac Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress);
 
+	ViewGroup *toolsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
+	LinearLayout *tools = new LinearLayout(ORIENT_VERTICAL);
+	tools->SetSpacing(0);
+	toolsScroll->Add(tools);
+	tabHolder->AddTab(ms->T("Tools"), toolsScroll);
+
+	tools->Add(new ItemHeader(ms->T("Tools")));
+	tools->Add(new Choice(n->T("Savedata Manager")))->OnClick.Handle(this, &GameSettingsScreen::OnSavedataManager);
+
 	// System
 	ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
 	LinearLayout *systemSettings = new LinearLayout(ORIENT_VERTICAL);
@@ -963,6 +973,12 @@ UI::EventReturn GameSettingsScreen::OnTiltCustomize(UI::EventParams &e){
 	return UI::EVENT_DONE;
 };
 
+UI::EventReturn GameSettingsScreen::OnSavedataManager(UI::EventParams &e) {
+	auto saveData = new SavedataScreen("");
+	screenManager()->push(saveData);
+	return UI::EVENT_DONE;
+}
+
 void DeveloperToolsScreen::CreateViews() {
 	using namespace UI;
 	root_ = new ScrollView(ORIENT_VERTICAL);
diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h
index 6b80c81c4d..2e4f9e65ce 100644
--- a/UI/GameSettingsScreen.h
+++ b/UI/GameSettingsScreen.h
@@ -99,6 +99,8 @@ private:
 	UI::EventReturn OnAdhocGuides(UI::EventParams &e);
 	UI::EventReturn OnAudioBackend(UI::EventParams &e);
 
+	UI::EventReturn OnSavedataManager(UI::EventParams &e);
+
 	// Temporaries to convert bools to int settings
 	bool cap60FPS_;
 	int iAlternateSpeedPercent_;
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 8988fabd60..ad82a910b4 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -794,7 +794,6 @@ void MainScreen::CreateViews() {
 	rightColumnItems->Add(new Choice(m->T("Load","Load...")))->OnClick.Handle(this, &MainScreen::OnLoadFile);
 #endif
 	rightColumnItems->Add(new Choice(m->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings);
-	rightColumnItems->Add(new Choice(m->T("Saved Data")))->OnClick.Handle(this, &MainScreen::OnSavedData);
 	rightColumnItems->Add(new Choice(m->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits);
 	rightColumnItems->Add(new Choice(m->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg);
 #ifndef GOLD
@@ -1029,12 +1028,6 @@ UI::EventReturn MainScreen::OnGameSettings(UI::EventParams &e) {
 	return UI::EVENT_DONE;
 }
 
-UI::EventReturn MainScreen::OnSavedData(UI::EventParams &e) {
-	auto saveData = new SavedataScreen("");
-	screenManager()->push(saveData);
-	return UI::EVENT_DONE;
-}
-
 UI::EventReturn MainScreen::OnRecentChange(UI::EventParams &e) {
 	RecreateViews();
 	if (host) {
@@ -1169,6 +1162,7 @@ UI::EventReturn UmdReplaceScreen::OnGameSettings(UI::EventParams &e) {
 	screenManager()->push(new GameSettingsScreen(""));
 	return UI::EVENT_DONE;
 }
+
 UI::EventReturn UmdReplaceScreen::OnGameSelectedInstant(UI::EventParams &e) {
 	__UmdReplace(e.s);
 	screenManager()->finishDialog(this, DR_OK);
diff --git a/UI/MainScreen.h b/UI/MainScreen.h
index ad772bebff..6ef9018a14 100644
--- a/UI/MainScreen.h
+++ b/UI/MainScreen.h
@@ -84,7 +84,6 @@ private:
 	// Event handlers
 	UI::EventReturn OnLoadFile(UI::EventParams &e);
 	UI::EventReturn OnGameSettings(UI::EventParams &e);
-	UI::EventReturn OnSavedData(UI::EventParams &e);
 	UI::EventReturn OnRecentChange(UI::EventParams &e);
 	UI::EventReturn OnCredits(UI::EventParams &e);
 	UI::EventReturn OnSupport(UI::EventParams &e);