diff --git a/resources/images/input_access_code_n1_cn.png b/resources/images/input_access_code_n1_cn.png new file mode 100644 index 0000000000..773dc0314b Binary files /dev/null and b/resources/images/input_access_code_n1_cn.png differ diff --git a/resources/images/input_access_code_n1_en.png b/resources/images/input_access_code_n1_en.png new file mode 100644 index 0000000000..0ebdf87fc2 Binary files /dev/null and b/resources/images/input_access_code_n1_en.png differ diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp index 8c9f790501..e0a5171d3f 100644 --- a/src/slic3r/GUI/ConnectPrinter.cpp +++ b/src/slic3r/GUI/ConnectPrinter.cpp @@ -8,7 +8,6 @@ namespace Slic3r { namespace GUI { ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) : DPIDialog(parent, id, _L("ConnectPrinter(LAN)"), pos, size, style) { - init_bitmap(); SetBackgroundColour(*wxWHITE); this->SetSizeHints(wxDefaultSize, wxDefaultSize); @@ -86,7 +85,7 @@ ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, cons wxBoxSizer *sizer_diagram; sizer_diagram = new wxBoxSizer(wxHORIZONTAL); - m_bitmap_diagram = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(340), FromDIP(190)), 0); + m_bitmap_diagram = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(340), -1), 0); m_bitmap_diagram->SetBitmap(m_diagram_img); sizer_diagram->Add(m_bitmap_diagram); @@ -117,19 +116,48 @@ void ConnectPrinterDialog::init_bitmap() { AppConfig *config = get_app_config(); std::string language = config->get("language"); - if (language == "zh_CN") { - m_diagram_bmp = create_scaled_bitmap("input_access_code_cn", nullptr, 190); + + if (m_obj) { + if (m_obj->printer_type == "C11" || m_obj->printer_type == "C12") { + m_diagram_bmp = create_scaled_bitmap("input_accesscode_help2", nullptr, 190); + } + else if (m_obj->printer_type == "BL-P001" || m_obj->printer_type == "BL-P002") { + if (language == "zh_CN") { + m_diagram_bmp = create_scaled_bitmap("input_access_code_cn", nullptr, 190); + } + else { + m_diagram_bmp = create_scaled_bitmap("input_access_code_en", nullptr, 190); + } + } + else if (m_obj->printer_type == "N1") { + if (language == "zh_CN") { + m_diagram_bmp = create_scaled_bitmap("input_access_code_n1_cn", nullptr, 250); + } + else { + m_diagram_bmp = create_scaled_bitmap("input_access_code_n1_en", nullptr, 250); + } + } } - else{ - m_diagram_bmp = create_scaled_bitmap("input_access_code_en", nullptr, 190); + else { + if (language == "zh_CN") { + m_diagram_bmp = create_scaled_bitmap("input_access_code_cn", nullptr, 190); + } + else { + m_diagram_bmp = create_scaled_bitmap("input_access_code_en", nullptr, 190); + } } m_diagram_img = m_diagram_bmp.ConvertToImage(); - m_diagram_img.Rescale(FromDIP(340), FromDIP(190)); + auto bmp_size = m_diagram_bmp.GetSize(); + float scale = (float)FromDIP(340) / (float)bmp_size.x; + m_diagram_img.Rescale(FromDIP(340), bmp_size.y * scale); + m_bitmap_diagram->SetBitmap(m_diagram_img); + Fit(); } void ConnectPrinterDialog::set_machine_object(MachineObject* obj) { m_obj = obj; + init_bitmap(); } void ConnectPrinterDialog::on_input_enter(wxCommandEvent& evt) diff --git a/src/slic3r/GUI/ConnectPrinter.hpp b/src/slic3r/GUI/ConnectPrinter.hpp index d73a3ba63f..db45bd1180 100644 --- a/src/slic3r/GUI/ConnectPrinter.hpp +++ b/src/slic3r/GUI/ConnectPrinter.hpp @@ -34,7 +34,7 @@ protected: wxBitmap m_diagram_bmp; wxImage m_diagram_img; - MachineObject* m_obj; + MachineObject* m_obj{ nullptr }; wxString m_input_access_code; public: ConnectPrinterDialog(wxWindow * parent, diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 6c57631113..5e7cb41797 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -147,7 +147,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin wxBoxSizer* extra_ams_content_sizer = new wxBoxSizer(wxVERTICAL); extra_ams_content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5)); m_extra_ams_panel = new ExtraAmsPanel(this); - m_extra_ams_panel->m_staticText_ams->SetLabel("F1"); + m_extra_ams_panel->m_staticText_ams->SetLabel("AMS Lite"); extra_ams_content_sizer->Add(m_extra_ams_panel, 0, wxEXPAND, 0); m_extra_ams_sizer->Add(extra_ams_content_sizer, 1, wxEXPAND, 0);