From 7abbdf89af075136ca6a14015d9b6dbe964bd631 Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Sun, 10 Mar 2024 18:45:22 +0700 Subject: [PATCH] OSD: Add Memcard Icon in more places --- pcsx2/ImGui/FullscreenUI.cpp | 2 +- pcsx2/ImGui/ImGuiManager.cpp | 2 +- pcsx2/ImGui/ImGuiOverlays.cpp | 2 +- pcsx2/Patch.cpp | 2 +- pcsx2/SIO/Memcard/MemoryCardFile.cpp | 4 ++-- pcsx2/SIO/Memcard/MemoryCardFolder.cpp | 4 ++-- pcsx2/SIO/Sio.cpp | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index fd9b7aacdf..16e7d4ecdf 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -5928,7 +5928,7 @@ void FullscreenUI::DrawGameListSettingsPage(const ImVec2& heading_size) {it.second ? (FSUI_ICONSTR(ICON_FA_FOLDER_MINUS, "Disable Subdirectory Scanning")) : (FSUI_ICONSTR(ICON_FA_FOLDER_PLUS, "Enable Subdirectory Scanning")), false}, - {FSUI_ICONSTR(ICON_FA_TIMES, "Remove From List"), false}, + {FSUI_ICONSTR(ICON_FA_TRASH, "Remove From List"), false}, {FSUI_ICONSTR(ICON_FA_WINDOW_CLOSE, "Close Menu"), false}, }; diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index 78b8f0840b..34a8a1651c 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -488,7 +488,7 @@ ImFont* ImGuiManager::AddFixedFont(float size) bool ImGuiManager::AddIconFonts(float size) { // clang-format off - static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf021,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02b,0xf02b,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04b,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf06e,0xf06e,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf084,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c8,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf11b,0xf11c,0xf121,0xf121,0xf129,0xf12a,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1b3,0xf1b3,0xf1c9,0xf1c9,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf21e,0xf21e,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2bd,0xf2bd,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f1,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf462,0xf462,0xf466,0xf466,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf547,0xf547,0xf54c,0xf54c,0xf552,0xf553,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf7c2,0xf7c2,0xf815,0xf815,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; + static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf021,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02b,0xf02b,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04b,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf06e,0xf06e,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf084,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c8,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf11b,0xf11c,0xf121,0xf121,0xf129,0xf12a,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1b3,0xf1b3,0xf1c9,0xf1c9,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf21e,0xf21e,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2bd,0xf2bd,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f1,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf462,0xf462,0xf466,0xf466,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf547,0xf547,0xf54c,0xf54c,0xf552,0xf553,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf815,0xf815,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x235e,0x2360,0x2361,0x2364,0x2367,0x237a,0x237b,0x237d,0x237d,0x237f,0x2380,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24fd,0x24ff,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; // clang-format on diff --git a/pcsx2/ImGui/ImGuiOverlays.cpp b/pcsx2/ImGui/ImGuiOverlays.cpp index 4303d98204..30bb721678 100644 --- a/pcsx2/ImGui/ImGuiOverlays.cpp +++ b/pcsx2/ImGui/ImGuiOverlays.cpp @@ -728,7 +728,7 @@ void SaveStateSelectorUI::Open(float open_time /* = DEFAULT_OPEN_TIME */) const std::string serial = VMManager::GetDiscSerial(); if (serial.empty()) { - Host::AddIconOSDMessage("SaveStateSelectorUIUnavailable", ICON_FA_SD_CARD, + Host::AddIconOSDMessage("SaveStateSelectorUIUnavailable", ICON_PF_MEMORY_CARD, TRANSLATE_SV("ImGuiOverlays", "Save state selector is unavailable without a valid game serial.")); return; } diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index 7d410a1fdd..4d9d00257d 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -338,7 +338,7 @@ bool Patch::OpenPatchesZip() static bool warning_shown = false; if (!warning_shown) { - Host::AddIconOSDMessage("PatchesZipOpenWarning", ICON_FA_MICROCHIP, + Host::AddIconOSDMessage("PatchesZipOpenWarning", ICON_FA_BAND_AID, fmt::format(TRANSLATE_FS("Patch", "Failed to open {}. Built-in game patches are not available."), PATCHES_ZIP_NAME), Host::OSD_ERROR_DURATION); diff --git a/pcsx2/SIO/Memcard/MemoryCardFile.cpp b/pcsx2/SIO/Memcard/MemoryCardFile.cpp index c8164d6f41..0366bcd42d 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFile.cpp +++ b/pcsx2/SIO/Memcard/MemoryCardFile.cpp @@ -17,7 +17,7 @@ #include "Config.h" #include "Host.h" -#include "IconsFontAwesome5.h" +#include "IconsPromptFont.h" #include "svnrev.h" @@ -509,7 +509,7 @@ s32 FileMemoryCard::Save(uint slot, const u8* src, u32 adr, int size) std::chrono::duration elapsed = std::chrono::system_clock::now() - last; if (elapsed > std::chrono::seconds(5)) { - Host::AddIconOSDMessage(fmt::format("MemoryCardSave{}", slot), ICON_FA_SD_CARD, + Host::AddIconOSDMessage(fmt::format("MemoryCardSave{}", slot), ICON_PF_MEMORY_CARD, fmt::format(TRANSLATE_FS("MemoryCard", "Memory Card '{}' was saved to storage."), Path::GetFileName(m_filenames[slot])), Host::OSD_INFO_DURATION); diff --git a/pcsx2/SIO/Memcard/MemoryCardFolder.cpp b/pcsx2/SIO/Memcard/MemoryCardFolder.cpp index 93f272b61d..fff1c5e8ee 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFolder.cpp +++ b/pcsx2/SIO/Memcard/MemoryCardFolder.cpp @@ -9,7 +9,7 @@ #include "Config.h" #include "Host.h" -#include "IconsFontAwesome5.h" +#include "IconsPromptFont.h" #include "common/Console.h" #include "common/FileSystem.h" @@ -2342,7 +2342,7 @@ s32 FolderMemoryCardAggregator::Save(uint slot, const u8* src, u32 adr, int size if (elapsed > std::chrono::seconds(5)) { const std::string_view filename = Path::GetFileName(m_cards[slot].GetFolderName()); - Host::AddIconOSDMessage(fmt::format("MemoryCardSave{}", slot), ICON_FA_SD_CARD, + Host::AddIconOSDMessage(fmt::format("MemoryCardSave{}", slot), ICON_PF_MEMORY_CARD, fmt::format(TRANSLATE_FS("MemoryCard", "Memory Card '{}' was saved to storage."), filename), Host::OSD_INFO_DURATION); diff --git a/pcsx2/SIO/Sio.cpp b/pcsx2/SIO/Sio.cpp index c1bfc3f32f..0cebe6ca8c 100644 --- a/pcsx2/SIO/Sio.cpp +++ b/pcsx2/SIO/Sio.cpp @@ -7,7 +7,7 @@ #include "SIO/Memcard/MemoryCardProtocol.h" #include "Host.h" -#include "IconsFontAwesome5.h" +#include "IconsPromptFont.h" #include @@ -79,7 +79,7 @@ void AutoEject::CountDownTicks() if (reinserted) { - Host::AddIconOSDMessage("AutoEjectAllSet", ICON_FA_SD_CARD, + Host::AddIconOSDMessage("AutoEjectAllSet", ICON_PF_MEMORY_CARD, TRANSLATE_SV("MemoryCard", "Memory Cards reinserted."), Host::OSD_INFO_DURATION); } } @@ -100,7 +100,7 @@ void AutoEject::Clear(size_t port, size_t slot) void AutoEject::SetAll() { - Host::AddIconOSDMessage("AutoEjectAllSet", ICON_FA_SD_CARD, + Host::AddIconOSDMessage("AutoEjectAllSet", ICON_PF_MEMORY_CARD, TRANSLATE_SV("MemoryCard", "Force ejecting all Memory Cards. Reinserting in 1 second."), Host::OSD_INFO_DURATION); for (size_t port = 0; port < SIO::PORTS; port++)