From 15d10e47ea272b1b4c8bf97f2b3bbb406d34b213 Mon Sep 17 00:00:00 2001
From: jarred wilson <20207921+jardon@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:39:27 -0600
Subject: [PATCH] fix: move trophy pngs to src/images (#2519)

* fix: move trophy pngs to src/images

* Fix pointers to trophy files

---------

Co-authored-by: rainmakerv2 <30595646+jpau02@users.noreply.github.com>
---
 CMakeLists.txt                             |  13 ++++---------
 REUSE.toml                                 |   8 ++++----
 src/core/libraries/np_trophy/trophy_ui.cpp |   8 ++++----
 {Resources => src/images}/bronze.png       | Bin
 {Resources => src/images}/gold.png         | Bin
 {Resources => src/images}/platinum.png     | Bin
 {Resources => src/images}/silver.png       | Bin
 src/qt_gui/trophy_viewer.cpp               |   2 +-
 8 files changed, 13 insertions(+), 18 deletions(-)
 rename {Resources => src/images}/bronze.png (100%)
 rename {Resources => src/images}/gold.png (100%)
 rename {Resources => src/images}/platinum.png (100%)
 rename {Resources => src/images}/silver.png (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 820d46f9d..0437c0ebb 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -954,12 +954,6 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
 )
 endif()
 
-set(RESOURCEFOLDER Resources/bronze.png
-    		   Resources/gold.png
-    		   Resources/platinum.png
-    		   Resources/silver.png
-)
-
 if (ENABLE_QT_GUI)
     qt_add_executable(shadps4
         ${AUDIO_CORE}
@@ -971,7 +965,6 @@ if (ENABLE_QT_GUI)
         ${SHADER_RECOMPILER}
         ${VIDEO_CORE}
         ${EMULATOR}
-	${RESOURCEFOLDER}
         src/images/shadPS4.icns
     )
 else()
@@ -984,7 +977,6 @@ else()
         ${SHADER_RECOMPILER}
         ${VIDEO_CORE}
         ${EMULATOR}
-        ${RESOURCEFOLDER}
         src/main.cpp
         src/emulator.cpp
         src/emulator.h
@@ -1117,7 +1109,10 @@ include(CMakeRC)
 cmrc_add_resource_library(embedded-resources
         ALIAS res::embedded
         NAMESPACE res
-        ${RESOURCEFOLDER})
+        src/images/bronze.png
+        src/images/gold.png
+        src/images/platinum.png
+        src/images/silver.png)
 
 target_link_libraries(shadps4 PRIVATE res::embedded)
 
diff --git a/REUSE.toml b/REUSE.toml
index 9c6ada42a..d8f31c2f2 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -19,11 +19,11 @@ path = [
     "documents/Screenshots/*",
     "documents/Screenshots/Linux/*",
     "externals/MoltenVK/MoltenVK_icd.json",
-    "Resources/bronze.png",
-    "Resources/gold.png",
-    "Resources/platinum.png",
-    "Resources/silver.png",
     "scripts/ps4_names.txt",
+    "src/images/bronze.png",
+    "src/images/gold.png",
+    "src/images/platinum.png",
+    "src/images/silver.png",
     "src/images/about_icon.png",
     "src/images/controller_icon.png",
     "src/images/discord.png",
diff --git a/src/core/libraries/np_trophy/trophy_ui.cpp b/src/core/libraries/np_trophy/trophy_ui.cpp
index 2b909e5cf..efa02e9c4 100644
--- a/src/core/libraries/np_trophy/trophy_ui.cpp
+++ b/src/core/libraries/np_trophy/trophy_ui.cpp
@@ -33,13 +33,13 @@ TrophyUI::TrophyUI(const std::filesystem::path& trophyIconPath, const std::strin
 
     std::string pathString;
     if (trophy_type == "P") {
-        pathString = "Resources/platinum.png";
+        pathString = "src/images/platinum.png";
     } else if (trophy_type == "G") {
-        pathString = "Resources/gold.png";
+        pathString = "src/images/gold.png";
     } else if (trophy_type == "S") {
-        pathString = "Resources/silver.png";
+        pathString = "src/images/silver.png";
     } else if (trophy_type == "B") {
-        pathString = "Resources/bronze.png";
+        pathString = "src/images/bronze.png";
     }
 
     auto resource = cmrc::res::get_filesystem();
diff --git a/Resources/bronze.png b/src/images/bronze.png
similarity index 100%
rename from Resources/bronze.png
rename to src/images/bronze.png
diff --git a/Resources/gold.png b/src/images/gold.png
similarity index 100%
rename from Resources/gold.png
rename to src/images/gold.png
diff --git a/Resources/platinum.png b/src/images/platinum.png
similarity index 100%
rename from Resources/platinum.png
rename to src/images/platinum.png
diff --git a/Resources/silver.png b/src/images/silver.png
similarity index 100%
rename from Resources/silver.png
rename to src/images/silver.png
diff --git a/src/qt_gui/trophy_viewer.cpp b/src/qt_gui/trophy_viewer.cpp
index 9a0f33eed..63e9f04dd 100644
--- a/src/qt_gui/trophy_viewer.cpp
+++ b/src/qt_gui/trophy_viewer.cpp
@@ -123,7 +123,7 @@ void TrophyViewer::PopulateTrophyWidget(QString title) {
             QTableWidgetItem* typeitem = new QTableWidgetItem();
 
             auto resource = cmrc::res::get_filesystem();
-            std::string resourceString = "Resources/" + filename;
+            std::string resourceString = "src/images/" + filename;
             auto file = resource.open(resourceString);
             std::vector<char> imgdata(file.begin(), file.end());
             QImage type_icon = QImage::fromData(imgdata).scaled(QSize(64, 64), Qt::KeepAspectRatio,