From c1bdd8b0db60beaa6122b5d8a7d4b515a373b2f7 Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Mon, 29 Jul 2013 07:31:19 +0800
Subject: [PATCH 1/6] Assign HW select button on X360 to "SELECT" button

---
 Common/KeyMap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index f8ef4e2807..1250552195 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -68,7 +68,7 @@ struct DefaultKeyMap {
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_DPAD_DOWN)] = CTRL_DOWN;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_DPAD_LEFT)] = CTRL_LEFT;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_START)] = CTRL_START;
-		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BACK)] = CTRL_SELECT;
+		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_SELECT)] = CTRL_SELECT;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_L1)] = CTRL_LTRIGGER;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_R1)] = CTRL_RTRIGGER;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_R2)] = VIRTKEY_UNTHROTTLE;
@@ -94,7 +94,7 @@ struct DefaultKeyMap {
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_DPAD_DOWN)] = CTRL_DOWN;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_DPAD_LEFT)] = CTRL_LEFT;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_START)] = CTRL_START;
-		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BACK)] = CTRL_SELECT;
+		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_SELECT)] = CTRL_SELECT;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_L1)] = CTRL_LTRIGGER;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_R1)] = CTRL_RTRIGGER;
 		m[KeyDef(DEVICE_ID_X360_0, KEYCODE_BUTTON_R2)] = VIRTKEY_UNTHROTTLE;

From bc9ddb6bc6453b215b390ba01371cceaa5940cda Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Mon, 29 Jul 2013 07:41:53 +0800
Subject: [PATCH 2/6] Remove obsolete control in option menu

---
 Windows/ppsspp.rc | Bin 39406 -> 19142 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 652c424c6f6ed1fddc892646debf2cf4a09748aa..02ab020bace6667a6458a2401d815ffd3a487d1f 100644
GIT binary patch
literal 19142
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
Jj(R=B{{b!mUZMa1

literal 39406
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
D5iN(S


From ebeb2e3399d546c227eb9111b8e993c25ae042b4 Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Mon, 29 Jul 2013 07:42:32 +0800
Subject: [PATCH 3/6] Remove obsolete control in option menu #2

---
 Windows/WndMainWindow.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index a56c61e121..0daea113df 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -1010,9 +1010,6 @@ namespace MainWindow
 				g_Config.SSAntiAliasing = !g_Config.SSAntiAliasing;
 				ResizeDisplay(true);
 				break;
-			case ID_OPTIONS_CONTROLS:
-				MessageBox(hWnd, "Control mapping has been moved to the in-window Settings menu.\n", "Sorry", 0);
-				break;
 
 			case ID_EMULATION_SOUND:
 				g_Config.bEnableSound = !g_Config.bEnableSound;

From 9108bf47718ae32be0e5f9f2401c59d165ec55c7 Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Mon, 29 Jul 2013 07:56:11 +0800
Subject: [PATCH 4/6] Rename 360 and Pad to "Xbox 360 Pad" and "DirectInput
 Pad" respectively

---
 Common/KeyMap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 1250552195..1a46b0a0d4 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -180,13 +180,13 @@ struct DefaultKeyMap {
 #ifdef _WIN32
 		ControllerMap x360;
 		x360.keys = default360Map();
-		x360.name = "360";
+		x360.name = "Xbox 360 Pad";
 		m.push_back(x360);
 #endif 
 		// Keyboard and pad maps.
 		ControllerMap pad;
 		pad.keys = defaultPadMap();
-		pad.name = "Pad";
+		pad.name = "DirectInput Pad";
 		pad.active = false;
 		m.push_back(pad);
 #endif

From 89b97436a69e42ac42c1783742912f45a1711436 Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Mon, 29 Jul 2013 08:15:30 +0800
Subject: [PATCH 5/6] Centralize control mapping to in-game control section #1

---
 UI/GameSettingsScreen.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index b404f47084..4ec5fba879 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -254,9 +254,10 @@ void GameSettingsScreen::CreateViews() {
 	tabHolder->AddTab("Controls", controlsSettingsScroll);
 	controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls")));
 	controlsSettings->Add(new CheckBox(&g_Config.bShowAnalogStick, c->T("Show Left Analog Stick")));
-	controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 15, 65, c->T("Button Opacity"), screenManager()));
 	controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)")));
-
+	controlsSettings->Add(new Choice(gs->T("Control Mapping")))->OnClick.Handle(this, &GameSettingsScreen::OnControlMapping);
+	controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 15, 65, c->T("Button Opacity"), screenManager()));
+	
 	// System
 	ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
 	ViewGroup *systemSettings = new LinearLayout(ORIENT_VERTICAL);
@@ -291,11 +292,10 @@ void GlobalSettingsScreen::CreateViews() {
 	LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
 	list->Add(new ItemHeader("General"));
 	list->Add(new CheckBox(&g_Config.bNewUI, gs->T("Enable New UI")));
-	list->Add(new CheckBox(&g_Config.bEnableLogging, gs->T("Enable Logging")));
-	list->Add(new CheckBox(&enableReports_, gs->T("Enable Error Reporting")));
+	list->Add(new CheckBox(&g_Config.bEnableLogging, gs->T("Enable Debug Logging")));
+	list->Add(new CheckBox(&enableReports_, gs->T("Enable Errors Reporting")));
 	list->Add(new CheckBox(&g_Config.bEnableCheats, gs->T("Enable Cheats")));
 	list->Add(new CheckBox(&g_Config.bScreenshotsAsPNG, gs->T("Screenshots as PNG")));
-	list->Add(new Choice(gs->T("Control Mapping")))->OnClick.Handle(this, &GlobalSettingsScreen::OnControlMapping);
 	list->Add(new Choice(gs->T("System Language")))->OnClick.Handle(this, &GlobalSettingsScreen::OnLanguage);
 	list->Add(new Choice(gs->T("Developer Tools")))->OnClick.Handle(this, &GlobalSettingsScreen::OnDeveloperTools);
 	list->Add(new Choice(g->T("Back")))->OnClick.Handle(this, &GlobalSettingsScreen::OnBack);
@@ -316,12 +316,11 @@ UI::EventReturn GlobalSettingsScreen::OnDeveloperTools(UI::EventParams &e) {
 	return UI::EVENT_DONE;
 }
 
-UI::EventReturn GlobalSettingsScreen::OnControlMapping(UI::EventParams &e) {
-	screenManager()->push(new ControlsScreen());
+UI::EventReturn GameSettingsScreen::OnControlMapping(UI::EventParams &e) {
+	screenManager()->push(new KeyMappingScreen());
 	return UI::EVENT_DONE;
 }
 
-
 UI::EventReturn GlobalSettingsScreen::OnBack(UI::EventParams &e) {
 	screenManager()->finishDialog(this, DR_OK);
 	g_Config.sReportHost = enableReports_ ? "report.ppsspp.org" : "";

From d88f4dfe099223753bab6c2c776f1a1546e9c3ee Mon Sep 17 00:00:00 2001
From: raven02 <jacky.kktsui@yahoo.com.hk>
Date: Mon, 29 Jul 2013 08:16:06 +0800
Subject: [PATCH 6/6] Centralize control mapping to in-game control section #2

---
 UI/GameSettingsScreen.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h
index e49469700e..a3ebef1121 100644
--- a/UI/GameSettingsScreen.h
+++ b/UI/GameSettingsScreen.h
@@ -40,6 +40,7 @@ private:
 
 	// Event handlers
 	UI::EventReturn OnDownloadPlugin(UI::EventParams &e);
+	UI::EventReturn OnControlMapping(UI::EventParams &e);
 
 	// Temporaries to convert bools to int settings
 	bool cap60FPS_;
@@ -59,7 +60,6 @@ private:
 	UI::EventReturn OnFactoryReset(UI::EventParams &e);
 	UI::EventReturn OnBack(UI::EventParams &e);
 	UI::EventReturn OnDeveloperTools(UI::EventParams &e);
-	UI::EventReturn OnControlMapping(UI::EventParams &e);
 
 	// Temporaries to convert bools to other kinds of settings
 	bool enableReports_;
@@ -75,4 +75,4 @@ protected:
 private:
 	UI::EventReturn OnBack(UI::EventParams &e);
 	UI::EventReturn OnRunCPUTests(UI::EventParams &e);
-};
\ No newline at end of file
+};