Merge: Snapmaker Orca 2.1.2

This commit is contained in:
xiaoyeliu
2025-11-17 10:04:25 +08:00
parent 737948be1f
commit e89263e51a
1147 changed files with 668188 additions and 15290 deletions

View File

@@ -211,7 +211,7 @@ static bool should_dialog_be_shown()
// Following function saves current OrcaSlicer version into app config.
// Following function saves current Snapmaker Orca version into app config.
// It will be later used to decide whether to open the dialog or not.
static void save_version()
{
@@ -403,7 +403,7 @@ static std::string generate_system_info_json()
namespace pt = boost::property_tree;
pt::ptree data_node;
data_node.put("OrcaSlicerVersion", SLIC3R_VERSION);
data_node.put("Snapmaker_OrcaVersion", SLIC3R_VERSION);
data_node.put("BuildID", SLIC3R_BUILD_ID);
data_node.put("UniqueID", unique_id);
data_node.put("Platform", platform_to_string(platform()));
@@ -608,7 +608,7 @@ SendSystemInfoDialog::SendSystemInfoDialog(wxWindow* parent)
wxString html = GUI::format_wxstr(
"<html><body bgcolor=%1%><font color=%2%>"
"<table><tr><td>"
"<img src = \"" + resources_dir() + "/images/OrcaSlicer_192px.png\" />"
"<img src = \"" + resources_dir() + "/images/Snapmaker_Orca_192px.png\" />"
"</td><td align=\"left\">"
+ text0 + "<br / ><br / >"
+ text1 + "<br /><br />"