From 2fd89403f84b7ba0d5f44a973e123f518d8fd4aa Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 14 Jan 2025 19:05:17 +1000 Subject: [PATCH] FullscreenUI: Name landing icon files after action --- .../fullscreenui/{media-cdrom.png => cdrom.png} | Bin .../{address-book-new.png => game-list.png} | Bin .../{multimedia-player.png => psf-file.png} | Bin .../{applications-system.png => settings.png} | Bin .../{drive-cdrom.png => start-disc.png} | Bin src/core/fullscreen_ui.cpp | 16 ++++++++-------- 6 files changed, 8 insertions(+), 8 deletions(-) rename data/resources/fullscreenui/{media-cdrom.png => cdrom.png} (100%) rename data/resources/fullscreenui/{address-book-new.png => game-list.png} (100%) rename data/resources/fullscreenui/{multimedia-player.png => psf-file.png} (100%) rename data/resources/fullscreenui/{applications-system.png => settings.png} (100%) rename data/resources/fullscreenui/{drive-cdrom.png => start-disc.png} (100%) diff --git a/data/resources/fullscreenui/media-cdrom.png b/data/resources/fullscreenui/cdrom.png similarity index 100% rename from data/resources/fullscreenui/media-cdrom.png rename to data/resources/fullscreenui/cdrom.png diff --git a/data/resources/fullscreenui/address-book-new.png b/data/resources/fullscreenui/game-list.png similarity index 100% rename from data/resources/fullscreenui/address-book-new.png rename to data/resources/fullscreenui/game-list.png diff --git a/data/resources/fullscreenui/multimedia-player.png b/data/resources/fullscreenui/psf-file.png similarity index 100% rename from data/resources/fullscreenui/multimedia-player.png rename to data/resources/fullscreenui/psf-file.png diff --git a/data/resources/fullscreenui/applications-system.png b/data/resources/fullscreenui/settings.png similarity index 100% rename from data/resources/fullscreenui/applications-system.png rename to data/resources/fullscreenui/settings.png diff --git a/data/resources/fullscreenui/drive-cdrom.png b/data/resources/fullscreenui/start-disc.png similarity index 100% rename from data/resources/fullscreenui/drive-cdrom.png rename to data/resources/fullscreenui/start-disc.png diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index 5a13f6fa8..e2a481e76 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -1046,10 +1046,10 @@ void FullscreenUI::ReturnToMainWindow() bool FullscreenUI::LoadResources() { s_state.app_icon_texture = LoadTexture("images/duck.png"); - s_state.fallback_disc_texture = LoadTexture("fullscreenui/media-cdrom.png"); - s_state.fallback_exe_texture = LoadTexture("fullscreenui/applications-system.png"); - s_state.fallback_psf_texture = LoadTexture("fullscreenui/multimedia-player.png"); - s_state.fallback_playlist_texture = LoadTexture("fullscreenui/address-book-new.png"); + s_state.fallback_disc_texture = LoadTexture("fullscreenui/cdrom.png"); + s_state.fallback_exe_texture = LoadTexture("fullscreenui/settings.png"); + s_state.fallback_psf_texture = LoadTexture("fullscreenui/psf-file.png"); + s_state.fallback_playlist_texture = LoadTexture("fullscreenui/game-list.png"); return true; } @@ -1705,21 +1705,21 @@ void FullscreenUI::DrawLandingWindow() { ResetFocusHere(); - if (HorizontalMenuItem(GetCachedTexture("fullscreenui/address-book-new.png"), FSUI_CSTR("Game List"), + if (HorizontalMenuItem(GetCachedTexture("fullscreenui/game-list.png"), FSUI_CSTR("Game List"), FSUI_CSTR("Launch a game from images scanned from your game directories."))) { SwitchToGameList(); } if (HorizontalMenuItem( - GetCachedTexture("fullscreenui/media-cdrom.png"), FSUI_CSTR("Start Game"), + GetCachedTexture("fullscreenui/cdrom.png"), FSUI_CSTR("Start Game"), FSUI_CSTR("Launch a game from a file, disc, or starts the console without any disc inserted."))) { s_state.current_main_window = MainWindowType::StartGame; QueueResetFocus(FocusResetType::ViewChanged); } - if (HorizontalMenuItem(GetCachedTexture("fullscreenui/applications-system.png"), FSUI_CSTR("Settings"), + if (HorizontalMenuItem(GetCachedTexture("fullscreenui/settings.png"), FSUI_CSTR("Settings"), FSUI_CSTR("Changes settings for the application."))) { SwitchToSettings(); @@ -1784,7 +1784,7 @@ void FullscreenUI::DrawStartGameWindow() DoStartFile(); } - if (HorizontalMenuItem(GetCachedTexture("fullscreenui/drive-cdrom.png"), FSUI_CSTR("Start Disc"), + if (HorizontalMenuItem(GetCachedTexture("fullscreenui/start-disc.png"), FSUI_CSTR("Start Disc"), FSUI_CSTR("Start a game from a disc in your PC's DVD drive."))) { DoStartDisc();