3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENH:X1 and X1C do not display privacy agreement licenses

Browse source 
Change-Id: I8d54067062676c849f50a298efc6d48a015eb5ef
This commit is contained in:
tao wang 2023-05-26 14:26:07 +08:00 • committed by Lane.Wei
parent befdbe3d2a
commit 4552699bde
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/slic3r/GUI/BindDialog.cpp
View file

@ -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<BindJob>(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;