From 4552699bdec83d4e1687adea868300d3b35977ef Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 26 May 2023 14:26:07 +0800 Subject: [PATCH] ENH:X1 and X1C do not display privacy agreement licenses Change-Id: I8d54067062676c849f50a298efc6d48a015eb5ef --- src/slic3r/GUI/BindDialog.cpp | 26 ++++++++++++++++++++++++-- src/slic3r/GUI/BindDialog.hpp | 3 ++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index 5e3333a003..17661e5c5d 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -195,7 +195,7 @@ wxString get_fail_reason(int code) //agreement - wxWindow* m_panel_agreement = new wxWindow(this,wxID_ANY); + m_panel_agreement = new wxWindow(this,wxID_ANY); m_panel_agreement->SetBackgroundColour(*wxWHITE); m_panel_agreement->SetMinSize(wxSize(FromDIP(450), -1)); m_panel_agreement->SetMaxSize(wxSize(FromDIP(450), -1)); @@ -613,7 +613,14 @@ wxString get_fail_reason(int code) m_simplebook->SetSelection(0); m_bind_job = std::make_shared(m_status_bar, wxGetApp().plater(), m_machine_info->dev_id, m_machine_info->dev_ip, m_machine_info->bind_sec_link); - m_bind_job->set_improved(m_allow_notice); + + if (m_machine_info && (m_machine_info->printer_type == "BL-P001" || m_machine_info->printer_type == "BL-P002")) { + m_bind_job->set_improved(false); + } + else { + m_bind_job->set_improved(m_allow_notice); + } + m_bind_job->set_event_handle(this); m_bind_job->start(); } @@ -624,6 +631,21 @@ void BindMachineDialog::on_dpi_changed(const wxRect &suggested_rect) m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE); } +void BindMachineDialog::update_machine_info(MachineObject* info) +{ + m_machine_info = info; + if (m_machine_info && (m_machine_info->printer_type == "BL-P001" || m_machine_info->printer_type == "BL-P002")) { + m_button_bind->Enable(true); + m_panel_agreement->Hide(); + } + else { + m_button_bind->Enable(false); + m_panel_agreement->Show(); + } + Layout(); + Fit(); +} + void BindMachineDialog::on_show(wxShowEvent &event) { m_allow_privacy = false; diff --git a/src/slic3r/GUI/BindDialog.hpp b/src/slic3r/GUI/BindDialog.hpp index b713a0c7e0..94b7248d67 100644 --- a/src/slic3r/GUI/BindDialog.hpp +++ b/src/slic3r/GUI/BindDialog.hpp @@ -46,6 +46,7 @@ struct MemoryStruct class BindMachineDialog : public DPIDialog { private: + wxWindow* m_panel_agreement; wxStaticText * m_printer_name; wxStaticText * m_user_name; StaticBox * m_panel_left; @@ -90,7 +91,7 @@ public: void on_bind_success(wxCommandEvent &event); void on_bind_printer(wxCommandEvent &event); void on_dpi_changed(const wxRect &suggested_rect) override; - void update_machine_info(MachineObject *info) { m_machine_info = info; }; + void update_machine_info(MachineObject *info); void on_show(wxShowEvent &event); void on_close(wxCloseEvent& event); void on_destroy();