From f374b14ea0f2f43c27f782b3b0a32fa29536e12e Mon Sep 17 00:00:00 2001 From: alves Date: Fri, 16 Jan 2026 15:36:30 +0800 Subject: [PATCH] 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, "");