diff --git a/resources/images/bed_cool.png b/resources/images/bed_cool.png index 41234a1ac5..625ebd6325 100644 Binary files a/resources/images/bed_cool.png and b/resources/images/bed_cool.png differ diff --git a/resources/images/bed_cool_supertack.png b/resources/images/bed_cool_supertack.png index cf05fb85ea..1c13570943 100644 Binary files a/resources/images/bed_cool_supertack.png and b/resources/images/bed_cool_supertack.png differ diff --git a/resources/images/bed_cool_supertack_mini.png b/resources/images/bed_cool_supertack_mini.png deleted file mode 100644 index b363b43093..0000000000 Binary files a/resources/images/bed_cool_supertack_mini.png and /dev/null differ diff --git a/resources/images/bed_engineering.png b/resources/images/bed_engineering.png index 9fe23a2666..62a3ad9093 100644 Binary files a/resources/images/bed_engineering.png and b/resources/images/bed_engineering.png differ diff --git a/resources/images/bed_high_templ.png b/resources/images/bed_high_templ.png index 3fe8a603c8..d7f80aee92 100644 Binary files a/resources/images/bed_high_templ.png and b/resources/images/bed_high_templ.png differ diff --git a/resources/images/bed_high_templ_mini.png b/resources/images/bed_high_templ_mini.png deleted file mode 100644 index 6036556c0a..0000000000 Binary files a/resources/images/bed_high_templ_mini.png and /dev/null differ diff --git a/resources/images/bed_high_templ_o.png b/resources/images/bed_high_templ_o.png deleted file mode 100644 index f0fadb7667..0000000000 Binary files a/resources/images/bed_high_templ_o.png and /dev/null differ diff --git a/resources/images/bed_pei.png b/resources/images/bed_pei.png index 4a1913516d..c942905304 100644 Binary files a/resources/images/bed_pei.png and b/resources/images/bed_pei.png differ diff --git a/resources/images/bed_plate_cool_textured.png b/resources/images/bed_pei_cool.png similarity index 100% rename from resources/images/bed_plate_cool_textured.png rename to resources/images/bed_pei_cool.png diff --git a/resources/images/bed_pei_mini.png b/resources/images/bed_pei_mini.png deleted file mode 100644 index cea0373230..0000000000 Binary files a/resources/images/bed_pei_mini.png and /dev/null differ diff --git a/resources/images/bed_pei_o.png b/resources/images/bed_pei_o.png deleted file mode 100644 index d6fd7ce0a6..0000000000 Binary files a/resources/images/bed_pei_o.png and /dev/null differ diff --git a/resources/images/bed_plate_cool_smooth.png b/resources/images/bed_plate_cool_smooth.png deleted file mode 100644 index 625ebd6325..0000000000 Binary files a/resources/images/bed_plate_cool_smooth.png and /dev/null differ diff --git a/resources/images/bed_plate_cool_supertack.png b/resources/images/bed_plate_cool_supertack.png deleted file mode 100644 index 1c13570943..0000000000 Binary files a/resources/images/bed_plate_cool_supertack.png and /dev/null differ diff --git a/resources/images/bed_plate_engineering.png b/resources/images/bed_plate_engineering.png deleted file mode 100644 index 62a3ad9093..0000000000 Binary files a/resources/images/bed_plate_engineering.png and /dev/null differ diff --git a/resources/images/bed_plate_high_temp_smooth.png b/resources/images/bed_plate_high_temp_smooth.png deleted file mode 100644 index d7f80aee92..0000000000 Binary files a/resources/images/bed_plate_high_temp_smooth.png and /dev/null differ diff --git a/resources/images/bed_plate_pei.png b/resources/images/bed_plate_pei.png deleted file mode 100644 index c942905304..0000000000 Binary files a/resources/images/bed_plate_pei.png and /dev/null differ diff --git a/resources/images/big_bed_cool.png b/resources/images/big_bed_cool.png index 2d2917e2ed..66ea212bc3 100644 Binary files a/resources/images/big_bed_cool.png and b/resources/images/big_bed_cool.png differ diff --git a/resources/images/big_bed_cool_supertack.png b/resources/images/big_bed_cool_supertack.png index 87ab558248..bbd607e7a8 100644 Binary files a/resources/images/big_bed_cool_supertack.png and b/resources/images/big_bed_cool_supertack.png differ diff --git a/resources/images/big_bed_cool_supertack_mini.png b/resources/images/big_bed_cool_supertack_mini.png deleted file mode 100644 index 18605c6b67..0000000000 Binary files a/resources/images/big_bed_cool_supertack_mini.png and /dev/null differ diff --git a/resources/images/big_bed_engineering.png b/resources/images/big_bed_engineering.png index 7cdd39b641..2cd6e7fe08 100644 Binary files a/resources/images/big_bed_engineering.png and b/resources/images/big_bed_engineering.png differ diff --git a/resources/images/big_bed_high_templ.png b/resources/images/big_bed_high_templ.png index ebc1b5f237..7b3bc41569 100644 Binary files a/resources/images/big_bed_high_templ.png and b/resources/images/big_bed_high_templ.png differ diff --git a/resources/images/big_bed_high_templ_mini.png b/resources/images/big_bed_high_templ_mini.png deleted file mode 100644 index 8f5800af04..0000000000 Binary files a/resources/images/big_bed_high_templ_mini.png and /dev/null differ diff --git a/resources/images/big_bed_high_templ_o.png b/resources/images/big_bed_high_templ_o.png deleted file mode 100644 index e75df475ac..0000000000 Binary files a/resources/images/big_bed_high_templ_o.png and /dev/null differ diff --git a/resources/images/big_bed_pei.png b/resources/images/big_bed_pei.png index e87d15993d..d76c16f13c 100644 Binary files a/resources/images/big_bed_pei.png and b/resources/images/big_bed_pei.png differ diff --git a/resources/images/big_bed_plate_cool_textured.png b/resources/images/big_bed_pei_cool.png similarity index 100% rename from resources/images/big_bed_plate_cool_textured.png rename to resources/images/big_bed_pei_cool.png diff --git a/resources/images/big_bed_pei_mini.png b/resources/images/big_bed_pei_mini.png deleted file mode 100644 index 18878f8147..0000000000 Binary files a/resources/images/big_bed_pei_mini.png and /dev/null differ diff --git a/resources/images/big_bed_pei_o.png b/resources/images/big_bed_pei_o.png deleted file mode 100644 index 51a5bef46a..0000000000 Binary files a/resources/images/big_bed_pei_o.png and /dev/null differ diff --git a/resources/images/big_bed_plate_cool_smooth.png b/resources/images/big_bed_plate_cool_smooth.png deleted file mode 100644 index 66ea212bc3..0000000000 Binary files a/resources/images/big_bed_plate_cool_smooth.png and /dev/null differ diff --git a/resources/images/big_bed_plate_cool_supertack.png b/resources/images/big_bed_plate_cool_supertack.png deleted file mode 100644 index bbd607e7a8..0000000000 Binary files a/resources/images/big_bed_plate_cool_supertack.png and /dev/null differ diff --git a/resources/images/big_bed_plate_engineering.png b/resources/images/big_bed_plate_engineering.png deleted file mode 100644 index 2cd6e7fe08..0000000000 Binary files a/resources/images/big_bed_plate_engineering.png and /dev/null differ diff --git a/resources/images/big_bed_plate_high_temp_smooth.png b/resources/images/big_bed_plate_high_temp_smooth.png deleted file mode 100644 index 7b3bc41569..0000000000 Binary files a/resources/images/big_bed_plate_high_temp_smooth.png and /dev/null differ diff --git a/resources/images/big_bed_plate_pei.png b/resources/images/big_bed_plate_pei.png deleted file mode 100644 index d76c16f13c..0000000000 Binary files a/resources/images/big_bed_plate_pei.png and /dev/null differ diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 937c0e6fdf..75e4e7e681 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -245,12 +245,12 @@ void Plater::show_illegal_characters_warning(wxWindow* parent) } static std::map bed_type_thumbnails = { - {BedType::btPC, "bed_plate_cool_smooth" }, //"bed_cool"}, - {BedType::btEP, "bed_plate_engineering" }, //"bed_engineering"}, - {BedType::btPEI, "bed_plate_high_temp_smooth"}, //"bed_high_templ"}, - {BedType::btPTE, "bed_plate_pei" }, //"bed_pei"}, - {BedType::btPCT, "bed_plate_cool_textured" }, //"bed_pei"}, // TODO: Orca hack - {BedType::btSuperTack, "bed_plate_cool_supertack" } //"bed_cool_supertack"} + {BedType::btPC, "bed_cool" }, + {BedType::btEP, "bed_engineering" }, + {BedType::btPEI, "bed_high_templ" }, + {BedType::btPTE, "bed_pei" }, + {BedType::btPCT, "bed_pei_cool" }, + {BedType::btSuperTack, "bed_cool_supertack" } }; // print_model_id @@ -1750,8 +1750,7 @@ Sidebar::Sidebar(Plater *parent) dlg.ShowModal(); }); */ - { - // ORCA use Show/Hide to gain text area instead using blank icon + // ORCA use Show/Hide to gain text area instead using blank icon. also manages hover effect for border for (wxWindow *w : std::initializer_list{p->panel_printer_preset, p->btn_edit_printer, p->image_printer, p->combo_printer}) { w->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent &e) { if(!p->combo_printer->HasFocus()) @@ -1764,7 +1763,7 @@ Sidebar::Sidebar(Plater *parent) }); w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_bd_col](wxMouseEvent &e) { wxWindow* next_w = wxFindWindowAtPoint(wxGetMousePosition()); - if (!next_w || (next_w != p->panel_printer_preset && next_w != p->btn_edit_printer && next_w != p->image_printer && next_w != p->combo_printer)){ + if (!next_w || !p->panel_printer_preset->IsDescendant(next_w)){ if(!p->combo_printer->HasFocus()) p->panel_printer_preset->SetBorderColor(panel_bd_col); p->btn_edit_printer->Hide(); @@ -1773,7 +1772,6 @@ Sidebar::Sidebar(Plater *parent) e.Skip(); }); } - } // ORCA unified Nozzle diameter selection p->panel_nozzle_dia = new StaticBox(p->m_panel_printer_content); @@ -1828,6 +1826,22 @@ Sidebar::Sidebar(Plater *parent) p->combo_nozzle_dia->wxEvtHandler::ProcessEvent(evt); }); + // highlight border on hover + for (wxWindow *w : std::initializer_list{p->panel_nozzle_dia, p->label_nozzle_title, p->label_nozzle_type, p->combo_nozzle_dia}) { + w->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent &e) { + if(!p->combo_nozzle_dia->HasFocus()) + p->panel_nozzle_dia->SetBorderColor(wxColour("#009688")); + e.Skip(); + }); + + w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_bd_col](wxMouseEvent &e) { + wxWindow* next_w = wxFindWindowAtPoint(wxGetMousePosition()); + if (!p->combo_nozzle_dia->HasFocus() && (!next_w || !p->panel_nozzle_dia->IsDescendant(next_w))) + p->panel_nozzle_dia->SetBorderColor(panel_bd_col); + e.Skip(); + }); + } + wxGridSizer *nozzle_dia_sizer = new wxGridSizer(3, 1, FromDIP(2), 0); nozzle_dia_sizer->Add(p->label_nozzle_title, 0, wxALIGN_CENTER | wxTOP, FromDIP(4)); nozzle_dia_sizer->Add(p->combo_nozzle_dia , 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, FromDIP(2)); @@ -1876,6 +1890,7 @@ Sidebar::Sidebar(Plater *parent) } e.Skip(); // fix bug:Event spreads to sidebar }); + p->combo_printer_bed->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent &evt) { if (p->big_bed_image_popup) { p->big_bed_image_popup->on_hide(); @@ -1898,6 +1913,21 @@ Sidebar::Sidebar(Plater *parent) p->combo_printer_bed->Bind(wxEVT_SET_FOCUS, [this, bed_focus_bg](auto& e) {bed_focus_bg(true ); e.Skip();}); p->combo_printer_bed->Bind(wxEVT_KILL_FOCUS, [this, bed_focus_bg](auto& e) {bed_focus_bg(false); e.Skip();}); + // highlight border on hover + for (wxWindow *w : std::initializer_list{p->panel_printer_bed, p->image_printer_bed, p->combo_printer_bed}) { + w->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent &e) { + if(!p->combo_printer_bed->HasFocus()) + p->panel_printer_bed->SetBorderColor(wxColour("#009688")); + e.Skip(); + }); + w->Bind(wxEVT_LEAVE_WINDOW, [this, panel_bd_col](wxMouseEvent &e) { + wxWindow* next_w = wxFindWindowAtPoint(wxGetMousePosition()); + if (!p->combo_printer_bed->HasFocus() && (!next_w || !p->panel_printer_bed->IsDescendant(next_w))) + p->panel_printer_bed->SetBorderColor(panel_bd_col); + e.Skip(); + }); + } + wxBoxSizer *bed_type_sizer = new wxBoxSizer(wxHORIZONTAL); bed_type_sizer->Add(p->combo_printer_bed, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); bed_type_sizer->Add(p->image_printer_bed, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index a03d6eb6cb..84f7f192b2 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -5026,40 +5026,42 @@ void PrinterInfoBox::UpdatePlate(const std::string& plate_name) { if (plate_name.empty()) { - m_text_bed_type->Hide(); + //m_text_bed_type->Hide(); } else { wxString name; if (plate_name == "Cool Plate") { - name = _L("Cool"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool", this, 32)); + name = _L("Smooth Cool Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool", this, 40)); } else if (plate_name == "Engineering Plate") { - name = _L("Engineering"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_engineering", this, 32)); + name = _L("Engineering Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_engineering", this, 40)); } else if (plate_name == "High Temp Plate") { - name = _L("High Temp"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_high_templ", this, 32)); + name = _L("Smooth High Temp Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_high_templ", this, 40)); } else if (plate_name == "Textured PEI Plate") { - name = "PEI"; - m_bed_image->SetBitmap(create_scaled_bitmap("bed_pei", this, 32)); + name = _L("Textured PEI Plate"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_pei", this, 40)); } else if (plate_name == "Supertack Plate") { - name = _L("Cool(Supertack)"); - m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool_supertack", this, 32)); + name = _L("Cool Plate (Supertack)"); + m_bed_image->SetBitmap(create_scaled_bitmap("bed_cool_supertack", this, 40)); } - if (name.length() > 8) { - m_text_bed_type->SetFont(Label::Body_9); - } - else{ - m_text_bed_type->SetFont(Label::Body_12); - } - m_text_bed_type->SetLabelText(name); - m_text_bed_type->Show(); + m_bed_image->SetToolTip(name); + + //if (name.length() > 8) { + // m_text_bed_type->SetFont(Label::Body_9); + //} + //else{ + // m_text_bed_type->SetFont(Label::Body_12); + //} + //m_text_bed_type->SetLabelText(name); + //m_text_bed_type->Show(); } } @@ -5209,24 +5211,26 @@ void PrinterInfoBox::Create() /*bed area*/ auto bed_staticbox = new StaticBox(this); - bed_staticbox->SetMinSize(wxSize(FromDIP(98), FromDIP(68))); - bed_staticbox->SetMaxSize(wxSize(FromDIP(98), FromDIP(68))); + bed_staticbox->SetMinSize(wxSize(FromDIP(68), FromDIP(68))); + bed_staticbox->SetMaxSize(wxSize(FromDIP(68), FromDIP(68))); bed_staticbox->SetBorderColor(wxColour("#EEEEEE")); - m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 32)); + m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 40)); m_bed_image->SetBackgroundColour(*wxWHITE); - m_bed_image->SetMinSize(wxSize(FromDIP(32), FromDIP(32))); - m_bed_image->SetMaxSize(wxSize(FromDIP(32), FromDIP(32))); + m_bed_image->SetMinSize(wxSize(FromDIP(40), FromDIP(40))); + m_bed_image->SetMaxSize(wxSize(FromDIP(40), FromDIP(40))); - m_text_bed_type = new Label(bed_staticbox); - m_text_bed_type->SetForegroundColour(wxColour(144, 144, 144)); - m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24))); - m_text_bed_type->SetFont(Label::Body_13); + //m_text_bed_type = new Label(bed_staticbox); + //m_text_bed_type->SetForegroundColour(wxColour(144, 144, 144)); + //m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24))); + //m_text_bed_type->SetFont(Label::Body_13); - sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(10)); + //sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(10)); + sizer_bed_staticbox->AddStretchSpacer(); sizer_bed_staticbox->Add(m_bed_image, 0, wxALIGN_CENTER, 0); - sizer_bed_staticbox->AddSpacer(FromDIP(6)); - sizer_bed_staticbox->Add(m_text_bed_type, 0, wxALIGN_CENTER, 0); + sizer_bed_staticbox->AddStretchSpacer(); + //sizer_bed_staticbox->AddSpacer(FromDIP(6)); + //sizer_bed_staticbox->Add(m_text_bed_type, 0, wxALIGN_CENTER, 0); bed_staticbox->SetSizer(sizer_bed_staticbox); bed_staticbox->Layout(); @@ -5238,7 +5242,7 @@ void PrinterInfoBox::Create() wxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(m_text_bed_type, 0, wxTOP, 0); + //main_sizer->Add(m_text_bed_type, 0, wxTOP, 0); main_sizer->Add(0, 0, 0, wxTOP, FromDIP(15)); main_sizer->Add(sizer_split_printer, 1, wxEXPAND, 0); main_sizer->Add(0, 0, 0, wxTOP, FromDIP(8));