From 85f45d2788bacd430343fbc27577b9da2d79b442 Mon Sep 17 00:00:00 2001 From: Florian Piesche Date: Tue, 12 Nov 2024 07:32:56 +0000 Subject: [PATCH] Add scalable vector redraw of shadps4 icon (#1501) * Add scalable vector redraw of shadps4 icon * Update icon name in desktop file * Fix svg --- .github/linux-appimage-qt.sh | 2 +- .github/linux-appimage-sdl.sh | 2 +- .github/shadps4.desktop | 2 +- CMakeLists.txt | 1 + REUSE.toml | 1 + src/images/net.shadps4.shadPS4.svg | 2 ++ 6 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 src/images/net.shadps4.shadPS4.svg diff --git a/.github/linux-appimage-qt.sh b/.github/linux-appimage-qt.sh index 8a5f340f..d176b17d 100755 --- a/.github/linux-appimage-qt.sh +++ b/.github/linux-appimage-qt.sh @@ -27,7 +27,7 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh cp -a "$GITHUB_WORKSPACE/build/translations" AppDir/usr/bin -./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --plugin qt +./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/src/images/net.shadps4.shadPS4.svg --plugin qt rm AppDir/usr/plugins/multimedia/libgstreamermediaplugin.so ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage mv shadPS4-x86_64.AppImage Shadps4-qt.AppImage diff --git a/.github/linux-appimage-sdl.sh b/.github/linux-appimage-sdl.sh index cf0ce4de..d747abbe 100755 --- a/.github/linux-appimage-sdl.sh +++ b/.github/linux-appimage-sdl.sh @@ -17,5 +17,5 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh # Build AppImage ./linuxdeploy-x86_64.AppImage --appdir AppDir ./linuxdeploy-plugin-checkrt-x86_64.sh --appdir AppDir -./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --output appimage +./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/src/images/net.shadps4.shadPS4.svg --output appimage mv shadPS4-x86_64.AppImage Shadps4-sdl.AppImage diff --git a/.github/shadps4.desktop b/.github/shadps4.desktop index 6dc66371..b9070c4f 100644 --- a/.github/shadps4.desktop +++ b/.github/shadps4.desktop @@ -3,7 +3,7 @@ Name=shadPS4 Exec=shadps4 Terminal=false Type=Application -Icon=shadps4 +Icon=net.shadps4.shadPS4 Comment=shadPS4 Emulator Categories=Game; StartupWMClass=shadps4; diff --git a/CMakeLists.txt b/CMakeLists.txt index 43966335..e0e877a5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -945,4 +945,5 @@ install(TARGETS shadps4 BUNDLE DESTINATION .) if (ENABLE_QT_GUI AND CMAKE_SYSTEM_NAME STREQUAL "Linux") install(FILES ".github/shadps4.desktop" DESTINATION "share/applications") install(FILES ".github/shadps4.png" DESTINATION "share/icons/hicolor/512x512/apps") + install(FILES "src/images/net.shadps4.shadPS4.svg" DESTINATION "share/icons/hicolor/scalable/apps") endif() diff --git a/REUSE.toml b/REUSE.toml index e1a26603..b0496973 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -35,6 +35,7 @@ path = [ "src/images/stop_icon.png", "src/images/shadPS4.icns", "src/images/shadps4.ico", + "src/images/net.shadps4.shadPS4.svg", "src/images/themes_icon.png", "src/images/update_icon.png", "src/shadps4.qrc", diff --git a/src/images/net.shadps4.shadPS4.svg b/src/images/net.shadps4.shadPS4.svg new file mode 100644 index 00000000..2d954b12 --- /dev/null +++ b/src/images/net.shadps4.shadPS4.svg @@ -0,0 +1,2 @@ + +