GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 07:05:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Second html window in dialogs for viewing html code.

Browse Source
This commit is contained in:
David Kocik 2022-05-16 14:01:14 +02:00
parent 6605ad926f
commit 81e64c94c2
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/slic3r/GUI/MsgDialog.cpp
View File

@ -117,24 +117,16 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
{ {
wxHtmlWindow* html = new wxHtmlWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO); wxHtmlWindow* html = new wxHtmlWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
// count lines in the message wxString inner_msg;
int msg_lines = 0; if (msg.Contains("<html>")) {
if (!monospaced_font) { size_t pos = std::min(msg.First("<!DOCTYPE html>"), msg.First("<html>"));
int line_len = 55;// count of symbols in one line if (msg.Contains("</html>"))
int start_line = 0; inner_msg = msg.SubString(pos, msg.First("</html>") + 7);
for (auto i = msg.begin(); i != msg.end(); ++i) { else
if (*i == '\n') { inner_msg = msg.SubString(pos, msg.Length() - 1);
int cur_line_len = i - msg.begin() - start_line; msg = msg.SubString(0, pos-1);
start_line = i - msg.begin();
if (cur_line_len == 0 || line_len > cur_line_len)
msg_lines++;
else
msg_lines += std::lround((double)(cur_line_len) / line_len);
}
}
msg_lines++;
} }
wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
wxFont monospace = wxGetApp().code_font(); wxFont monospace = wxGetApp().code_font();
wxColour text_clr = wxGetApp().get_label_clr_default(); wxColour text_clr = wxGetApp().get_label_clr_default();
@ -187,8 +179,7 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
} }
int page_height = std::min(int(font.GetPixelSize().y+2) * lines, 68 * em); int page_height = std::min(int(font.GetPixelSize().y+2) * lines, 68 * em);
page_size = wxSize(68 * em, page_height); page_size = wxSize(68 * em, page_height);
} } else {
else {
wxClientDC dc(parent); wxClientDC dc(parent);
wxSize msg_sz = dc.GetMultiLineTextExtent(msg); wxSize msg_sz = dc.GetMultiLineTextExtent(msg);
page_size = wxSize(std::min(msg_sz.GetX() + 2 * em, 68 * em), page_size = wxSize(std::min(msg_sz.GetX() + 2 * em, 68 * em),
@ -196,11 +187,19 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
} }
html->SetMinSize(page_size); html->SetMinSize(page_size);
if (!inner_msg.IsEmpty()) {
wxClientDC dc(parent);
wxSize msg_sz = dc.GetMultiLineTextExtent(inner_msg);
// Keep the page size in page_size until second html window is created
page_size = wxSize(std::min(msg_sz.GetX() + 2 * em, 68 * em),
std::min(msg_sz.GetY() + 2 * em, 68 * em));
}
std::string msg_escaped = xml_escape(into_u8(msg), is_marked_msg); std::string msg_escaped = xml_escape(into_u8(msg), is_marked_msg);
boost::replace_all(msg_escaped, "\r\n", "<br>"); boost::replace_all(msg_escaped, "\r\n", "<br>");
boost::replace_all(msg_escaped, "\n", "<br>"); boost::replace_all(msg_escaped, "\n", "<br>");
if (monospaced_font) if (monospaced_font)
// Code formatting will be preserved. This is useful for reporting errors from the placeholder parser. // Code formatting will be preserved. This is useful for reporting errors from the placeholder parser.
msg_escaped = std::string("<pre><code>") + msg_escaped + "</code></pre>"; msg_escaped = std::string("<pre><code>") + msg_escaped + "</code></pre>";
html->SetPage(format_wxstr("<html>" html->SetPage(format_wxstr("<html>"
"<body bgcolor=%1% link=%2%>" "<body bgcolor=%1% link=%2%>"
@ -210,6 +209,7 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
"</body>" "</body>"
"</html>", "</html>",
bgr_clr_str, text_clr_str, from_u8(msg_escaped))); bgr_clr_str, text_clr_str, from_u8(msg_escaped)));
html->Bind(wxEVT_HTML_LINK_CLICKED, [parent](wxHtmlLinkEvent& event) { html->Bind(wxEVT_HTML_LINK_CLICKED, [parent](wxHtmlLinkEvent& event) {
wxGetApp().open_browser_with_warning_dialog(event.GetLinkInfo().GetHref(), parent, false); wxGetApp().open_browser_with_warning_dialog(event.GetLinkInfo().GetHref(), parent, false);
@ -217,7 +217,19 @@ static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxStrin
}); });
content_sizer->Add(html, 1, wxEXPAND); content_sizer->Add(html, 1, wxEXPAND);
if (!inner_msg.IsEmpty()) {
wxHtmlWindow* html2 = new wxHtmlWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
html2->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size);
html2->SetBorders(2);
html2->SetMinSize(page_size);
html2->SetPage(inner_msg);
content_sizer->Add(html2, 1, wxEXPAND);
//wxGetApp().UpdateDarkUI(html2);
}
wxGetApp().UpdateDarkUI(html); wxGetApp().UpdateDarkUI(html);
} }
// ErrorDialog // ErrorDialog