From 4030bde50df95e6ee861aa7369e7e15cf61f36a9 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 29 Nov 2024 17:54:45 +0800 Subject: [PATCH] FIX:replace button click event for pop dialog jira:[none] Change-Id: I2d36a10ffeb128f1fcc8aedab5eb5ea286f8a1dc --- src/slic3r/GUI/ReleaseNote.cpp | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 1b036609e..bfe1a26f4 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -264,16 +264,16 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL); 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); - + auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70); m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); - + wxBoxSizer *m_sizer_right = new wxBoxSizer(wxVERTICAL); @@ -311,7 +311,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) m_simplebook_release_note->AddPage(m_vebview_release_note, wxEmptyString, false); - + m_bitmap_open_in_browser = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("open_in_browser", this, 12), wxDefaultPosition, wxDefaultSize, 0 ); m_link_open_in_browser = new wxHyperlinkCtrl(this, wxID_ANY, "Open in browser", ""); m_link_open_in_browser->SetFont(Label::Body_12); @@ -347,7 +347,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) m_button_skip_version->SetMinSize(wxSize(FromDIP(58), FromDIP(24))); m_button_skip_version->SetCornerRadius(FromDIP(12)); - m_button_skip_version->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { + m_button_skip_version->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { wxGetApp().set_skip_version(true); EndModal(wxID_NO); }); @@ -366,7 +366,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) }); m_sizer_main->Add(m_line_top, 0, wxEXPAND | wxBOTTOM, 0); - + sizer_button->Add(m_bitmap_open_in_browser, 0, wxALIGN_CENTER | wxLEFT, FromDIP(7)); sizer_button->Add(m_link_open_in_browser, 0, wxALIGN_CENTER| wxLEFT, FromDIP(3)); //sizer_button->Add(m_remind_choice, 0, wxALL | wxEXPAND, FromDIP(5)); @@ -498,7 +498,7 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve } } } - + if (use_web_link) { m_brand->Hide(); @@ -583,7 +583,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons m_button_ok->SetMaxSize(wxSize(-1, FromDIP(24))); m_button_ok->SetCornerRadius(FromDIP(12)); - m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { + m_button_ok->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) { wxCommandEvent evt(EVT_SECONDARY_CHECK_CONFIRM, GetId()); e.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); @@ -600,7 +600,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons m_button_retry->SetMaxSize(wxSize(-1, FromDIP(24))); m_button_retry->SetCornerRadius(FromDIP(12)); - m_button_retry->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { + m_button_retry->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) { wxCommandEvent evt(EVT_SECONDARY_CHECK_RETRY, GetId()); e.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); @@ -616,7 +616,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons m_button_cancel->SetMaxSize(wxSize(-1, FromDIP(24))); m_button_cancel->SetCornerRadius(FromDIP(12)); - m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { + m_button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) { wxCommandEvent evt(EVT_SECONDARY_CHECK_CANCEL); e.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); @@ -632,7 +632,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons m_button_fn->SetMaxSize(wxSize(-1, FromDIP(24))); m_button_fn->SetCornerRadius(FromDIP(12)); - m_button_fn->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { + m_button_fn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) { post_event(wxCommandEvent(EVT_SECONDARY_CHECK_DONE)); e.Skip(); }); @@ -646,7 +646,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons m_button_resume->SetMaxSize(wxSize(-1, FromDIP(24))); m_button_resume->SetCornerRadius(FromDIP(12)); - m_button_resume->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) { + m_button_resume->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxCommandEvent& e) { post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME)); e.Skip(); }); @@ -833,11 +833,11 @@ SecondaryCheckDialog::~SecondaryCheckDialog() void SecondaryCheckDialog::on_dpi_changed(const wxRect& suggested_rect) { - rescale(); + rescale(); } -void SecondaryCheckDialog::msw_rescale() { - wxGetApp().UpdateFrameDarkUI(this); +void SecondaryCheckDialog::msw_rescale() { + wxGetApp().UpdateFrameDarkUI(this); Refresh(); } @@ -1244,7 +1244,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id m_button_cancel->Hide(); else m_button_cancel->Show(); - + m_button_update_nozzle = new Button(this, _L("Confirm and Update Nozzle")); m_button_update_nozzle->SetBackgroundColor(btn_bg_white); m_button_update_nozzle->SetBorderColor(wxColour(38, 46, 48)); @@ -1334,7 +1334,7 @@ void ConfirmBeforeSendDialog::update_text(std::vector tex sizer_text_release_note->Add(label_item, 0, wxALIGN_CENTER | wxALL, FromDIP(3)); height += label_item->GetSize().y; } - + m_vebview_release_note->Layout(); if (height < FromDIP(380)) m_vebview_release_note->SetMinSize(wxSize(FromDIP(400), height + FromDIP(25))); @@ -1697,7 +1697,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent) m_sizer_main_right->Add(0, 0, 0, wxTOP, FromDIP(4)); m_sizer_main_right->Add(m_status_bar->get_panel(), 0,wxRIGHT|wxEXPAND, FromDIP(18)); m_sizer_main_right->Layout(); - + m_sizer_main->Add(m_sizer_main_left, 0, wxLEFT, FromDIP(18)); m_sizer_main->Add(m_sizer_main_right, 0, wxLEFT|wxEXPAND, FromDIP(4)); m_sizer_main->Layout(); @@ -1713,7 +1713,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent) m_sizer_body->Add(m_sizer_button, 0, wxRIGHT | wxEXPAND, FromDIP(25)); m_sizer_body->Add(0, 0, 0, wxTOP, FromDIP(10)); m_sizer_body->Layout(); - + switch_input_panel(0); SetSizer(m_sizer_body); @@ -1776,7 +1776,7 @@ void InputIpAddressDialog::on_cancel() delete m_thread; m_thread = nullptr; } - + EndModal(wxID_CANCEL); } @@ -1796,7 +1796,7 @@ void InputIpAddressDialog::set_machine_obj(MachineObject* obj) auto diagram_bmp = create_scaled_bitmap(img_str + "_en", this, 198); m_img_help->SetBitmap(diagram_bmp); - + auto str_ip = m_input_ip->GetTextCtrl()->GetValue(); auto str_access_code = m_input_access_code->GetTextCtrl()->GetValue(); if (isIp(str_ip.ToStdString()) && str_access_code.Length() == 8) { @@ -1834,7 +1834,7 @@ void InputIpAddressDialog::update_test_msg(wxString msg,bool connected) m_test_wrong_msg->SetLabelText(msg); m_test_wrong_msg->SetMinSize(wxSize(FromDIP(352), -1)); m_test_wrong_msg->SetMaxSize(wxSize(FromDIP(352), -1)); - } + } } Layout(); @@ -2002,7 +2002,7 @@ void InputIpAddressDialog::on_check_ip_address_failed(wxCommandEvent& evt) Layout(); Fit(); } - + m_button_ok->Enable(true); StateColor btn_bg_green(std::pair(wxColour(61, 203, 115), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));