Add a top banner to each settings page, that shows the game (if game-specific) and a help link

Author: hrydgard

UI/EmuScreen.cpp

@@ -505,7 +505,8 @@ void EmuScreen::focusChanged(ScreenFocusChange focusChange) {
 void EmuScreen::sendMessage(UIMessage message, const char *value) {
 	// External commands, like from the Windows UI.
 	if (message == UIMessage::REQUEST_GAME_PAUSE && screenManager()->topScreen() == this) {
-		screenManager()->push(new GamePauseScreen(gamePath_));
+		std::string gameID = g_paramSFO.GetValueString("DISC_ID");
+		screenManager()->push(new GamePauseScreen(gamePath_, gameID));
 	} else if (message == UIMessage::REQUEST_GAME_STOP) {
 		// We will push MainScreen in update().
 		PSP_Shutdown();
@@ -587,8 +588,8 @@ void EmuScreen::sendMessage(UIMessage message, const char *value) {
 			if (!KeyMap::IsKeyMapped(DEVICE_ID_PAD_0, VIRTKEY_PAUSE) || !KeyMap::IsKeyMapped(DEVICE_ID_PAD_1, VIRTKEY_PAUSE)) {
 				// If it's a TV (so no built-in back button), and there's no back button mapped to a pad,
 				// use this as the fallback way to get into the menu.
-
-				screenManager()->push(new GamePauseScreen(gamePath_));
+				std::string gameID = g_paramSFO.GetValueString("DISC_ID");
+				screenManager()->push(new GamePauseScreen(gamePath_, gameID));
 			}
 		}
 	} else if (message == UIMessage::REQUEST_PLAY_SOUND) {
@@ -1215,7 +1216,8 @@ void EmuScreen::update() {
 
 	if (pauseTrigger_) {
 		pauseTrigger_ = false;
-		screenManager()->push(new GamePauseScreen(gamePath_));
+		std::string gameID = g_paramSFO.GetValueString("DISC_ID");
+		screenManager()->push(new GamePauseScreen(gamePath_, gameID));
 	}
 
 	if (saveStatePreview_ && !bootPending_) {

UI/GameSettingsScreen.cpp

@@ -229,32 +229,67 @@ void GameSettingsScreen::PreCreateViews() {
 	iAlternateSpeedPercentAnalog_ = (g_Config.iAnalogFpsLimit * 100) / 60;
 }
 
+void GameSettingsScreen::CreateBanner(UI::LinearLayout *parent, const char *category, const char *url) {
+	using namespace UI;
+	auto ms = GetI18NCategory(I18NCat::MAINSETTINGS);
+
+	LinearLayout *banner = new LinearLayout(ORIENT_HORIZONTAL);
+	std::string title = category;
+	bool hasGameConfig = false;
+	if (g_Config.hasGameConfig(gameID_)) {
+		auto info = g_gameInfoCache->GetInfo(nullptr, gamePath_, 0);
+		title = info->GetTitle() + " - " + gameID_;
+		hasGameConfig = true;
+	}
+	if (hasGameConfig) {
+		banner->Add(new ImageView(ImageID("I_GEAR"), "", UI::ImageSizeMode::IS_KEEP_ASPECT, new LinearLayoutParams(50, 50, 0.0f, G_CENTER)));
+	}
+	banner->Add(new TextView(title, new LinearLayoutParams(Margins(10, 10))));
+	banner->Add(new Spacer(0.0f, new LinearLayoutParams(1.0f)));
+	if (strlen(url)) {
+		banner->Add(new Button(ms->T("Help"), new LinearLayoutParams(Margins(8, 8))))->OnClick.Add([=](UI::EventParams &e) {
+			std::string fullUrl = StringFromFormat("https://www.ppsspp.org/docs/settings/%s", url);
+			System_LaunchUrl(LaunchUrlType::BROWSER_URL, fullUrl.c_str());
+			return UI::EVENT_DONE;
+		});
+	}
+	banner->SetBG(UI::Drawable(0x30000000));
+	parent->Add(banner);
+}
+
 void GameSettingsScreen::CreateTabs() {
 	using namespace UI;
 	auto ms = GetI18NCategory(I18NCat::MAINSETTINGS);
 
 	LinearLayout *graphicsSettings = AddTab("GameSettingsGraphics", ms->T("Graphics"));
+	CreateBanner(graphicsSettings, ms->T("Graphics"), "graphics");
 	CreateGraphicsSettings(graphicsSettings);
 
 	LinearLayout *controlsSettings = AddTab("GameSettingsControls", ms->T("Controls"));
+	CreateBanner(controlsSettings, ms->T("Controls"), "controls");
 	CreateControlsSettings(controlsSettings);
 
 	LinearLayout *audioSettings = AddTab("GameSettingsAudio", ms->T("Audio"));
+	CreateBanner(audioSettings, ms->T("Audio"), "audio");
 	CreateAudioSettings(audioSettings);
 
 	LinearLayout *networkingSettings = AddTab("GameSettingsNetworking", ms->T("Networking"));
+	CreateBanner(networkingSettings, ms->T("Networking"), "network");
 	CreateNetworkingSettings(networkingSettings);
 
-	LinearLayout *tools = AddTab("GameSettingsTools", ms->T("Tools"));
-	CreateToolsSettings(tools);
+	LinearLayout *toolsSettings = AddTab("GameSettingsTools", ms->T("Tools"));
+	CreateBanner(toolsSettings, ms->T("Tools"), "tools");
+	CreateToolsSettings(toolsSettings);
 
 	LinearLayout *systemSettings = AddTab("GameSettingsSystem", ms->T("System"));
 	systemSettings->SetSpacing(0);
+	CreateBanner(systemSettings, ms->T("System"), "system");
 	CreateSystemSettings(systemSettings);
 
 	int deviceType = System_GetPropertyInt(SYSPROP_DEVICE_TYPE);
 	if (deviceType == DEVICE_TYPE_VR) {
-		LinearLayout *vrSettings = AddTab("GameSettingsVR", ms->T("VR"));
+		LinearLayout *vrSettings = AddTab("GameSettingsVR", ms->T("VR"), "");
+		CreateBanner(vrSettings, ms->T("VR"), "");
 		CreateVRSettings(vrSettings);
 	}
 }

UI/GameSettingsScreen.h

@@ -47,6 +47,7 @@ class GameSettingsScreen : public TabbedUIDialogScreenWithGameBackground {
 
 private:
 	void PreCreateViews() override;
+	void CreateBanner(UI::LinearLayout *parent, const char *category, const char *url);
 
 	void CreateGraphicsSettings(UI::ViewGroup *graphicsSettings);
 	void CreateControlsSettings(UI::ViewGroup *tools);

UI/PauseScreen.cpp

@@ -264,8 +264,8 @@ void GamePauseScreen::update() {
 	SetVRAppMode(VRAppMode::VR_MENU_MODE);
 }
 
-GamePauseScreen::GamePauseScreen(const Path &filename)
-	: UIDialogScreenWithGameBackground(filename) {
+GamePauseScreen::GamePauseScreen(const Path &filename, std::string gameID)
+	: UIDialogScreenWithGameBackground(filename), gameID_(gameID) {
 	// So we can tell if something blew up while on the pause screen.
 	std::string assertStr = "PauseScreen: " + filename.GetFilename();
 	SetExtraAssertInfo(assertStr.c_str());
@@ -454,7 +454,7 @@ void GamePauseScreen::CreateViews() {
 }
 
 UI::EventReturn GamePauseScreen::OnGameSettings(UI::EventParams &e) {
-	screenManager()->push(new GameSettingsScreen(gamePath_));
+	screenManager()->push(new GameSettingsScreen(gamePath_, gameID_));
 	return UI::EVENT_DONE;
 }
 

UI/PauseScreen.h

@@ -32,7 +32,7 @@ enum class PauseScreenMode {
 
 class GamePauseScreen : public UIDialogScreenWithGameBackground {
 public:
-	GamePauseScreen(const Path &filename);
+	GamePauseScreen(const Path &filename, std::string gameID);
 	~GamePauseScreen();
 
 	void dialogFinished(const Screen *dialog, DialogResult dr) override;
@@ -68,4 +68,5 @@ class GamePauseScreen : public UIDialogScreenWithGameBackground {
 	PauseScreenMode mode_ = PauseScreenMode::MAIN;
 
 	UI::Button *playButton_ = nullptr;
+	std::string gameID_;
 };