From 36958623686a0f83a12479d72dc98c6aec39db00 Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Sun, 28 Jan 2024 21:53:12 +0700 Subject: [PATCH] Qt/BPM: Minor icon tweaks --- pcsx2-qt/Debugger/DebuggerWindow.ui | 3 +++ pcsx2-qt/resources/icons/black/svg/pin-filled.svg | 8 ++++++++ pcsx2-qt/resources/icons/white/svg/pin-filled.svg | 8 ++++++++ pcsx2-qt/resources/resources.qrc | 6 ++++-- pcsx2/ImGui/FullscreenUI.cpp | 6 +++--- pcsx2/ImGui/ImGuiManager.cpp | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 pcsx2-qt/resources/icons/black/svg/pin-filled.svg create mode 100644 pcsx2-qt/resources/icons/white/svg/pin-filled.svg diff --git a/pcsx2-qt/Debugger/DebuggerWindow.ui b/pcsx2-qt/Debugger/DebuggerWindow.ui index 71a692187c..c5d764d0ea 100644 --- a/pcsx2-qt/Debugger/DebuggerWindow.ui +++ b/pcsx2-qt/Debugger/DebuggerWindow.ui @@ -95,6 +95,9 @@ + + + true diff --git a/pcsx2-qt/resources/icons/black/svg/pin-filled.svg b/pcsx2-qt/resources/icons/black/svg/pin-filled.svg new file mode 100644 index 0000000000..d965d9fd0b --- /dev/null +++ b/pcsx2-qt/resources/icons/black/svg/pin-filled.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/pcsx2-qt/resources/icons/white/svg/pin-filled.svg b/pcsx2-qt/resources/icons/white/svg/pin-filled.svg new file mode 100644 index 0000000000..4dc73158f2 --- /dev/null +++ b/pcsx2-qt/resources/icons/white/svg/pin-filled.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc index c313443883..b0721870af 100644 --- a/pcsx2-qt/resources/resources.qrc +++ b/pcsx2-qt/resources/resources.qrc @@ -15,10 +15,10 @@ icons/black/svg/close-line.svg icons/black/svg/controller-line.svg icons/black/svg/controller-strike-line.svg - icons/black/svg/debugger-line.svg icons/black/svg/debug-step-into-line.svg icons/black/svg/debug-step-out-line.svg icons/black/svg/debug-step-over-line.svg + icons/black/svg/debugger-line.svg icons/black/svg/delete-back-2-line.svg icons/black/svg/disc-2-line.svg icons/black/svg/disc-eject-line.svg @@ -67,6 +67,7 @@ icons/black/svg/msd-line.svg icons/black/svg/pause-line.svg icons/black/svg/pencil-line.svg + icons/black/svg/pin-filled.svg icons/black/svg/play-line.svg icons/black/svg/plus-line.svg icons/black/svg/Popn-line.svg @@ -110,10 +111,10 @@ icons/white/svg/close-line.svg icons/white/svg/controller-line.svg icons/white/svg/controller-strike-line.svg - icons/white/svg/debugger-line.svg icons/white/svg/debug-step-into-line.svg icons/white/svg/debug-step-out-line.svg icons/white/svg/debug-step-over-line.svg + icons/white/svg/debugger-line.svg icons/white/svg/delete-back-2-line.svg icons/white/svg/disc-2-line.svg icons/white/svg/disc-eject-line.svg @@ -162,6 +163,7 @@ icons/white/svg/msd-line.svg icons/white/svg/pause-line.svg icons/white/svg/pencil-line.svg + icons/white/svg/pin-filled.svg icons/white/svg/play-line.svg icons/white/svg/plus-line.svg icons/white/svg/Popn-line.svg diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 95028ad424..f29c80f391 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -2791,7 +2791,7 @@ void FullscreenUI::DrawInterfaceSettingsPage() FSUI_CSTR("Displays warnings when settings are enabled which may break games."), "EmuCore", "WarnAboutUnsafeSettings", true); MenuHeading(FSUI_CSTR("Operations")); - if (MenuButton(FSUI_ICONSTR(ICON_FA_FOLDER_MINUS, "Reset Settings"), + if (MenuButton(FSUI_ICONSTR(ICON_FA_DUMPSTER_FIRE, "Reset Settings"), FSUI_CSTR("Resets configuration to defaults (excluding controller settings)."), !IsEditingGameSettings(bsi))) { DoResetSettings(); @@ -3847,7 +3847,7 @@ void FullscreenUI::DoSaveInputProfile() void FullscreenUI::DoResetSettings() { - OpenConfirmMessageDialog(FSUI_ICONSTR(ICON_FA_FOLDER_MINUS, "Reset Settings"), + OpenConfirmMessageDialog(FSUI_ICONSTR(ICON_FA_DUMPSTER_FIRE, "Reset Settings"), FSUI_STR("Are you sure you want to restore the default settings? Any preferences will be lost."), [](bool result) { if (result) { @@ -3898,7 +3898,7 @@ void FullscreenUI::DrawControllerSettingsPage() } else { - if (MenuButton(FSUI_ICONSTR(ICON_FA_FOLDER_MINUS, "Reset Settings"), + if (MenuButton(FSUI_ICONSTR(ICON_FA_DUMPSTER_FIRE, "Reset Settings"), FSUI_CSTR("Resets all configuration to defaults (including bindings)."))) { ResetControllerSettings(); diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index dda32b156c..cd1e9eda94 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -482,7 +482,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,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf121,0xf121,0xf133,0xf133,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1c9,0xf1c9,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf545,0xf545,0xf547,0xf548,0xf552,0xf552,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8da,0xf8da,0x0,0x0 }; + static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf121,0xf121,0xf133,0xf133,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1c9,0xf1c9,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf545,0xf545,0xf547,0xf548,0xf552,0xf552,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8da,0xf8da,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,0x227a,0x227d,0x22bf,0x22c8,0x23b2,0x23b4,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; // clang-format on