From fb68d7745f60b030b401a3e2bd0e78f0dfd1a2ca Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 6 Jun 2023 19:42:06 +0800 Subject: [PATCH] ENH:optimized msg window style Change-Id: I2acf6b8fe8f058a1aad8b782deb0d43334d3a770 --- src/slic3r/GUI/MsgDialog.cpp | 2 +- src/slic3r/GUI/StatusPanel.cpp | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 616474c10..6d2f41c51 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -312,7 +312,7 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin // Code formatting will be preserved. This is useful for reporting errors from the placeholder parser. msg_escaped = std::string("
") + msg_escaped + "
"; html->SetPage("" + wxString::FromUTF8(msg_escaped.data()) + ""); - content_sizer->Add(html, 1, wxEXPAND); + content_sizer->Add(html, 1, wxEXPAND|wxRIGHT,12); wxGetApp().UpdateDarkUIWin(html); } diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 08027b72f..dd80bf817 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1623,6 +1623,7 @@ void StatusPanel::update(MachineObject *obj) if (!m_show_mode_changed) { m_show_mode_changed = true; MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK); + msg_wingow.SetSize(wxSize(FromDIP(600), FromDIP(200))); if (msg_wingow.ShowModal() == wxID_OK || msg_wingow.ShowModal() == wxID_CLOSE) { m_show_mode_changed = false; } @@ -1632,16 +1633,20 @@ void StatusPanel::update(MachineObject *obj) //cloud = > lan if (iter_connect_type->second == "cloud" && obj->dev_connection_type == "lan") { - wxString txt = _L("Disconnected from printer [%s] due to LAN mode enabled.Please reconnect the printer by inputting Access Code which can be gotten from printer screen."); - wxString msg = wxString::Format(txt, obj->dev_name); - if (!m_show_mode_changed) { - m_show_mode_changed = true; - MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK); - if (msg_wingow.ShowModal() == wxID_OK || msg_wingow.ShowModal() == wxID_CLOSE) { - m_show_mode_changed = false; + + if (!obj->is_connected()) { + wxString txt = _L("Disconnected from printer [%s] due to LAN mode enabled.Please reconnect the printer by inputting Access Code which can be gotten from printer screen."); + wxString msg = wxString::Format(txt, obj->dev_name); + if (!m_show_mode_changed) { + m_show_mode_changed = true; + MessageDialog msg_wingow(nullptr, msg, wxEmptyString, wxICON_WARNING | wxOK); + msg_wingow.SetSize(wxSize(FromDIP(600), FromDIP(200))); + if (msg_wingow.ShowModal() == wxID_OK || msg_wingow.ShowModal() == wxID_CLOSE) { + m_show_mode_changed = false; + } } + m_print_connect_types[obj->dev_id] = obj->dev_connection_type; } - m_print_connect_types[obj->dev_id] = obj->dev_connection_type; } } }