Skip to content

Commit

Permalink
fix: macos icns issue when icon was not attached
Browse files Browse the repository at this point in the history
github pull request:bambulab/BambuStudio#3116

Change-Id: I49072ad49f3af7669a6d307c791594ade210da50
(cherry picked from commit c977e5582e3a30ad16dd267810037423aad9a53c)
  • Loading branch information
SoftFever committed Jan 25, 2024
1 parent aeb4160 commit d2139e5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 11 deletions.
21 changes: 16 additions & 5 deletions cmake/modules/MacOSXBundleInfo.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>orcasliceropen url</string>
<key>CFBundleURLSchemes</key>
<array>
<string>orcasliceropen</string>
</array>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
Expand All @@ -35,7 +46,7 @@
<string>STL</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>stl.icns</string>
<string>images/stl.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
Expand All @@ -52,7 +63,7 @@
<string>OBJ</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
Expand All @@ -69,7 +80,7 @@
<string>AMF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>AMF</string>
<key>CFBundleTypeRole</key>
Expand All @@ -86,7 +97,7 @@
<string>3MF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>3MF</string>
<key>CFBundleTypeRole</key>
Expand All @@ -103,7 +114,7 @@
<string>GCODE</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>gcode.icns</string>
<string>images/gcode.icns</string>
<key>CFBundleTypeName</key>
<string>GCODE</string>
<key>CFBundleTypeRole</key>
Expand Down
23 changes: 17 additions & 6 deletions src/platform/osx/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleGetInfoString</key>
<string>@SLIC3R_APP_NAME@ Copyright(C) 2021-2023 Lunkuo All Rights Reserved</string>
<key>CFBundleIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleName</key>
<string>@SLIC3R_APP_KEY@</string>
<key>CFBundleShortVersionString</key>
Expand All @@ -22,6 +22,17 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>@SLIC3R_BUILD_ID@</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>orcasliceropen url</string>
<key>CFBundleURLSchemes</key>
<array>
<string>orcasliceropen</string>
</array>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
Expand All @@ -31,7 +42,7 @@
<string>STL</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>stl.icns</string>
<string>images/stl.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
Expand All @@ -48,7 +59,7 @@
<string>OBJ</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
Expand All @@ -65,7 +76,7 @@
<string>AMF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>AMF</string>
<key>CFBundleTypeRole</key>
Expand All @@ -82,7 +93,7 @@
<string>3MF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>OrcaSlicer.icns</string>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>3MF</string>
<key>CFBundleTypeRole</key>
Expand All @@ -99,7 +110,7 @@
<string>GCODE</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>gcode.icns</string>
<string>images/gcode.icns</string>
<key>CFBundleTypeName</key>
<string>GCODE</string>
<key>CFBundleTypeRole</key>
Expand Down

0 comments on commit d2139e5

Please sign in to comment.