Implement on-screen touch combo keys.

Replace A,B,cross1,square1,triangle1 with number images 1-6

Rebuild the atlas, update the code to use combo keys 1-5

Also add psp_display.png from pull request #8082.

UI/GameSettingsScreen.cpp

@@ -38,6 +38,7 @@
 #include "UI/TouchControlVisibilityScreen.h"
 #include "UI/TiltAnalogSettingsScreen.h"
 #include "UI/TiltEventProcessor.h"
+#include "UI/ComboKeyMappingScreen.h"
 
 #include "Common/KeyMap.h"
 #include "Common/FileUtil.h"
@@ -403,6 +404,11 @@ void GameSettingsScreen::CreateViews() {
 		CheckBox *floatingAnalog = controlsSettings->Add(new CheckBox(&g_Config.bAutoCenterTouchAnalog, co->T("Auto-centering analog stick")));
 		floatingAnalog->SetEnabledPtr(&g_Config.bShowTouchControls);
 
+		// Combo key setup
+		Choice *comboKey = controlsSettings->Add(new Choice(co->T("Combo Key Setup")));
+		comboKey->OnClick.Handle(this, &GameSettingsScreen::OnCombo_key);
+		comboKey->SetEnabledPtr(&g_Config.bShowTouchControls);
+
 		// On systems that aren't Symbian, iOS, and Maemo, offer to let the user see this button.
 		// Some Windows touch devices don't have a back button or other button to call up the menu.
 #if !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MAEMO)
@@ -915,6 +921,11 @@ UI::EventReturn GameSettingsScreen::OnChangeMacAddress(UI::EventParams &e) {
 	return UI::EVENT_DONE;
 }
 
+UI::EventReturn GameSettingsScreen::OnCombo_key(UI::EventParams &e) {
+	screenManager()->push(new Combo_keyScreen(&g_Config.iComboMode));
+	return UI::EVENT_DONE;
+}
+
 UI::EventReturn GameSettingsScreen::OnLanguage(UI::EventParams &e) {
 	I18NCategory *dev = GetI18NCategory("Developer");
 	auto langScreen = new NewLanguageScreen(dev->T("Language"));