diff --git a/resources/images/air_pump.png b/resources/images/air_pump.png index 887f70701f..020286451c 100644 Binary files a/resources/images/air_pump.png and b/resources/images/air_pump.png differ diff --git a/resources/images/cut.png b/resources/images/cut.png index 01bf818b30..81f83d5353 100644 Binary files a/resources/images/cut.png and b/resources/images/cut.png differ diff --git a/resources/images/extinguish.png b/resources/images/extinguish.png index ecc2960b09..c69d10929f 100644 Binary files a/resources/images/extinguish.png and b/resources/images/extinguish.png differ diff --git a/resources/images/extra_icon.png b/resources/images/extra_icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/resources/images/laser.png b/resources/images/laser.png index 98896453d6..895b3039ae 100644 Binary files a/resources/images/laser.png and b/resources/images/laser.png differ diff --git a/resources/images/laser_40.png b/resources/images/laser_40.png index 74909d116e..b6868b2c5b 100644 Binary files a/resources/images/laser_40.png and b/resources/images/laser_40.png differ diff --git a/resources/images/monitor_upgrade_ams_png.png b/resources/images/monitor_upgrade_ams_png.png index d043ad3738..e6c1e808c6 100644 Binary files a/resources/images/monitor_upgrade_ams_png.png and b/resources/images/monitor_upgrade_ams_png.png differ diff --git a/resources/images/monitor_upgrade_n3s.png b/resources/images/monitor_upgrade_n3s.png index 352f5f6771..3f3dca46dc 100644 Binary files a/resources/images/monitor_upgrade_n3s.png and b/resources/images/monitor_upgrade_n3s.png differ diff --git a/resources/images/printer_thumbnail_N7_png.png b/resources/images/printer_thumbnail_N7_png.png index a02afb2264..5ee881dbf2 100644 Binary files a/resources/images/printer_thumbnail_N7_png.png and b/resources/images/printer_thumbnail_N7_png.png differ diff --git a/resources/images/printer_thumbnail_h2d_png.png b/resources/images/printer_thumbnail_h2d_png.png index 12c268ad32..a0c64860cf 100644 Binary files a/resources/images/printer_thumbnail_h2d_png.png and b/resources/images/printer_thumbnail_h2d_png.png differ diff --git a/resources/images/printer_thumbnail_n1_png.png b/resources/images/printer_thumbnail_n1_png.png index 0ed185030e..377952a51e 100644 Binary files a/resources/images/printer_thumbnail_n1_png.png and b/resources/images/printer_thumbnail_n1_png.png differ diff --git a/resources/images/printer_thumbnail_n2s_png.png b/resources/images/printer_thumbnail_n2s_png.png index a886f834e4..9c2c2bd0ac 100644 Binary files a/resources/images/printer_thumbnail_n2s_png.png and b/resources/images/printer_thumbnail_n2s_png.png differ diff --git a/resources/images/printer_thumbnail_o1e_png.png b/resources/images/printer_thumbnail_o1e_png.png index a9d65753ac..0855761975 100644 Binary files a/resources/images/printer_thumbnail_o1e_png.png and b/resources/images/printer_thumbnail_o1e_png.png differ diff --git a/resources/images/printer_thumbnail_o1s_png.png b/resources/images/printer_thumbnail_o1s_png.png index a4e0eb5bad..5d37644b19 100644 Binary files a/resources/images/printer_thumbnail_o1s_png.png and b/resources/images/printer_thumbnail_o1s_png.png differ diff --git a/resources/images/printer_thumbnail_p1p_png.png b/resources/images/printer_thumbnail_p1p_png.png index 6aa9bd1093..d07dba60ae 100644 Binary files a/resources/images/printer_thumbnail_p1p_png.png and b/resources/images/printer_thumbnail_p1p_png.png differ diff --git a/resources/images/printer_thumbnail_p1s_png.png b/resources/images/printer_thumbnail_p1s_png.png index 48b3bd33c6..26cc4035df 100644 Binary files a/resources/images/printer_thumbnail_p1s_png.png and b/resources/images/printer_thumbnail_p1s_png.png differ diff --git a/resources/images/printer_thumbnail_png.png b/resources/images/printer_thumbnail_png.png index 50c881cbec..86bf78436d 100644 Binary files a/resources/images/printer_thumbnail_png.png and b/resources/images/printer_thumbnail_png.png differ diff --git a/resources/images/printer_thumbnail_x1c_png.png b/resources/images/printer_thumbnail_x1c_png.png index 5d6d7a315d..d29fc447c0 100644 Binary files a/resources/images/printer_thumbnail_x1c_png.png and b/resources/images/printer_thumbnail_x1c_png.png differ diff --git a/resources/images/printer_thumbnail_x1e_png.png b/resources/images/printer_thumbnail_x1e_png.png index d50a144ffb..5685b9a55b 100644 Binary files a/resources/images/printer_thumbnail_x1e_png.png and b/resources/images/printer_thumbnail_x1e_png.png differ diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp index 73d205a655..fb5f71efd1 100644 --- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp +++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp @@ -9,9 +9,11 @@ #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" #include +#define MODEL_STR L("Model:") #define SERIAL_STR L("Serial:") #define VERSION_STR L("Version:") @@ -64,45 +66,47 @@ void uiDeviceUpdateVersion::SetVersion(const wxString& cur_version, const wxStri void uiDeviceUpdateVersion::CreateWidgets() { - m_dev_name = new wxStaticText(this, wxID_ANY, "_"); - m_dev_snl = new wxStaticText(this, wxID_ANY, "_"); - m_dev_version = new wxStaticText(this, wxID_ANY, "_"); + m_dev_name = new wxStaticText(this, wxID_ANY, "-"); + m_dev_snl = new wxStaticText(this, wxID_ANY, "-"); + m_dev_version = new wxStaticText(this, wxID_ANY, "-"); wxStaticText* serial_text = new wxStaticText(this, wxID_ANY, _L(SERIAL_STR)); wxStaticText* version_text = new wxStaticText(this, wxID_ANY, _L(VERSION_STR)); + wxStaticText *model_text = new wxStaticText(this, wxID_ANY, _L(MODEL_STR)); // Use bold font - wxFont font = this->GetFont(); + wxFont font = Label::Head_14; font.SetWeight(wxFONTWEIGHT_BOLD); m_dev_name->SetFont(font); serial_text->SetFont(font); version_text->SetFont(font); + model_text->SetFont(font); // The grid sizer - wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(2, 3, 0, 0); + wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(0, 2, 0, 0); //grid_sizer->AddGrowableCol(1); grid_sizer->SetFlexibleDirection(wxHORIZONTAL); grid_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + grid_sizer->Add(model_text, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); + grid_sizer->Add(m_dev_name, 0, wxALL | wxEXPAND, FromDIP(5)); grid_sizer->Add(serial_text, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); - grid_sizer->Add(m_dev_snl, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); - grid_sizer->Add(0, 0, wxALL, wxEXPAND); + grid_sizer->Add(m_dev_snl, 0, wxALL | wxEXPAND, FromDIP(5)); m_dev_upgrade_indicator = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(5), FromDIP(5))); m_dev_upgrade_indicator->SetBitmap(ScalableBitmap(this, "monitor_upgrade_online", 5).bmp()); wxBoxSizer* version_hsizer = new wxBoxSizer(wxHORIZONTAL); - version_hsizer->Add(m_dev_upgrade_indicator, 0, wxALL, FromDIP(5)); - version_hsizer->Add(version_text, 0, wxLEFT | wxBOTTOM|wxALIGN_RIGHT, FromDIP(5)); - - grid_sizer->Add(version_hsizer, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); - grid_sizer->Add(m_dev_version, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); - grid_sizer->Add(0, 0, wxALL, wxEXPAND); + version_hsizer->Add(0, 0, 1, wxEXPAND, 0); + version_hsizer->Add(m_dev_upgrade_indicator, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5)); + version_hsizer->Add(version_text, 0, wxALL, FromDIP(5)); + grid_sizer->Add(version_hsizer, 0, wxEXPAND, 0); + grid_sizer->Add(m_dev_version, 0, wxEXPAND | wxALL, FromDIP(5)); + // Updating wxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->AddSpacer(FromDIP(20)); - main_sizer->Add(m_dev_name, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); + main_sizer->AddSpacer(FromDIP(40)); main_sizer->Add(grid_sizer, 0, wxALIGN_LEFT, FromDIP(5)); SetSizer(main_sizer); diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 842068457b..d7c03d013f 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -433,9 +433,9 @@ void MachineInfoPanel::msw_rescale() void MachineInfoPanel::init_bitmaps() { try { - m_img_printer = ScalableBitmap(this, "printer_thumbnail_png", 160); - m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams_png", 160); - m_img_ext = ScalableBitmap(this, "monitor_upgrade_ext", 160); + m_img_printer = ScalableBitmap(this, "printer_thumbnail_png", 160); + m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams_png", 150); + m_img_ext = ScalableBitmap(this, "monitor_upgrade_ext", 160); m_img_air_pump = ScalableBitmap(this, "air_pump", 160); m_img_extra_ams = ScalableBitmap(this, "extra_icon_png", 160); @@ -686,6 +686,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj) amspanel->Hide(); } + m_ahb_panel->Show(); wxString hub_sn = "-"; @@ -1025,7 +1026,7 @@ void MachineInfoPanel::update_ams_ext(MachineObject *obj) if (contain_four_slot) { if (m_img_monitor_ams.name() != "monitor_upgrade_ams") { - m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams_png", 160); + m_img_monitor_ams = ScalableBitmap(this, "monitor_upgrade_ams_png", 150); m_ams_img->SetBitmap(m_img_monitor_ams.bmp()); } } else if (contain_one_slot) { @@ -1522,6 +1523,10 @@ bool UpgradePanel::Show(bool show) ams_sizer->SetFlexibleDirection(wxHORIZONTAL); ams_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + m_staticText_ams_model_id = new wxStaticText(this, wxID_ANY, _L("Model:"), wxDefaultPosition, wxDefaultSize, 0); + m_staticText_ams_model_id->Wrap(-1); + m_staticText_ams_model_id->SetFont(Label::Head_14); + m_staticText_ams = new wxStaticText(this, wxID_ANY, "-", wxDefaultPosition, wxDefaultSize, 0); m_staticText_ams->SetForegroundColour("#262E30"); m_staticText_ams->SetFont(Label::Head_14); @@ -1564,8 +1569,8 @@ bool UpgradePanel::Show(bool show) content_info->Add(m_staticText_ams_ver_val, 0, wxALL | wxEXPAND, FromDIP(5)); content_info->Add(m_staticText_beta_version, 0, wxALL | wxEXPAND, FromDIP(5)); - ams_sizer->Add(m_staticText_ams, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); - ams_sizer->Add(0, 0, 1, wxEXPAND, 5); + ams_sizer->Add(m_staticText_ams_model_id, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); + ams_sizer->Add(m_staticText_ams, 0, wxALL, FromDIP(5)); ams_sizer->Add(m_staticText_ams_sn, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); ams_sizer->Add(m_staticText_ams_sn_val, 0, wxALL | wxEXPAND, FromDIP(5)); ams_sizer->Add(m_ams_ver_sizer, 1, wxEXPAND, FromDIP(5)); diff --git a/src/slic3r/GUI/UpgradePanel.hpp b/src/slic3r/GUI/UpgradePanel.hpp index b405e770bf..a1064fbf38 100644 --- a/src/slic3r/GUI/UpgradePanel.hpp +++ b/src/slic3r/GUI/UpgradePanel.hpp @@ -38,6 +38,7 @@ public: class AmsPanel : public wxPanel { public: + wxStaticText *m_staticText_ams_model_id; wxStaticText *m_staticText_ams; wxStaticText *m_staticText_ams_sn_val; wxStaticText *m_staticText_ams_ver_val;