Merge: Snapmaker Orca 2.1.2

src/dev-utils/platform/msw/Snapmaker_Orca-gcodeviewer.rc.in

@@ -6,7 +6,7 @@ PRODUCTVERSION @SLIC3R_VERSION@
  {
   BLOCK "040904E4"
   {
-   VALUE "CompanyName", "SoftFever"
+   VALUE "CompanyName", "Snapmaker"
    VALUE "FileDescription", "@SLIC3R_APP_NAME@ G-code Viewer"
    VALUE "FileVersion", "@SLIC3R_BUILD_ID@"
    VALUE "ProductName", "@SLIC3R_APP_NAME@ G-code Viewer"
@@ -21,5 +21,5 @@ PRODUCTVERSION @SLIC3R_VERSION@
    VALUE "Translation", 0x409, 1252
  }
 }
-2 ICON "@SLIC3R_RESOURCES_DIR@/images/OrcaSlicer-gcodeviewer.ico"
-1 24 "OrcaSlicer.manifest" 
+2 ICON "@SLIC3R_RESOURCES_DIR@/images/Snapmaker_Orca-gcodeviewer.ico"
+1 24 "Snapmaker_Orca.manifest" 

src/dev-utils/platform/msw/Snapmaker_Orca.rc.in

@@ -6,14 +6,14 @@ PRODUCTVERSION @SLIC3R_VERSION@
  {
   BLOCK "040904E4"
   {
-   VALUE "CompanyName", "SoftFever"
+   VALUE "CompanyName", "Snapmaker"
    VALUE "FileDescription", "@SLIC3R_APP_NAME@"
    VALUE "FileVersion", "@SLIC3R_BUILD_ID@"
    VALUE "ProductName", "@SLIC3R_APP_NAME@"
    VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
    VALUE "InternalName", "@SLIC3R_APP_NAME@"
    VALUE "LegalCopyright", ""
-   VALUE "OriginalFilename", "orca-slicer.exe"
+   VALUE "OriginalFilename", "snapmaker-orca.exe"
   }
  }
  BLOCK "VarFileInfo"
@@ -21,5 +21,5 @@ PRODUCTVERSION @SLIC3R_VERSION@
    VALUE "Translation", 0x409, 1252
  }
 }
-2 ICON "@SLIC3R_RESOURCES_DIR@/images/OrcaSlicer.ico"
-1 24 "OrcaSlicer.manifest" 
+2 ICON "@SLIC3R_RESOURCES_DIR@/images/Snapmaker_Orca.ico"
+1 24 "Snapmaker_Orca.manifest" 

src/dev-utils/platform/osx/Info.plist.in

@@ -7,7 +7,7 @@
   <key>CFBundleGetInfoString</key>
   <string>@SLIC3R_APP_NAME@ Copyright(C) 2021-2023 Lunkuo All Rights Reserved</string>
   <key>CFBundleIconFile</key>
-  <string>images/OrcaSlicer.icns</string>
+  <string>images/Snapmaker_Orca.icns</string>
   <key>CFBundleName</key>
   <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleShortVersionString</key>
@@ -28,11 +28,11 @@
   <array>
     <dict>
       <key>CFBundleURLName</key>
-      <string>orcasliceropen url</string>
+      <string>Snapmaker_Orcaopen url</string>
       <key>CFBundleURLSchemes</key>
       <array>
-        <string>orcasliceropen</string>
-        <string>orcaslicer</string>
+        <string>Snapmaker_Orcaopen</string>
+        <string>Snapmaker_Orca</string>
       </array>
     </dict>
   </array>
@@ -62,7 +62,7 @@
         <string>OBJ</string>
       </array>
       <key>CFBundleTypeIconFile</key>
-      <string>images/OrcaSlicer.icns</string>
+      <string>images/Snapmaker_Orca.icns</string>
       <key>CFBundleTypeName</key>
       <string>STL</string>
       <key>CFBundleTypeRole</key>
@@ -79,7 +79,7 @@
         <string>AMF</string>
       </array>
       <key>CFBundleTypeIconFile</key>
-      <string>images/OrcaSlicer.icns</string>
+      <string>images/Snapmaker_Orca.icns</string>
       <key>CFBundleTypeName</key>
       <string>AMF</string>
       <key>CFBundleTypeRole</key>
@@ -96,7 +96,7 @@
         <string>3MF</string>
       </array>
       <key>CFBundleTypeIconFile</key>
-      <string>images/OrcaSlicer.icns</string>
+      <string>images/Snapmaker_Orca.icns</string>
       <key>CFBundleTypeName</key>
       <string>3MF</string>
       <key>CFBundleTypeRole</key>

src/dev-utils/platform/unix/BambuGcodeviewer.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Bambu GCode viewer
-Exec=orca-slicer --gcodeviewer %F
-Icon=OrcaSlicer-gcodeviewer
+Exec=snapmaker-orca --gcodeviewer %F
+Icon=Snapmaker_Orca-gcodeviewer
 Terminal=false
 Type=Application
 MimeType=text/x.gcode;

src/dev-utils/platform/unix/Snapmaker_Orca.desktop

@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=OrcaSlicer
+Name=Snapmaker Orca
 GenericName=3D Printing Software
-Icon=OrcaSlicer
-Exec=orca-slicer %U
+Icon=Snapmaker_Orca
+Exec=snapmaker-orca %U
 Terminal=false
 Type=Application
-MimeType=model/stl;model/3mf;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;x-scheme-handler/orcaslicer;
+MimeType=model/stl;model/3mf;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
 Categories=Graphics;3DGraphics;Engineering;
 Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
 StartupNotify=false
-StartupWMClass=orca-slicer
+StartupWMClass=snapmaker-orca

src/dev-utils/platform/unix/build_appimage.sh.in

@@ -2,7 +2,7 @@
 APPIMAGETOOLURL="https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$(uname -m).AppImage"
 
 
-APP_IMAGE="@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage"
+APP_IMAGE="@SLIC3R_APP_KEY@_Linux_V@Snapmaker_VERSION@.AppImage"
 
 wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage
 chmod +x ../appimagetool.AppImage
@@ -29,8 +29,6 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
 EOF
 
 
-export ARCH=$(uname -m)
-
 if [ -f /.dockerenv ] ; then # Only run if inside of a Docker Container
   ../appimagetool.AppImage --appimage-extract-and-run . $([ ! -z "${container}" ] && echo '--appimage-extract-and-run')
 else