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

FIX: more web view logs 

Change-Id: Ia4b2821188c3053be297b0fe0aa19fb8d939a816
(cherry picked from commit 4e76cfc6529038252a4afd8d53cf93f817d46b01)
This commit is contained in:
chunmao.guo 2022-11-30 09:20:04 +08:00 committed by Lane.Wei
parent a9f3f195e1
commit ba8015e455
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -471,6 +471,7 @@ void WebViewPanel::update_mode()
*/ */
void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt) void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
const wxString &url = evt.GetURL(); const wxString &url = evt.GetURL();
if (url.StartsWith("File://") || url.StartsWith("file://")) { if (url.StartsWith("File://") || url.StartsWith("file://")) {
if (!url.Contains("/web/homepage/index.html")) { if (!url.Contains("/web/homepage/index.html")) {
@ -506,6 +507,7 @@ void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt)
*/ */
void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt) void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
if (wxGetApp().get_mode() == comDevelop) if (wxGetApp().get_mode() == comDevelop)
wxLogMessage("%s", "Navigation complete; url='" + evt.GetURL() + "'"); wxLogMessage("%s", "Navigation complete; url='" + evt.GetURL() + "'");
UpdateState(); UpdateState();
@ -516,7 +518,8 @@ void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt)
*/ */
void WebViewPanel::OnDocumentLoaded(wxWebViewEvent& evt) void WebViewPanel::OnDocumentLoaded(wxWebViewEvent& evt)
{ {
//Only notify if the document is the main frame, not a subframe BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
// Only notify if the document is the main frame, not a subframe
if (evt.GetURL() == m_browser->GetCurrentURL()) if (evt.GetURL() == m_browser->GetCurrentURL())
{ {
if (wxGetApp().get_mode() == comDevelop) if (wxGetApp().get_mode() == comDevelop)
@ -528,6 +531,7 @@ void WebViewPanel::OnDocumentLoaded(wxWebViewEvent& evt)
void WebViewPanel::OnTitleChanged(wxWebViewEvent &evt) void WebViewPanel::OnTitleChanged(wxWebViewEvent &evt)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetString().ToUTF8().data();
// wxGetApp().CallAfter([this] { SendRecentList(); }); // wxGetApp().CallAfter([this] { SendRecentList(); });
} }
@ -536,6 +540,7 @@ void WebViewPanel::OnTitleChanged(wxWebViewEvent &evt)
*/ */
void WebViewPanel::OnNewWindow(wxWebViewEvent& evt) void WebViewPanel::OnNewWindow(wxWebViewEvent& evt)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
wxString flag = " (other)"; wxString flag = " (other)";
if (evt.GetNavigationAction() == wxWEBVIEW_NAV_ACTION_USER) if (evt.GetNavigationAction() == wxWEBVIEW_NAV_ACTION_USER)
@ -556,6 +561,7 @@ void WebViewPanel::OnNewWindow(wxWebViewEvent& evt)
void WebViewPanel::OnScriptMessage(wxWebViewEvent& evt) void WebViewPanel::OnScriptMessage(wxWebViewEvent& evt)
{ {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetString().ToUTF8().data();
// update login status // update login status
if (m_LoginUpdateTimer == nullptr) { if (m_LoginUpdateTimer == nullptr) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Create Timer"; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Create Timer";
@ -784,7 +790,7 @@ void WebViewPanel::OnSelectAll(wxCommandEvent& WXUNUSED(evt))
void WebViewPanel::OnError(wxWebViewEvent& evt) void WebViewPanel::OnError(wxWebViewEvent& evt)
{ {
#define WX_ERROR_CASE(type) \ #define WX_ERROR_CASE(type) \
case type: \ case type: \
category = #type; \ category = #type; \
break; break;
@ -801,6 +807,8 @@ case type: \
WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER); WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER);
} }
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": [" << category << "] " << evt.GetString().ToUTF8().data();
if (wxGetApp().get_mode() == comDevelop) if (wxGetApp().get_mode() == comDevelop)
wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'"); wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'");

2
src/slic3r/GUI/Widgets/WebView.cpp
View File

@ -102,7 +102,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
url2.Replace("\\", "/"); url2.Replace("\\", "/");
#endif #endif
if (!url2.empty()) { url2 = wxURI(url2).BuildURI(); } if (!url2.empty()) { url2 = wxURI(url2).BuildURI(); }
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << url2.ToUTF8(); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << url2.ToUTF8();
auto webView = wxWebView::New(); auto webView = wxWebView::New();
if (webView) { if (webView) {