feature update copy right info

CMakeLists.txt

@@ -59,6 +59,14 @@ include("version.inc")
 include(GNUInstallDirs)
 include(CMakeDependentOption)
 
+# Set SLIC3R_BUILD_ID from Snapmaker_VERSION if not already defined
+if(NOT DEFINED SLIC3R_BUILD_ID OR SLIC3R_BUILD_ID STREQUAL "")
+    set(SLIC3R_BUILD_ID "${Snapmaker_VERSION}")
+endif()
+
+# Create Windows RC compatible version format (comma-separated: MAJOR,MINOR,PATCH,0)
+set(SLIC3R_RC_VERSION "${ORCA_VERSION_MAJOR},${ORCA_VERSION_MINOR},${ORCA_VERSION_PATCH},0")
+
 set(SLIC3R_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
 file(TO_NATIVE_PATH "${SLIC3R_RESOURCES_DIR}" SLIC3R_RESOURCES_DIR_WIN)
 

resources/web/guide/3/3.js

@@ -44,12 +44,10 @@ function GotoNextPage()
 	var errorTip = document.getElementById('errorTip');
 	
 	if (!checkbox.checked) {
-		// 未勾选复选框，显示错误提示
 		errorTip.style.display = 'block';
 		return;
 	}
 	
-	// 已勾选，隐藏错误提示并继续
 	errorTip.style.display = 'none';
 	SendPrivacyChoice("agree");
 	window.location.href="../21/index.html";
@@ -60,11 +58,9 @@ function OnCheckboxChange()
 	var checkbox = document.getElementById('agreeCheckbox');
 	var errorTip = document.getElementById('errorTip');
 	
-	// 勾选时隐藏错误提示
 	if (checkbox.checked) {
 		errorTip.style.display = 'none';
 	}
-	// 取消勾选时不显示错误提示（只有点击按钮时才检查）
 }
 
 
@@ -115,11 +111,10 @@ function OpenCrossBorderNotice()
 {
 	var noticeUrl = "";
 	
-	// 个人信息出境告知书链接
 	if(m_Region === "Chinese Mainland") {
-		noticeUrl = "https://www.snapmaker.cn/cross-border-notice";
+		noticeUrl = "https://snapmaker.cn/personal-info-export";
 	} else {
-		noticeUrl = "https://www.snapmaker.com/cross-border-notice";
+		noticeUrl = "https://www.snapmaker.com/personal-info-export";
 	}
 	
 	var tSend={};

src/CMakeLists.txt

@@ -96,7 +96,7 @@ if(ORCA_TOOLS)
             MACOSX_BUNDLE_BUNDLE_VERSION "${SLIC3R_VERSION}"
             MACOSX_BUNDLE_SHORT_VERSION_STRING "${SLIC3R_VERSION}"
             MACOSX_BUNDLE_IDENTIFIER "com.Snapmaker.Snapmaker_Orca.profile-validator"
-            MACOSX_BUNDLE_COPYRIGHT "© 2024 SoftFever"
+            MACOSX_BUNDLE_COPYRIGHT "Copyright © 2024-2025 Snapmaker. All rights reserved."
             MACOSX_BUNDLE_GUI_IDENTIFIER "com.Snapmaker.Snapmaker_Orca.profile-validator"
         )
     else()
@@ -294,7 +294,7 @@ else ()
             MACOSX_BUNDLE TRUE
             MACOSX_BUNDLE_BUNDLE_NAME "Snapmaker Orca"
             MACOSX_BUNDLE_SHORT_VERSION_STRING ${Snapmaker_VERSION}
-            MACOSX_BUNDLE_COPYRIGHT "Copyright(C) 2022-2024 Li Jiang All Rights Reserved")
+            MACOSX_BUNDLE_COPYRIGHT "Copyright © 2024-2025 Snapmaker. All rights reserved.")
         # Get the bundle directory by going up from the executable to the .app bundle
         if (CMAKE_CONFIGURATION_TYPES)
             set(BIN_RESOURCES_DIR "$<TARGET_FILE_DIR:Snapmaker_Orca>/../Resources")

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

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION @SLIC3R_VERSION@
+FILEVERSION @SLIC3R_RC_VERSION@
-PRODUCTVERSION @SLIC3R_VERSION@
+PRODUCTVERSION @SLIC3R_RC_VERSION@
 {
  BLOCK "StringFileInfo"
  {
@@ -12,7 +12,7 @@ PRODUCTVERSION @SLIC3R_VERSION@
    VALUE "ProductName", "@SLIC3R_APP_NAME@ G-code Viewer"
    VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
    VALUE "InternalName", "@SLIC3R_APP_NAME@ G-code Viewer"
-   VALUE "LegalCopyright", ""
+   VALUE "LegalCopyright", "Copyright © 2024-2025 Snapmaker. All rights reserved."
    VALUE "OriginalFilename", "bambu-gcodeviewer.exe"
   }
  }

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

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION @SLIC3R_VERSION@
+FILEVERSION @SLIC3R_RC_VERSION@
-PRODUCTVERSION @SLIC3R_VERSION@
+PRODUCTVERSION @SLIC3R_RC_VERSION@
 {
  BLOCK "StringFileInfo"
  {
@@ -12,8 +12,8 @@ PRODUCTVERSION @SLIC3R_VERSION@
    VALUE "ProductName", "@SLIC3R_APP_NAME@"
    VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
    VALUE "InternalName", "@SLIC3R_APP_NAME@"
-   VALUE "LegalCopyright", ""
+   VALUE "LegalCopyright", "Copyright © 2024-2025 Snapmaker. All rights reserved."
-   VALUE "OriginalFilename", "snapmaker-orca.exe"
+   VALUE "OriginalFilename", "Snapmaker_Orca.exe"
   }
  }
  BLOCK "VarFileInfo"

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

@@ -5,7 +5,7 @@
   <key>CFBundleExecutable</key>
   <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleGetInfoString</key>
-  <string>@SLIC3R_APP_NAME@ Copyright(C) 2021-2023 Lunkuo All Rights Reserved</string>
+  <string>@SLIC3R_APP_NAME@ Copyright © 2024-2025 Snapmaker. All rights reserved.</string>
   <key>CFBundleIconFile</key>
   <string>images/Snapmaker_Orca.icns</string>
   <key>CFBundleName</key>
@@ -13,7 +13,7 @@
   <key>CFBundleShortVersionString</key>
   <string>@SLIC3R_APP_NAME@ @SLIC3R_BUILD_ID@</string>
   <key>CFBundleIdentifier</key>
-  <string>com.softfever3d.orca-slic3r/</string>
+  <string>com.snapmaker.snapmaker-orca</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundlePackageType</key>

src/slic3r/GUI/AboutDialog.cpp

@@ -333,7 +333,7 @@ AboutDialog::AboutDialog()
 
     copyright_hor_sizer->Add(copyright_ver_sizer, 0, wxLEFT, FromDIP(20));
 
-    wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright (C) 2024 Snapmaker All Rights Reserved", wxDefaultPosition, wxDefaultSize);
+    wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright © 2024-2025 Snapmaker. All rights reserved.", wxDefaultPosition, wxDefaultSize);
     html_text->SetForegroundColour(wxColour(107, 107, 107));
 
     copyright_ver_sizer->Add(html_text, 0, wxALL , 0);