[PR #2493] [MERGED] Trophy pop-up and viewer enhancements #2779

New issue

Closed

opened 2026-02-27 22:01:13 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 22:01:13 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/2493
Author: @rainmakerv3
Created: 2/21/2025
Status: ✅ Merged
Merged: 2/23/2025
Merged by: @georgemoralis

Base: main ← Head: TrophyStuff

📝 Commits (8)

d42cc49 Include trophy rarity icons in pop up, remove newlines from viewer
06576fa Smaller type icons, center text vertically
50f0a9c use original icons
6dbc2b4 MacOS fixes
d922082 Address Review comments
ff28b97 Move trophy type to leftmost and trophy art to rightmost
9b4d73e Embed resources
94458ed Revert packaging of resources with builds

📊 Changes

13 files changed (+805 additions, -37 deletions)

View changed files

📝 .github/workflows/build.yml (+10 -10)
📝 CMakeLists.txt (+19 -0)
📝 REUSE.toml (+8 -0)
➕ Resources/bronze.png (+0 -0)
➕ Resources/gold.png (+0 -0)
➕ Resources/platinum.png (+0 -0)
➕ Resources/silver.png (+0 -0)
➕ cmake/CMakeRC.cmake (+666 -0)
📝 src/core/libraries/np_trophy/np_trophy.cpp (+2 -2)
📝 src/core/libraries/np_trophy/trophy_ui.cpp (+59 -13)
📝 src/core/libraries/np_trophy/trophy_ui.h (+8 -3)
📝 src/qt_gui/trophy_viewer.cpp (+27 -3)
📝 src/qt_gui/trophy_viewer.h (+6 -6)

📄 Description

Partially addresses https://github.com/shadps4-emu/shadPS4/issues/2461

Trophy pop-up

show icon for trophy rarity next to the trophy art
center all elements vertically
minor spacing adjustments

Trophy viewer

show icon for trophy rarity instead of text
remove the hardcoded newlines that were being imported into the viewer from the XML
align left instead of center for trophy descriptions

Images, though patterned after the PS4 trophy icons, are originally modelled by discord user Tlarok. They are packaged inside the AppImage for Linux, inside the app bundle for Mac, and in a separate Resources folder which is packaged in the other builds, and copied by CMake command in the binary folder for locally compiled builds

sample photos:

Trophy pop-up (main):

Trophy pop-up (PR):

Trophy viewer (main):

Trophy viewer (PR):

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/2493 **Author:** [@rainmakerv3](https://github.com/rainmakerv3) **Created:** 2/21/2025 **Status:** ✅ Merged **Merged:** 2/23/2025 **Merged by:** [@georgemoralis](https://github.com/georgemoralis) **Base:** `main` ← **Head:** `TrophyStuff` --- ### 📝 Commits (8) - [`d42cc49`](https://github.com/shadps4-emu/shadPS4/commit/d42cc49dabcb88814bae690bcb2edff72d832eeb) Include trophy rarity icons in pop up, remove newlines from viewer - [`06576fa`](https://github.com/shadps4-emu/shadPS4/commit/06576fa16dd439af918669d91226e3d60c8553d6) Smaller type icons, center text vertically - [`50f0a9c`](https://github.com/shadps4-emu/shadPS4/commit/50f0a9cf9d4707138723ea6384566cc26218f2ca) use original icons - [`6dbc2b4`](https://github.com/shadps4-emu/shadPS4/commit/6dbc2b4711bc37aaa0b0b71eeb50a17b50eaacf0) MacOS fixes - [`d922082`](https://github.com/shadps4-emu/shadPS4/commit/d9220828197459d8f9ef898c0c003a18ed2c91cf) Address Review comments - [`ff28b97`](https://github.com/shadps4-emu/shadPS4/commit/ff28b97f1a50c295e6737b1d90a760ee75927f79) Move trophy type to leftmost and trophy art to rightmost - [`9b4d73e`](https://github.com/shadps4-emu/shadPS4/commit/9b4d73ecac65cd804373a71e03ce68990e9dee21) Embed resources - [`94458ed`](https://github.com/shadps4-emu/shadPS4/commit/94458eddc1b8eed8c7dfcf894ec0e146a8d7455d) Revert packaging of resources with builds ### 📊 Changes **13 files changed** (+805 additions, -37 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/build.yml` (+10 -10) 📝 `CMakeLists.txt` (+19 -0) 📝 `REUSE.toml` (+8 -0) ➕ `Resources/bronze.png` (+0 -0) ➕ `Resources/gold.png` (+0 -0) ➕ `Resources/platinum.png` (+0 -0) ➕ `Resources/silver.png` (+0 -0) ➕ `cmake/CMakeRC.cmake` (+666 -0) 📝 `src/core/libraries/np_trophy/np_trophy.cpp` (+2 -2) 📝 `src/core/libraries/np_trophy/trophy_ui.cpp` (+59 -13) 📝 `src/core/libraries/np_trophy/trophy_ui.h` (+8 -3) 📝 `src/qt_gui/trophy_viewer.cpp` (+27 -3) 📝 `src/qt_gui/trophy_viewer.h` (+6 -6) </details> ### 📄 Description Partially addresses https://github.com/shadps4-emu/shadPS4/issues/2461 Trophy pop-up 1) show icon for trophy rarity next to the trophy art 2) center all elements vertically 3) minor spacing adjustments Trophy viewer 1) show icon for trophy rarity instead of text 2) remove the hardcoded newlines that were being imported into the viewer from the XML 3) align left instead of center for trophy descriptions Images, though patterned after the PS4 trophy icons, are originally modelled by discord user Tlarok. They are packaged inside the AppImage for Linux, inside the app bundle for Mac, and in a separate Resources folder which is packaged in the other builds, and copied by CMake command in the binary folder for locally compiled builds sample photos: Trophy pop-up (main): ![plat main](https://github.com/user-attachments/assets/96fa9eb8-0f73-4f97-91b0-6888f87dba4e) Trophy pop-up (PR): ![plat PR](https://github.com/user-attachments/assets/6bd9163e-8544-425b-8459-d06822c97dfc) Trophy viewer (main): ![viewer main](https://github.com/user-attachments/assets/7644b237-321d-4fdf-8df8-259c9f805b52) Trophy viewer (PR): ![viewer PR](https://github.com/user-attachments/assets/fa5a35ce-42d4-4bd4-9505-ff8562668899) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>