From e77452e2e3e5af7f2c91ea187fa10d7ac8331aad Mon Sep 17 00:00:00 2001 From: sentientstardust Date: Tue, 19 May 2026 07:41:25 +0100 Subject: [PATCH] Make sure correct app icon is used --- build_release_macos.sh | 1 + scripts/flatpak/com.orcaslicer.OrcaSlicer.yml | 6 +++++- src/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build_release_macos.sh b/build_release_macos.sh index 8d417695ad3..a19e94f6697 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -237,6 +237,7 @@ function build_slicer() { resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources) rm ./OrcaSlicer.app/Contents/Resources cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources + plutil -replace CFBundleIconFile -string "images/OrcaSlicer.icns" ./OrcaSlicer.app/Contents/Info.plist # delete .DS_Store file find ./OrcaSlicer.app/ -name '.DS_Store' -delete diff --git a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml index 2c2405099bf..0f31bc85b8c 100644 --- a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml +++ b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml @@ -328,7 +328,11 @@ modules: post-install: - | # Desktop integration files - install -Dm644 -t /app/share/icons/hicolor/scalable/apps/ resources/images/OrcaSlicer.svg + install -Dm644 resources/images/OrcaSlicer_32px.png /app/share/icons/hicolor/32x32/apps/OrcaSlicer.png + install -Dm644 resources/images/OrcaSlicer_64.png /app/share/icons/hicolor/64x64/apps/OrcaSlicer.png + install -Dm644 resources/images/OrcaSlicer_128px.png /app/share/icons/hicolor/128x128/apps/OrcaSlicer.png + install -Dm644 resources/images/OrcaSlicer_192px.png /app/share/icons/hicolor/192x192/apps/OrcaSlicer.png + install -Dm644 resources/images/OrcaSlicer.png /app/share/icons/hicolor/256x256/apps/OrcaSlicer.png install -Dm644 ${FLATPAK_ID}.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml desktop-file-edit --set-key=Exec --set-value="entrypoint %U" /app/share/applications/${FLATPAK_ID}.desktop install -Dm755 entrypoint /app/bin diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0f88db05bec..a84e089f21b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -255,7 +255,7 @@ else () else() set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.app/Contents/Resources") endif() - set(MACOSX_BUNDLE_ICON_FILE Icon.icns) + set(MACOSX_BUNDLE_ICON_FILE images/OrcaSlicer.icns) set(MACOSX_BUNDLE_BUNDLE_NAME "OrcaSlicer-ImageMap") set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${SoftFever_VERSION}) set(MACOSX_BUNDLE_COPYRIGHT "Copyright(C) 2022-2024 Li Jiang All Rights Reserved")