diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index cd2f92df2..41b637a6e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3976,13 +3976,17 @@ void StatusPanel::on_axis_ctrl_z_down_10(wxCommandEvent &event) void StatusPanel::axis_ctrl_e_hint(bool up_down) { if (ctrl_e_hint_dlg == nullptr) { - ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX, true); - ctrl_e_hint_dlg->update_text(_L("Please heat the nozzle to above 170 degree before loading or unloading filament.")); - ctrl_e_hint_dlg->m_show_again_checkbox->Hide(); - ctrl_e_hint_dlg->m_button_cancel->Hide(); + /* ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, + wxDefaultSize, wxCLOSE_BOX, true); ctrl_e_hint_dlg->update_text(_L("Please heat the nozzle to above 170 degree before loading or unloading filament.")); + ctrl_e_hint_dlg->m_show_again_checkbox->Hide(); + ctrl_e_hint_dlg->m_button_cancel->Hide(); + ctrl_e_hint_dlg->m_staticText_release_note->SetMaxSize(wxSize(FromDIP(360), -1)); + ctrl_e_hint_dlg->m_staticText_release_note->SetMinSize(wxSize(FromDIP(360), -1)); + ctrl_e_hint_dlg->Fit();*/ + ctrl_e_hint_dlg = new MessageDialog(this, _L("Please heat the nozzle to above 170 degree before loading or unloading filament."), wxString(_L("Warning")), wxOK | wxCENTER); } - - ctrl_e_hint_dlg->on_show(); + ctrl_e_hint_dlg->ShowModal(); + // ctrl_e_hint_dlg->on_show(); } void StatusPanel::on_axis_ctrl_e_up_10(wxCommandEvent &event) @@ -4690,7 +4694,7 @@ void StatusPanel::on_print_error_dlg_btn_clicked(wxCommandEvent& event) case Slic3r::GUI::PrintErrorDialog::NO_REMINDER_NEXT_TIME: { obj->command_hms_idle_ignore(std::to_string(before_error_code), 0); /*the type is 0, supported by AP*/ break; - } + } case Slic3r::GUI::PrintErrorDialog::IGNORE_NO_REMINDER_NEXT_TIME: { obj->command_hms_ignore(std::to_string(before_error_code), obj->job_id_); break; @@ -4964,7 +4968,7 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event) }); wxWindow* ctrl = (wxWindow*)event.GetEventObject(); wxPoint pos = ctrl->ClientToScreen(wxPoint(0, 0)); - wxSize sz = ctrl->GetSize(); + wxSize sz = ctrl->GetSize(); pos.x += sz.x; pos.y += sz.y; m_camera_popup->SetPosition(pos); diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index ea353f0d5..fc61a55f7 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -606,7 +606,8 @@ protected: SecondaryCheckDialog* m_print_error_dlg_no_action = nullptr; SecondaryCheckDialog* abort_dlg = nullptr; SecondaryCheckDialog* con_load_dlg = nullptr; - SecondaryCheckDialog* ctrl_e_hint_dlg = nullptr; + MessageDialog * ctrl_e_hint_dlg = nullptr; + SecondaryCheckDialog* sdcard_hint_dlg = nullptr; SecondaryCheckDialog* axis_go_home_dlg = nullptr;