github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-07-01 15:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Change a few icons for improved consistency (#3463)

Browse Source
This commit is contained in:
Davide Pesavento 2025-06-27 03:07:24 -04:00 committed by GitHub
parent 281119b812
commit 280c0036eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/core/fullscreen_ui.cpp
View File

@ -4079,7 +4079,7 @@ void FullscreenUI::DrawSummarySettingsPage()
CopyTextToClipboard(FSUI_STR("Game type copied to clipboard."), CopyTextToClipboard(FSUI_STR("Game type copied to clipboard."),
GameList::GetEntryTypeDisplayName(s_state.game_settings_entry->type)); GameList::GetEntryTypeDisplayName(s_state.game_settings_entry->type));
} }
if (MenuButton(FSUI_ICONVSTR(ICON_FA_BOX, "Region"), if (MenuButton(FSUI_ICONVSTR(ICON_FA_GLOBE, "Region"),
Settings::GetDiscRegionDisplayName(s_state.game_settings_entry->region), true)) Settings::GetDiscRegionDisplayName(s_state.game_settings_entry->region), true))
{ {
CopyTextToClipboard(FSUI_STR("Game region copied to clipboard."), CopyTextToClipboard(FSUI_STR("Game region copied to clipboard."),
@ -4096,7 +4096,7 @@ void FullscreenUI::DrawSummarySettingsPage()
s_state.game_settings_entry->dbentry ? s_state.game_settings_entry->dbentry->compatibility : s_state.game_settings_entry->dbentry ? s_state.game_settings_entry->dbentry->compatibility :
GameDatabase::CompatibilityRating::Unknown)); GameDatabase::CompatibilityRating::Unknown));
} }
if (MenuButton(FSUI_ICONVSTR(ICON_FA_FOLDER_OPEN, "Path"), s_state.game_settings_entry->path.c_str(), true)) if (MenuButton(FSUI_ICONVSTR(ICON_FA_FILE, "Path"), s_state.game_settings_entry->path.c_str(), true))
{ {
CopyTextToClipboard(FSUI_STR("Game path copied to clipboard."), s_state.game_settings_entry->path); CopyTextToClipboard(FSUI_STR("Game path copied to clipboard."), s_state.game_settings_entry->path);
} }
@ -4286,14 +4286,14 @@ void FullscreenUI::DrawInterfaceSettingsPage()
FSUI_VSTR("Determines the margin between the edge of the screen and on-screen messages."), FSUI_VSTR("Determines the margin between the edge of the screen and on-screen messages."),
"Display", "OSDMargin", ImGuiManager::DEFAULT_SCREEN_MARGIN, 0.0f, 100.0f, 1.0f, 1.0f, "Display", "OSDMargin", ImGuiManager::DEFAULT_SCREEN_MARGIN, 0.0f, 100.0f, 1.0f, 1.0f,
"%.0fpx"); "%.0fpx");
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_LIST, "Show OSD Messages"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_CIRCLE_EXCLAMATION, "Show OSD Messages"),
FSUI_VSTR("Shows on-screen-display messages when events occur."), "Display", "ShowOSDMessages", FSUI_VSTR("Shows on-screen-display messages when events occur."), "Display", "ShowOSDMessages",
true); true);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_PLAY, "Show Status Indicators"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_PLAY, "Show Status Indicators"),
FSUI_VSTR("Shows persistent icons when turbo is active or when paused."), "Display", FSUI_VSTR("Shows persistent icons when turbo is active or when paused."), "Display",
"ShowStatusIndicators", true); "ShowStatusIndicators", true);
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_SIGNAL, "Show Speed"), bsi, FSUI_ICONVSTR(ICON_FA_GAUGE_HIGH, "Show Speed"),
FSUI_VSTR( FSUI_VSTR(
"Shows the current emulation speed of the system in the top-right corner of the display as a percentage."), "Shows the current emulation speed of the system in the top-right corner of the display as a percentage."),
"Display", "ShowSpeed", false); "Display", "ShowSpeed", false);
@ -4302,11 +4302,11 @@ void FullscreenUI::DrawInterfaceSettingsPage()
FSUI_VSTR("Shows the number of frames (or v-syncs) displayed per second by the system in the top-right " FSUI_VSTR("Shows the number of frames (or v-syncs) displayed per second by the system in the top-right "
"corner of the display."), "corner of the display."),
"Display", "ShowFPS", false); "Display", "ShowFPS", false);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_BARS, "Show GPU Statistics"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_CHART_BAR, "Show GPU Statistics"),
FSUI_VSTR("Shows information about the emulated GPU in the top-right corner of the display."), FSUI_VSTR("Shows information about the emulated GPU in the top-right corner of the display."),
"Display", "ShowGPUStatistics", false); "Display", "ShowGPUStatistics", false);
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_GEAR, "Show Latency Statistics"), bsi, FSUI_ICONVSTR(ICON_FA_USER_CLOCK, "Show Latency Statistics"),
FSUI_VSTR("Shows information about input and audio latency in the top-right corner of the display."), "Display", FSUI_VSTR("Shows information about input and audio latency in the top-right corner of the display."), "Display",
"ShowLatencyStatistics", false); "ShowLatencyStatistics", false);
DrawToggleSetting( DrawToggleSetting(
@ -4320,7 +4320,7 @@ void FullscreenUI::DrawInterfaceSettingsPage()
FSUI_VSTR("Shows a visual history of frame times in the upper-left corner of the display."), FSUI_VSTR("Shows a visual history of frame times in the upper-left corner of the display."),
"Display", "ShowFrameTimes", false); "Display", "ShowFrameTimes", false);
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_RULER_VERTICAL, "Show Resolution"), bsi, FSUI_ICONVSTR(ICON_FA_EXPAND, "Show Resolution"),
FSUI_VSTR("Shows the current rendering resolution of the system in the top-right corner of the display."), FSUI_VSTR("Shows the current rendering resolution of the system in the top-right corner of the display."),
"Display", "ShowResolution", false); "Display", "ShowResolution", false);
DrawToggleSetting( DrawToggleSetting(
@ -4458,7 +4458,7 @@ void FullscreenUI::DrawConsoleSettingsPage()
"ForceVideoTiming", Settings::DEFAULT_FORCE_VIDEO_TIMING_MODE, &Settings::ParseForceVideoTimingName, "ForceVideoTiming", Settings::DEFAULT_FORCE_VIDEO_TIMING_MODE, &Settings::ParseForceVideoTimingName,
&Settings::GetForceVideoTimingName, &Settings::GetForceVideoTimingDisplayName, &Settings::GetForceVideoTimingName, &Settings::GetForceVideoTimingDisplayName,
ForceVideoTimingMode::Count); ForceVideoTimingMode::Count);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_WAND_MAGIC_SPARKLES, "Safe Mode"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_SHIELD_HALVED, "Safe Mode"),
FSUI_VSTR("Temporarily disables all enhancements, useful when testing."), "Main", FSUI_VSTR("Temporarily disables all enhancements, useful when testing."), "Main",
"DisableAllEnhancements", false); "DisableAllEnhancements", false);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_BOLT, "Enable Fast Boot"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_BOLT, "Enable Fast Boot"),
@ -4630,7 +4630,7 @@ void FullscreenUI::DrawEmulationSettingsPage()
if (pre_frame_sleep_active) if (pre_frame_sleep_active)
{ {
DrawFloatRangeSetting( DrawFloatRangeSetting(
bsi, FSUI_ICONVSTR(ICON_FA_BATTERY_FULL, "Frame Time Buffer"), bsi, FSUI_ICONVSTR(ICON_FA_HOURGLASS, "Frame Time Buffer"),
FSUI_VSTR("Specifies the amount of buffer time added, which reduces the additional sleep time introduced."), FSUI_VSTR("Specifies the amount of buffer time added, which reduces the additional sleep time introduced."),
"Display", "PreFrameSleepBuffer", Settings::DEFAULT_DISPLAY_PRE_FRAME_SLEEP_BUFFER, 0.0f, 20.0f, "Display", "PreFrameSleepBuffer", Settings::DEFAULT_DISPLAY_PRE_FRAME_SLEEP_BUFFER, 0.0f, 20.0f,
FSUI_CSTR("%.1f ms"), 1.0f, pre_frame_sleep_active); FSUI_CSTR("%.1f ms"), 1.0f, pre_frame_sleep_active);
@ -4816,7 +4816,7 @@ void FullscreenUI::DrawControllerSettingsPage()
if (IsEditingGameSettings(bsi)) if (IsEditingGameSettings(bsi))
{ {
if (DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_GEAR, "Per-Game Configuration"), if (DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_GEARS, "Per-Game Configuration"),
FSUI_VSTR("Uses game-specific settings for controllers for this game."), "ControllerPorts", FSUI_VSTR("Uses game-specific settings for controllers for this game."), "ControllerPorts",
"UseGameSettingsForController", false, IsEditingGameSettings(bsi), false)) "UseGameSettingsForController", false, IsEditingGameSettings(bsi), false))
{ {
@ -5226,14 +5226,14 @@ void FullscreenUI::DrawMemoryCardSettingsPage()
DrawFolderSetting(bsi, FSUI_ICONVSTR(ICON_FA_FOLDER_OPEN, "Memory Card Directory"), "MemoryCards", "Directory", DrawFolderSetting(bsi, FSUI_ICONVSTR(ICON_FA_FOLDER_OPEN, "Memory Card Directory"), "MemoryCards", "Directory",
EmuFolders::MemoryCards); EmuFolders::MemoryCards);
if (!game_settings && MenuButton(FSUI_ICONVSTR(ICON_FA_WAND_MAGIC_SPARKLES, "Reset Memory Card Directory"), if (!game_settings && MenuButton(FSUI_ICONVSTR(ICON_FA_ARROW_ROTATE_LEFT, "Reset Memory Card Directory"),
FSUI_VSTR("Resets memory card directory to default (user directory)."))) FSUI_VSTR("Resets memory card directory to default (user directory).")))
{ {
bsi->SetStringValue("MemoryCards", "Directory", "memcards"); bsi->SetStringValue("MemoryCards", "Directory", "memcards");
SetSettingsChanged(bsi); SetSettingsChanged(bsi);
} }
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_MAGNIFYING_GLASS, "Use Single Card For Multi-Disc Games"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_SHARE_NODES, "Use Single Card For Multi-Disc Games"),
FSUI_VSTR("When playing a multi-disc game and using per-game (title) memory cards, " FSUI_VSTR("When playing a multi-disc game and using per-game (title) memory cards, "
"use a single memory card for all discs."), "use a single memory card for all discs."),
"MemoryCards", "UsePlaylistTitle", true); "MemoryCards", "UsePlaylistTitle", true);
@ -5360,7 +5360,7 @@ void FullscreenUI::DrawGraphicsSettingsPage()
bsi->GetOptionalSmallStringValue("GPU", "Adapter", game_settings ? std::nullopt : std::optional<const char*>("")); bsi->GetOptionalSmallStringValue("GPU", "Adapter", game_settings ? std::nullopt : std::optional<const char*>(""));
if (MenuButtonWithValue( if (MenuButtonWithValue(
FSUI_ICONVSTR(ICON_FA_MICROCHIP, "GPU Adapter"), FSUI_VSTR("Selects the GPU to use for rendering."), FSUI_ICONVSTR(ICON_PF_GPU_GRAPHICS_CARD, "GPU Adapter"), FSUI_VSTR("Selects the GPU to use for rendering."),
current_adapter.has_value() ? (current_adapter->empty() ? FSUI_VSTR("Default") : current_adapter->view()) : current_adapter.has_value() ? (current_adapter->empty() ? FSUI_VSTR("Default") : current_adapter->view()) :
FSUI_VSTR("Use Global Setting"))) FSUI_VSTR("Use Global Setting")))
{ {
@ -5394,7 +5394,8 @@ void FullscreenUI::DrawGraphicsSettingsPage()
bsi->SetStringValue("GPU", "Adapter", value); bsi->SetStringValue("GPU", "Adapter", value);
SetSettingsChanged(bsi); SetSettingsChanged(bsi);
}; };
OpenChoiceDialog(FSUI_ICONVSTR(ICON_FA_MICROCHIP, "GPU Adapter"), false, std::move(options), std::move(callback)); OpenChoiceDialog(FSUI_ICONVSTR(ICON_PF_GPU_GRAPHICS_CARD, "GPU Adapter"), false,
std::move(options), std::move(callback));
} }
const bool pgxp_enabled = (is_hardware && GetEffectiveBoolSetting(bsi, "GPU", "PGXPEnable", false)); const bool pgxp_enabled = (is_hardware && GetEffectiveBoolSetting(bsi, "GPU", "PGXPEnable", false));
@ -5471,7 +5472,7 @@ void FullscreenUI::DrawGraphicsSettingsPage()
"Display", "Scaling", Settings::DEFAULT_DISPLAY_SCALING, &Settings::ParseDisplayScaling, "Display", "Scaling", Settings::DEFAULT_DISPLAY_SCALING, &Settings::ParseDisplayScaling,
&Settings::GetDisplayScalingName, &Settings::GetDisplayScalingDisplayName, DisplayScalingMode::Count); &Settings::GetDisplayScalingName, &Settings::GetDisplayScalingDisplayName, DisplayScalingMode::Count);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_ARROW_RIGHT_ARROW_LEFT, "Widescreen Rendering"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_ARROWS_LEFT_RIGHT_TO_LINE, "Widescreen Rendering"),
FSUI_VSTR("Increases the field of view from 4:3 to the chosen display aspect ratio in 3D games."), FSUI_VSTR("Increases the field of view from 4:3 to the chosen display aspect ratio in 3D games."),
"GPU", "WidescreenHack", false); "GPU", "WidescreenHack", false);
@ -5571,7 +5572,7 @@ void FullscreenUI::DrawGraphicsSettingsPage()
&Settings::GetDisplayAlignmentName, &Settings::GetDisplayAlignmentDisplayName, &Settings::GetDisplayAlignmentName, &Settings::GetDisplayAlignmentDisplayName,
DisplayAlignment::Count); DisplayAlignment::Count);
DrawEnumSetting(bsi, FSUI_ICONVSTR(ICON_FA_ARROWS_ROTATE, "Screen Rotation"), DrawEnumSetting(bsi, FSUI_ICONVSTR(ICON_FA_ARROWS_SPIN, "Screen Rotation"),
FSUI_VSTR("Determines the rotation of the simulated TV screen."), "Display", "Rotation", FSUI_VSTR("Determines the rotation of the simulated TV screen."), "Display", "Rotation",
Settings::DEFAULT_DISPLAY_ROTATION, &Settings::ParseDisplayRotation, Settings::DEFAULT_DISPLAY_ROTATION, &Settings::ParseDisplayRotation,
&Settings::GetDisplayRotationName, &Settings::GetDisplayRotationDisplayName, DisplayRotation::Count); &Settings::GetDisplayRotationName, &Settings::GetDisplayRotationDisplayName, DisplayRotation::Count);
@ -5725,7 +5726,7 @@ void FullscreenUI::DrawGraphicsSettingsPage()
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_FILE_IMPORT, "Enable Texture Replacements"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_FILE_IMPORT, "Enable Texture Replacements"),
FSUI_VSTR("Enables loading of replacement textures. Not compatible with all games."), FSUI_VSTR("Enables loading of replacement textures. Not compatible with all games."),
"TextureReplacements", "EnableTextureReplacements", false, texture_cache_enabled); "TextureReplacements", "EnableTextureReplacements", false, texture_cache_enabled);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_LIST, "Always Track Uploads"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_LIST_CHECK, "Always Track Uploads"),
FSUI_VSTR("Forces texture upload tracking to be enabled regardless of whether it is needed."), FSUI_VSTR("Forces texture upload tracking to be enabled regardless of whether it is needed."),
"TextureReplacements", "AlwaysTrackUploads", false, texture_cache_enabled); "TextureReplacements", "AlwaysTrackUploads", false, texture_cache_enabled);
DrawToggleSetting( DrawToggleSetting(
@ -5739,7 +5740,7 @@ void FullscreenUI::DrawGraphicsSettingsPage()
(texture_cache_enabled && GetEffectiveBoolSetting(bsi, "TextureReplacements", "DumpTextures", false)) || (texture_cache_enabled && GetEffectiveBoolSetting(bsi, "TextureReplacements", "DumpTextures", false)) ||
GetEffectiveBoolSetting(bsi, "TextureReplacements", "DumpVRAMWrites", false)); GetEffectiveBoolSetting(bsi, "TextureReplacements", "DumpVRAMWrites", false));
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_FILE, "Enable VRAM Write Replacement"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_FILE_PEN, "Enable VRAM Write Replacement"),
FSUI_VSTR("Enables the replacement of background textures in supported games."), FSUI_VSTR("Enables the replacement of background textures in supported games."),
"TextureReplacements", "EnableVRAMWriteReplacements", false); "TextureReplacements", "EnableVRAMWriteReplacements", false);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_FILE_INVOICE, "Enable VRAM Write Dumping"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_FILE_INVOICE, "Enable VRAM Write Dumping"),
@ -6427,36 +6428,37 @@ void FullscreenUI::DrawAchievementsSettingsPage(std::unique_lock<std::mutex>& se
} }
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_INBOX, "Achievement Notifications"), bsi, FSUI_ICONVSTR(ICON_FA_BELL, "Achievement Notifications"),
FSUI_VSTR("Displays popup messages on events such as achievement unlocks and leaderboard submissions."), "Cheevos", FSUI_VSTR("Displays popup messages on events such as achievement unlocks and leaderboard submissions."), "Cheevos",
"Notifications", true, enabled); "Notifications", true, enabled);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_LIST_OL, "Leaderboard Notifications"),
FSUI_VSTR("Displays popup messages when starting, submitting, or failing a leaderboard challenge."),
"Cheevos", "LeaderboardNotifications", true, enabled);
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_HEADPHONES, "Sound Effects"), bsi, FSUI_ICONVSTR(ICON_FA_LIST_OL, "Leaderboard Notifications"),
FSUI_VSTR("Displays popup messages when starting, submitting, or failing a leaderboard challenge."), "Cheevos",
"LeaderboardNotifications", true, enabled);
DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_MUSIC, "Sound Effects"),
FSUI_VSTR("Plays sound effects for events such as achievement unlocks and leaderboard submissions."), "Cheevos", FSUI_VSTR("Plays sound effects for events such as achievement unlocks and leaderboard submissions."), "Cheevos",
"SoundEffects", true, enabled); "SoundEffects", true, enabled);
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_WAND_MAGIC_SPARKLES, "Enable In-Game Overlays"), bsi, FSUI_ICONVSTR(ICON_FA_WAND_MAGIC_SPARKLES, "Enable In-Game Overlays"),
FSUI_VSTR("Shows icons in the lower-right corner of the screen when a challenge/primed achievement is active."), FSUI_VSTR("Shows icons in the lower-right corner of the screen when a challenge/primed achievement is active."),
"Cheevos", "Overlays", true, enabled); "Cheevos", "Overlays", true, enabled);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_USERS, "Encore Mode"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_ARROW_ROTATE_RIGHT, "Encore Mode"),
FSUI_VSTR("When enabled, each session will behave as if no achievements have been unlocked."), FSUI_VSTR("When enabled, each session will behave as if no achievements have been unlocked."),
"Cheevos", "EncoreMode", false, enabled); "Cheevos", "EncoreMode", false, enabled);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_STETHOSCOPE, "Spectator Mode"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_USER_LOCK, "Spectator Mode"),
FSUI_VSTR("When enabled, DuckStation will assume all achievements are locked and not send any " FSUI_VSTR("When enabled, DuckStation will assume all achievements are locked and not send any "
"unlock notifications to the server."), "unlock notifications to the server."),
"Cheevos", "SpectatorMode", false, enabled); "Cheevos", "SpectatorMode", false, enabled);
DrawToggleSetting( DrawToggleSetting(
bsi, FSUI_ICONVSTR(ICON_FA_MEDAL, "Test Unofficial Achievements"), bsi, FSUI_ICONVSTR(ICON_FA_FLASK_VIAL, "Test Unofficial Achievements"),
FSUI_VSTR("When enabled, DuckStation will list achievements from unofficial sets. These achievements are not " FSUI_VSTR("When enabled, DuckStation will list achievements from unofficial sets. These achievements are not "
"tracked by RetroAchievements."), "tracked by RetroAchievements."),
"Cheevos", "UnofficialTestMode", false, enabled); "Cheevos", "UnofficialTestMode", false, enabled);
if (!IsEditingGameSettings(bsi)) if (!IsEditingGameSettings(bsi))
{ {
if (MenuButton(FSUI_ICONVSTR(ICON_FA_LIST_OL, "Update Progress"), if (MenuButton(FSUI_ICONVSTR(ICON_FA_ARROWS_ROTATE, "Update Progress"),
FSUI_VSTR("Updates the progress database for achievements shown in the game list."))) FSUI_VSTR("Updates the progress database for achievements shown in the game list.")))
{ {
Host::RunOnCPUThread([]() { Host::RunOnCPUThread([]() {
@ -7695,7 +7697,7 @@ void FullscreenUI::DrawResumeStateSelector()
DoStartPath(std::move(game_path)); DoStartPath(std::move(game_path));
} }
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_TRASH_CAN, "Delete State"), true, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_TRASH, "Delete State"), true, LAYOUT_CENTER_ALIGN_TEXT))
{ {
if (FileSystem::DeleteFile(entry.state_path.c_str())) if (FileSystem::DeleteFile(entry.state_path.c_str()))
{ {
@ -7860,7 +7862,7 @@ void FullscreenUI::DrawGameListWindow()
if (BeginFullscreenWindow(ImVec2(0.0f, 0.0f), heading_size, "gamelist_view", if (BeginFullscreenWindow(ImVec2(0.0f, 0.0f), heading_size, "gamelist_view",
MulAlpha(UIStyle.PrimaryColor, GetBackgroundAlpha()))) MulAlpha(UIStyle.PrimaryColor, GetBackgroundAlpha())))
{ {
static constexpr const char* icons[] = {ICON_FA_BORDER_ALL, ICON_FA_LIST}; static constexpr const char* icons[] = {ICON_FA_TABLE_CELLS_LARGE, ICON_FA_LIST};
static constexpr const char* titles[] = {FSUI_NSTR("Game Grid"), FSUI_NSTR("Game List")}; static constexpr const char* titles[] = {FSUI_NSTR("Game Grid"), FSUI_NSTR("Game List")};
static constexpr u32 count = static_cast<u32>(std::size(titles)); static constexpr u32 count = static_cast<u32>(std::size(titles));
@ -8460,9 +8462,9 @@ void FullscreenUI::HandleGameListOptions(const GameList::Entry* entry)
{FSUI_ICONSTR(ICON_FA_PLAY, "Resume Game"), false}, {FSUI_ICONSTR(ICON_FA_PLAY, "Resume Game"), false},
{FSUI_ICONSTR(ICON_FA_ARROW_ROTATE_LEFT, "Load State"), false}, {FSUI_ICONSTR(ICON_FA_ARROW_ROTATE_LEFT, "Load State"), false},
{FSUI_ICONSTR(ICON_FA_COMPACT_DISC, "Default Boot"), false}, {FSUI_ICONSTR(ICON_FA_COMPACT_DISC, "Default Boot"), false},
{FSUI_ICONSTR(ICON_FA_LIGHTBULB, "Fast Boot"), false}, {FSUI_ICONSTR(ICON_FA_BOLT, "Fast Boot"), false},
{FSUI_ICONSTR(ICON_FA_WAND_MAGIC_SPARKLES, "Slow Boot"), false}, {FSUI_ICONSTR(ICON_FA_HOURGLASS, "Slow Boot"), false},
{FSUI_ICONSTR(ICON_FA_FOLDER_MINUS, "Reset Play Time"), false}, {FSUI_ICONSTR(ICON_FA_DELETE_LEFT, "Reset Play Time"), false},
}; };
OpenChoiceDialog( OpenChoiceDialog(
@ -8595,7 +8597,7 @@ void FullscreenUI::DrawGameListSettingsPage()
FSUI_NSTR("Achievement Unlock/Count"), FSUI_NSTR("Achievement Unlock/Count"),
}; };
DrawIntListSetting(bsi, FSUI_ICONVSTR(ICON_FA_BORDER_ALL, "Default View"), DrawIntListSetting(bsi, FSUI_ICONVSTR(ICON_FA_TABLE_CELLS_LARGE, "Default View"),
FSUI_VSTR("Selects the view that the game list will open to."), "Main", FSUI_VSTR("Selects the view that the game list will open to."), "Main",
"DefaultFullscreenUIGameView", 0, view_types); "DefaultFullscreenUIGameView", 0, view_types);
DrawIntListSetting(bsi, FSUI_ICONVSTR(ICON_FA_SORT, "Sort By"), DrawIntListSetting(bsi, FSUI_ICONVSTR(ICON_FA_SORT, "Sort By"),
@ -8605,7 +8607,7 @@ void FullscreenUI::DrawGameListSettingsPage()
bsi, FSUI_ICONVSTR(ICON_FA_ARROW_DOWN_Z_A, "Sort Reversed"), bsi, FSUI_ICONVSTR(ICON_FA_ARROW_DOWN_Z_A, "Sort Reversed"),
FSUI_VSTR("Reverses the game list sort order from the default (usually ascending to descending)."), "Main", FSUI_VSTR("Reverses the game list sort order from the default (usually ascending to descending)."), "Main",
"FullscreenUIGameSortReverse", false); "FullscreenUIGameSortReverse", false);
DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_LIST, "Merge Multi-Disc Games"), DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_RECTANGLE_LIST, "Merge Multi-Disc Games"),
FSUI_VSTR("Merges multi-disc games into one item in the game list."), "Main", FSUI_VSTR("Merges multi-disc games into one item in the game list."), "Main",
"FullscreenUIMergeDiscSets", true); "FullscreenUIMergeDiscSets", true);
if (DrawToggleSetting( if (DrawToggleSetting(
@ -8712,7 +8714,7 @@ void FullscreenUI::DrawGameListSettingsPage()
{ {
Host::RefreshGameListAsync(false); Host::RefreshGameListAsync(false);
} }
if (MenuButton(FSUI_ICONVSTR(ICON_FA_MAGNIFYING_GLASS_PLUS, "Rescan All Games"), if (MenuButton(FSUI_ICONVSTR(ICON_FA_ARROWS_ROTATE, "Rescan All Games"),
FSUI_VSTR("Forces a full rescan of all games previously identified."))) FSUI_VSTR("Forces a full rescan of all games previously identified.")))
{ {
Host::RefreshGameListAsync(true); Host::RefreshGameListAsync(true);

8
src/core/memory_card.cpp
View File

@ -15,7 +15,7 @@
#include "common/path.h" #include "common/path.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "IconsFontAwesome6.h" #include "IconsPromptFont.h"
#include "fmt/format.h" #include "fmt/format.h"
LOG_CHANNEL(MemoryCard); LOG_CHANNEL(MemoryCard);
@ -309,7 +309,7 @@ std::unique_ptr<MemoryCard> MemoryCard::Open(std::string_view path)
else if (!MemoryCardImage::LoadFromFile(&mc->m_data, mc->m_path.c_str(), &error)) [[unlikely]] else if (!MemoryCardImage::LoadFromFile(&mc->m_data, mc->m_path.c_str(), &error)) [[unlikely]]
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("memory_card_{}", path), ICON_FA_SD_CARD, fmt::format("memory_card_{}", path), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("MemoryCard", "{} could not be read:\n{}\nThe memory card will NOT be saved.\nYou must " fmt::format(TRANSLATE_FS("MemoryCard", "{} could not be read:\n{}\nThe memory card will NOT be saved.\nYou must "
"delete the memory card manually if you want to save."), "delete the memory card manually if you want to save."),
Path::GetFileName(path), error.GetDescription()), Path::GetFileName(path), error.GetDescription()),
@ -355,7 +355,7 @@ bool MemoryCard::SaveIfChanged(bool display_osd_message)
{ {
if (display_osd_message) if (display_osd_message)
{ {
Host::AddIconOSDMessage(std::move(osd_key), ICON_FA_SD_CARD, Host::AddIconOSDMessage(std::move(osd_key), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("MemoryCard", "Failed to save memory card to '{}': {}"), fmt::format(TRANSLATE_FS("MemoryCard", "Failed to save memory card to '{}': {}"),
Path::GetFileName(display_name), error.GetDescription()), Path::GetFileName(display_name), error.GetDescription()),
Host::OSD_ERROR_DURATION); Host::OSD_ERROR_DURATION);
@ -367,7 +367,7 @@ bool MemoryCard::SaveIfChanged(bool display_osd_message)
if (display_osd_message) if (display_osd_message)
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
std::move(osd_key), ICON_FA_SD_CARD, std::move(osd_key), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("MemoryCard", "Saved memory card to '{}'."), Path::GetFileName(display_name)), fmt::format(TRANSLATE_FS("MemoryCard", "Saved memory card to '{}'."), Path::GetFileName(display_name)),
Host::OSD_QUICK_DURATION); Host::OSD_QUICK_DURATION);
} }

12
src/core/pad.cpp
View File

@ -20,7 +20,7 @@
#include "common/log.h" #include "common/log.h"
#include "IconsEmoji.h" #include "IconsEmoji.h"
#include "IconsFontAwesome6.h" #include "IconsPromptFont.h"
#include "fmt/format.h" #include "fmt/format.h"
#include <array> #include <array>
@ -250,7 +250,7 @@ bool Pad::DoStateMemcard(StateWrapper& sw, u32 i, bool is_memory_state)
if (card_present_in_state && !s_state.memory_cards[i] && g_settings.load_devices_from_save_states) if (card_present_in_state && !s_state.memory_cards[i] && g_settings.load_devices_from_save_states)
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("CardLoadWarning{}", i), ICON_FA_SD_CARD, fmt::format("CardLoadWarning{}", i), ICON_PF_MEMORY_CARD,
fmt::format( fmt::format(
TRANSLATE_FS("OSDMessage", "Memory card {} present in save state but not in system. Creating temporary card."), TRANSLATE_FS("OSDMessage", "Memory card {} present in save state but not in system. Creating temporary card."),
i + 1u), i + 1u),
@ -288,7 +288,7 @@ bool Pad::DoStateMemcard(StateWrapper& sw, u32 i, bool is_memory_state)
else else
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("CardLoadWarning{}", i), ICON_FA_SD_CARD, fmt::format("CardLoadWarning{}", i), ICON_PF_MEMORY_CARD,
fmt::format( fmt::format(
TRANSLATE_FS("OSDMessage", TRANSLATE_FS("OSDMessage",
"Memory card {} from save state does not match current card data. Simulating replugging."), "Memory card {} from save state does not match current card data. Simulating replugging."),
@ -302,7 +302,7 @@ bool Pad::DoStateMemcard(StateWrapper& sw, u32 i, bool is_memory_state)
else else
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("CardLoadWarning{}", i), ICON_FA_SD_CARD, fmt::format("CardLoadWarning{}", i), ICON_PF_MEMORY_CARD,
fmt::format( fmt::format(
TRANSLATE_FS("OSDMessage", "Memory card {} present in save state but not in system. Ignoring card."), i + 1u), TRANSLATE_FS("OSDMessage", "Memory card {} present in save state but not in system. Ignoring card."), i + 1u),
Host::OSD_ERROR_DURATION); Host::OSD_ERROR_DURATION);
@ -316,7 +316,7 @@ bool Pad::DoStateMemcard(StateWrapper& sw, u32 i, bool is_memory_state)
if (g_settings.load_devices_from_save_states) if (g_settings.load_devices_from_save_states)
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("CardLoadWarning{}", i), ICON_FA_SD_CARD, fmt::format("CardLoadWarning{}", i), ICON_PF_MEMORY_CARD,
fmt::format( fmt::format(
TRANSLATE_FS("OSDMessage", "Memory card {} present in system but not in save state. Removing card."), i + 1u), TRANSLATE_FS("OSDMessage", "Memory card {} present in system but not in save state. Removing card."), i + 1u),
Host::OSD_ERROR_DURATION); Host::OSD_ERROR_DURATION);
@ -325,7 +325,7 @@ bool Pad::DoStateMemcard(StateWrapper& sw, u32 i, bool is_memory_state)
else else
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("CardLoadWarning{}", i), ICON_FA_SD_CARD, fmt::format("CardLoadWarning{}", i), ICON_PF_MEMORY_CARD,
fmt::format( fmt::format(
TRANSLATE_FS("OSDMessage", "Memory card {} present in system but not in save state. Replugging card."), TRANSLATE_FS("OSDMessage", "Memory card {} present in system but not in save state. Replugging card."),
i + 1u), i + 1u),

11
src/core/system.cpp
View File

@ -70,6 +70,7 @@
#include "IconsEmoji.h" #include "IconsEmoji.h"
#include "IconsFontAwesome6.h" #include "IconsFontAwesome6.h"
#include "IconsPromptFont.h"
#include "cpuinfo.h" #include "cpuinfo.h"
#include "fmt/chrono.h" #include "fmt/chrono.h"
@ -3773,7 +3774,7 @@ std::unique_ptr<MemoryCard> System::GetMemoryCardForSlot(u32 slot, MemoryCardTyp
if (s_state.running_game_serial.empty()) if (s_state.running_game_serial.empty())
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
std::move(message_key), ICON_FA_SD_CARD, std::move(message_key), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("System", "Per-game memory card cannot be used for slot {} as the running " fmt::format(TRANSLATE_FS("System", "Per-game memory card cannot be used for slot {} as the running "
"game has no code. Using shared card instead."), "game has no code. Using shared card instead."),
slot + 1u), slot + 1u),
@ -3792,7 +3793,7 @@ std::unique_ptr<MemoryCard> System::GetMemoryCardForSlot(u32 slot, MemoryCardTyp
if (s_state.running_game_title.empty()) if (s_state.running_game_title.empty())
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
std::move(message_key), ICON_FA_SD_CARD, std::move(message_key), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("System", "Per-game memory card cannot be used for slot {} as the running " fmt::format(TRANSLATE_FS("System", "Per-game memory card cannot be used for slot {} as the running "
"game has no title. Using shared card instead."), "game has no title. Using shared card instead."),
slot + 1u), slot + 1u),
@ -3830,7 +3831,7 @@ std::unique_ptr<MemoryCard> System::GetMemoryCardForSlot(u32 slot, MemoryCardTyp
if (g_settings.memory_card_use_playlist_title && !card_path.empty()) if (g_settings.memory_card_use_playlist_title && !card_path.empty())
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
fmt::format("DiscSpecificMC{}", slot), ICON_FA_SD_CARD, fmt::format("DiscSpecificMC{}", slot), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("System", "Using disc-specific memory card '{}' instead of per-game card."), fmt::format(TRANSLATE_FS("System", "Using disc-specific memory card '{}' instead of per-game card."),
Path::GetFileName(disc_card_path)), Path::GetFileName(disc_card_path)),
Host::OSD_INFO_DURATION); Host::OSD_INFO_DURATION);
@ -3852,7 +3853,7 @@ std::unique_ptr<MemoryCard> System::GetMemoryCardForSlot(u32 slot, MemoryCardTyp
if (file_title.empty()) if (file_title.empty())
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
std::move(message_key), ICON_FA_SD_CARD, std::move(message_key), ICON_PF_MEMORY_CARD,
fmt::format(TRANSLATE_FS("System", "Per-game memory card cannot be used for slot {} as the running " fmt::format(TRANSLATE_FS("System", "Per-game memory card cannot be used for slot {} as the running "
"game has no path. Using shared card instead."), "game has no path. Using shared card instead."),
slot + 1u)); slot + 1u));
@ -4091,7 +4092,7 @@ bool System::InsertMedia(const char* path)
if (g_settings.HasAnyPerGameMemoryCards()) if (g_settings.HasAnyPerGameMemoryCards())
{ {
Host::AddIconOSDMessage("ReloadMemoryCardsFromGameChange", ICON_FA_SD_CARD, Host::AddIconOSDMessage("ReloadMemoryCardsFromGameChange", ICON_PF_MEMORY_CARD,
TRANSLATE_STR("System", "Game changed, reloading memory cards."), Host::OSD_INFO_DURATION); TRANSLATE_STR("System", "Game changed, reloading memory cards."), Host::OSD_INFO_DURATION);
UpdatePerGameMemoryCards(); UpdatePerGameMemoryCards();
} }