From 92d5b560dd6b4a17912bec0cc5ea2ea49605c488 Mon Sep 17 00:00:00 2001 From: alves Date: Fri, 16 Jan 2026 12:00:46 +0800 Subject: [PATCH 1/3] feature update sentry dsn. --- src/sentry_wrapper/SentryWrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry_wrapper/SentryWrapper.cpp b/src/sentry_wrapper/SentryWrapper.cpp index 562e82b0d4..53cfc6544f 100644 --- a/src/sentry_wrapper/SentryWrapper.cpp +++ b/src/sentry_wrapper/SentryWrapper.cpp @@ -127,7 +127,7 @@ static sentry_value_t before_send(sentry_value_t event, void* hint, void* data) void initSentryEx() { sentry_options_t* options = sentry_options_new(); - std::string dsn = std::string("https://c74b617c2aedc291444d3a238d23e780@o4508125599563776.ingest.us.sentry.io/4510425163956224"); + std::string dsn = std::string("https://282935326eecb9758e7f84a2ad3ae0ab@o4508125599563776.ingest.us.sentry.io/4510425163956224"); { sentry_options_set_dsn(options, dsn.c_str()); std::string handlerDir = ""; From f374b14ea0f2f43c27f782b3b0a32fa29536e12e Mon Sep 17 00:00:00 2001 From: alves Date: Fri, 16 Jan 2026 15:36:30 +0800 Subject: [PATCH 2/3] feature add logic for force upgrade dialog res. --- src/slic3r/GUI/GUI_App.cpp | 4 +++- src/slic3r/GUI/ReleaseNote.cpp | 19 ++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index e506b384d4..d6760551f9 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2521,7 +2521,6 @@ bool GUI_App::on_init_inner() UpdateVersionDialog dialog(this->mainframe); wxString extmsg = wxString::FromUTF8(version_info.description); dialog.update_version_info(extmsg, version_info.version_str); - //dialog.update_version_info(version_info.description); if (evt.GetInt() != 0) { dialog.m_button_skip_version->Hide(); } @@ -2561,6 +2560,9 @@ bool GUI_App::on_init_inner() case wxID_NO: wxGetApp().mainframe->Close(true); break; + case wxID_CANCEL: + wxGetApp().mainframe->Close(true); + break; default: wxGetApp().mainframe->Close(true); } diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index b8f2b0a210..f67f9a5d05 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -96,7 +96,6 @@ ReleaseNoteDialog::ReleaseNoteDialog(Plater *plater /*= nullptr*/) ReleaseNoteDialog::~ReleaseNoteDialog() {} - void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect) { } @@ -129,19 +128,14 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(30)); wxBoxSizer* m_sizer_body = new wxBoxSizer(wxHORIZONTAL); - - - auto sm = create_scaled_bitmap("Snapmaker_Orca", nullptr, 55); auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(55), FromDIP(55))); - wxBoxSizer* m_sizer_right = new wxBoxSizer(wxVERTICAL); m_text_up_info = new Label(this, Label::Head_13, wxEmptyString, LB_AUTO_WRAP); m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1)); m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30)); - operation_tips = new ::Label(this, Label::Body_12, _L("Click OK to update the Network plug-in when Snapmaker Orca launches next time."), LB_AUTO_WRAP); operation_tips->SetMinSize(wxSize(FromDIP(260), -1)); operation_tips->SetMaxSize(wxSize(FromDIP(260), -1)); @@ -213,7 +207,6 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) UpdatePluginDialog::~UpdatePluginDialog() {} - void UpdatePluginDialog::on_dpi_changed(const wxRect& suggested_rect) { } @@ -269,18 +262,11 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1)); m_line_top->SetBackgroundColour(wxColour(166, 169, 170)); - - wxBoxSizer *m_sizer_body = new wxBoxSizer(wxHORIZONTAL); - - - + wxBoxSizer *m_sizer_body = new wxBoxSizer(wxHORIZONTAL); auto sm = create_scaled_bitmap("Snapmaker_Orca", nullptr, 70); - m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); - - + m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); wxBoxSizer *m_sizer_right = new wxBoxSizer(wxVERTICAL); - m_text_up_info = new Label(this, Label::Head_14, wxEmptyString, LB_AUTO_WRAP); m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30)); @@ -424,7 +410,6 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) UpdateVersionDialog::~UpdateVersionDialog() {} - wxWebView* UpdateVersionDialog::CreateTipView(wxWindow* parent) { wxWebView* tipView = WebView::CreateWebView(parent, ""); From d6f2972429a6bef8a2f949a700c8a5d74856b6a5 Mon Sep 17 00:00:00 2001 From: alves Date: Fri, 16 Jan 2026 17:54:33 +0800 Subject: [PATCH 3/3] feature diff country on local area for update preset web resource. --- src/libslic3r/AppConfig.cpp | 21 +++++++++++++-------- src/slic3r/GUI/GUI_App.cpp | 3 ++- src/slic3r/GUI/MainFrame.cpp | 4 ++-- src/slic3r/GUI/MsgDialog.cpp | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index c2c16142ca..de8814679e 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -1441,11 +1441,12 @@ std::string AppConfig::config_path() std::string AppConfig::get_preset_upgrade_url() { std::string localLanguage = get("language"); - //("/upgrade/orca/win/"); - std::string url = APP_UPDATE_URL_BASE_EN + PROFILE_UPDATE_URL + std::string("version.json"); - auto countryArea = get_country_code(); + if (localLanguage != "zh_CN") + localLanguage = "en"; + std::string url = APP_UPDATE_URL_BASE_EN + PROFILE_UPDATE_URL + localLanguage + std::string("/version.json"); + auto countryArea = get_country_code(); if (countryArea == std::string("CN")) - url = APP_UPDATE_URL_BASE_CN + PROFILE_UPDATE_URL + std::string("version.json"); + url = APP_UPDATE_URL_BASE_CN + PROFILE_UPDATE_URL + localLanguage + std::string("/version.json"); return url; } @@ -1453,10 +1454,12 @@ std::string AppConfig::get_preset_upgrade_url() std::string AppConfig::get_web_resource_upgrade_url() { std::string localLanguage = get("language"); - std::string url = APP_UPDATE_URL_BASE_EN + FLUTTER_UPDATE_URL + std::string("version.json"); - auto countryArea = get_country_code(); + if (localLanguage != "zh_CN") + localLanguage = "en"; + std::string url = APP_UPDATE_URL_BASE_EN + FLUTTER_UPDATE_URL + localLanguage + std::string("/version.json"); + auto countryArea = get_country_code(); if (countryArea == std::string("CN")) - url = APP_UPDATE_URL_BASE_CN + FLUTTER_UPDATE_URL + std::string("version.json"); + url = APP_UPDATE_URL_BASE_CN + FLUTTER_UPDATE_URL + localLanguage + std::string("/version.json"); return url; } @@ -1465,7 +1468,9 @@ std::string AppConfig::get_version_upgrade_url(bool stable_only /* = false*/) { //get local area and get the resource from diff server std::string localLanguage = get("language"); - std::string url = APP_UPDATE_URL_BASE_EN + APP_UPDATE_URL + localLanguage + std::string("/version.json"); + if (localLanguage != "zh_CN") + localLanguage = "en"; + std::string url = APP_UPDATE_URL_BASE_EN + APP_UPDATE_URL + localLanguage + std::string("/version.json"); auto countryArea = get_country_code(); if (countryArea == std::string("CN")) url = APP_UPDATE_URL_BASE_CN + APP_UPDATE_URL + localLanguage + std::string("/version.json"); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index d6760551f9..b528aab5df 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2549,7 +2549,7 @@ bool GUI_App::on_init_inner() false, wxCENTER | wxICON_INFORMATION); dialog.SetExtendedMessage(description_text); - + int result = dialog.ShowModal(); switch (result) { @@ -4862,6 +4862,7 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user) return; } + //if (true) if (isForceUpgrade) { wxGetApp().app_config->set_bool("force_upgrade", version_info.force_upgrade); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 94c67c8d20..2eb43b2cfd 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2298,7 +2298,7 @@ static wxMenu* generate_help_menu() }); append_menu_item( - helpMenu, wxID_ANY, _L("Check for Preset Update"), _L("Check for Preset Update"), + helpMenu, wxID_ANY, _L("Check for Process Preset Updates"), _L("Check for Process Preset Updates"), [](wxCommandEvent&) { wxGetApp().check_preset_version(); @@ -2306,7 +2306,7 @@ static wxMenu* generate_help_menu() "", nullptr, []() { return true; }); append_menu_item( - helpMenu, wxID_ANY, _L("Check for Web Update"), _L("Check for Web Update"), + helpMenu, wxID_ANY, _L("Check for Web ResourceUpdates"), _L("Check for Web ResourceUpdates"), [](wxCommandEvent&) { wxGetApp().check_web_version(); }, diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index b7d9b63e8b..31cff49156 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -441,7 +441,7 @@ DownloadDialog::DownloadDialog(wxWindow *parent, const wxString &msg, const wxSt : MsgDialog(parent, title, msg, style), msg(msg) { add_button(wxID_YES, true, _L("Download")); - add_button(wxID_CANCEL, true, _L("Skip")); + //add_button(wxID_CANCEL, true, _L("Skip")); finalize(); }