mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:optimize the layout of error messages 

jira:[none]

Change-Id: I06ee3399b15ca78257e92af4e9ea0be69ffd1b4e
This commit is contained in:
tao wang 2025-02-08 16:54:03 +08:00 committed by lane.wei
parent 9274e75b3e
commit 5860af4401
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/slic3r/GUI/BBLStatusBarPrint.cpp
View File

@ -28,15 +28,15 @@ BBLStatusBarPrint::BBLStatusBarPrint(wxWindow *parent, int id)
wxBoxSizer *m_sizer_bottom = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_bottom = new wxBoxSizer(wxHORIZONTAL);
auto top_panel = new wxPanel(m_self, wxID_ANY); top_panel = new wxPanel(m_self, wxID_ANY);
top_panel->SetBackgroundColour(*wxWHITE); top_panel->SetBackgroundColour(*wxWHITE);
top_panel->SetMinSize(wxSize(m_self->FromDIP(530), m_self->FromDIP(26))); top_panel->SetMinSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(26)));
top_panel->SetMaxSize(wxSize(m_self->FromDIP(530), m_self->FromDIP(26))); top_panel->SetMaxSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(26)));
m_status_text = new wxStaticText(top_panel, wxID_ANY, wxEmptyString); m_status_text = new wxStaticText(top_panel, wxID_ANY, wxEmptyString);
m_status_text->SetForegroundColour(wxColour(107, 107, 107)); m_status_text->SetForegroundColour(wxColour(107, 107, 107));
m_status_text->SetMinSize(wxSize(-1, m_self->FromDIP(26))); m_status_text->SetMaxSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(26)));
m_status_text->SetMaxSize(wxSize(-1, m_self->FromDIP(26))); m_status_text->SetMinSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(26)));
m_status_text->SetFont(::Label::Body_13); m_status_text->SetFont(::Label::Body_13);
StateColor btn_bt_white(std::pair<wxColour, int>(wxColour(0x90, 0x90, 0x90), StateColor::Disabled), StateColor btn_bt_white(std::pair<wxColour, int>(wxColour(0x90, 0x90, 0x90), StateColor::Disabled),
@ -71,8 +71,6 @@ BBLStatusBarPrint::BBLStatusBarPrint(wxWindow *parent, int id)
m_sizer_status_text = new wxBoxSizer(wxHORIZONTAL); m_sizer_status_text = new wxBoxSizer(wxHORIZONTAL);
m_link_show_error = new Label(top_panel, _L("Check the reason")); m_link_show_error = new Label(top_panel, _L("Check the reason"));
m_link_show_error->SetMinSize(wxSize(-1, m_self->FromDIP(26)));
m_link_show_error->SetMinSize(wxSize(-1, m_self->FromDIP(26)));
m_link_show_error->SetForegroundColour(wxColour(0x00ae42)); m_link_show_error->SetForegroundColour(wxColour(0x00ae42));
m_link_show_error->SetFont(::Label::Head_13); m_link_show_error->SetFont(::Label::Head_13);
m_link_show_error->Bind(wxEVT_ENTER_WINDOW, [this](auto &e) { this->m_self->SetCursor(wxCURSOR_HAND); }); m_link_show_error->Bind(wxEVT_ENTER_WINDOW, [this](auto &e) { this->m_self->SetCursor(wxCURSOR_HAND); });
@ -109,17 +107,17 @@ BBLStatusBarPrint::BBLStatusBarPrint(wxWindow *parent, int id)
m_prog = new wxGauge(m_self, wxID_ANY, 100, wxDefaultPosition, wxSize(-1, m_self->FromDIP(6)), wxGA_HORIZONTAL); m_prog = new wxGauge(m_self, wxID_ANY, 100, wxDefaultPosition, wxSize(-1, m_self->FromDIP(6)), wxGA_HORIZONTAL);
m_prog->SetMinSize(wxSize(m_self->FromDIP(530), m_self->FromDIP(6))); m_prog->SetMinSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(6)));
m_prog->SetMaxSize(wxSize(m_self->FromDIP(530), m_self->FromDIP(6))); m_prog->SetMaxSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(6)));
m_prog->SetValue(0); m_prog->SetValue(0);
m_sizer_bottom->Add(m_prog, 1, wxALIGN_CENTER, 0); m_sizer_bottom->Add(m_prog, 1, wxALIGN_CENTER, 0);
m_sizer_bottom->Add(0, 0, 1, wxEXPAND, 0); m_sizer_bottom->Add(0, 0, 1, wxEXPAND, 0);
m_sizer_top->Add(m_status_text, 1, wxALIGN_CENTER, 0); m_sizer_top->Add(m_status_text, 1, wxEXPAND, 0);
m_sizer_top->Add(m_sizer_status_text, 0, wxLEFT|wxEXPAND, m_self->FromDIP(6));
m_sizer_top->Add(0, 0, 1, wxEXPAND, 0); m_sizer_top->Add(0, 0, 1, wxEXPAND, 0);
m_sizer_top->Add(m_sizer_status_text, 0, wxALIGN_CENTER, 0);
m_sizer_top->Add(m_stext_percent, 0, wxEXPAND, 0); m_sizer_top->Add(m_stext_percent, 0, wxEXPAND, 0);
top_panel->SetSizer(m_sizer_top); top_panel->SetSizer(m_sizer_top);
@ -190,6 +188,11 @@ void BBLStatusBarPrint::show_error_info(wxString msg, int code, wxString descrip
m_link_show_error->Show(); m_link_show_error->Show();
m_static_bitmap_show_error->Show(); m_static_bitmap_show_error->Show();
top_panel->SetMinSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(32)));
top_panel->SetMaxSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(32)));
m_status_text->SetMaxSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(32)));
m_status_text->SetMinSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(32)));
m_cancelbutton->Show(); m_cancelbutton->Show();
m_self->Layout(); m_self->Layout();
m_sizer->Layout(); m_sizer->Layout();
@ -311,7 +314,20 @@ void BBLStatusBarPrint::set_status_text(const wxString& txt)
//if (m_status_text->GetTextExtent(txt).x > m_self->FromDIP(360)) { //if (m_status_text->GetTextExtent(txt).x > m_self->FromDIP(360)) {
// m_status_text->SetSize(m_self->FromDIP(360), m_self->FromDIP(40)); // m_status_text->SetSize(m_self->FromDIP(360), m_self->FromDIP(40));
//} //}
//if (m_prog->IsShown()) {
// top_panel->SetMinSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(26)));
// top_panel->SetMaxSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(26)));
// m_status_text->SetMaxSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(26)));
// m_status_text->SetMinSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(26)));
//} else {
// top_panel->SetMinSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(32)));
// top_panel->SetMaxSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(32)));
// m_status_text->SetMaxSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(32)));
// m_status_text->SetMinSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(32)));
//}
m_status_text->SetLabelText(txt); m_status_text->SetLabelText(txt);
m_self->Layout();
//m_status_text->Wrap(m_self->FromDIP(360)); //m_status_text->Wrap(m_self->FromDIP(360));
//m_status_text->Layout(); //m_status_text->Layout();
//m_self->Layout(); //m_self->Layout();
@ -367,6 +383,11 @@ void BBLStatusBarPrint::reset()
m_cancelbutton->Show(); m_cancelbutton->Show();
m_was_cancelled = false; m_was_cancelled = false;
top_panel->SetMinSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(26)));
top_panel->SetMaxSize(wxSize(m_self->FromDIP(550), m_self->FromDIP(26)));
m_status_text->SetMaxSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(26)));
m_status_text->SetMinSize(wxSize(m_self->FromDIP(400), m_self->FromDIP(26)));
set_status_text(""); set_status_text("");
set_progress(0); set_progress(0);
set_percent_text(wxString::Format("%d%%", 0)); set_percent_text(wxString::Format("%d%%", 0));

1
src/slic3r/GUI/BBLStatusBarPrint.hpp
View File

@ -37,6 +37,7 @@ class BBLStatusBarPrint : public ProgressIndicator
wxBitmap m_bitmap_show_error_open; wxBitmap m_bitmap_show_error_open;
Button * m_cancelbutton; Button * m_cancelbutton;
wxStaticText *m_status_text; wxStaticText *m_status_text;
wxPanel* top_panel;
wxStaticText *m_stext_percent; wxStaticText *m_stext_percent;
wxBoxSizer * m_sizer; wxBoxSizer * m_sizer;
wxBoxSizer * m_sizer_eline; wxBoxSizer * m_sizer_eline;