3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: load url in guide web dialog

Browse source 
Change-Id: Ie723d8994dddcaeb21299837a0e34d8c15b698ed
(cherry picked from commit 05d3a1c20a6f4a817dd098c2b121539863257a66)
This commit is contained in:
chunmao.guo 2022-07-25 15:37:22 +08:00 • committed by Lane.Wei
parent 18901127ec
commit 835f9837b1
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/WebGuideDialog.cpp
View file

@ -111,7 +111,7 @@ void GuideFrame::load_url(wxString &url)
{ {
BOOST_LOG_TRIVIAL(trace) << "app_start: GuideFrame url=" << url.ToStdString(); BOOST_LOG_TRIVIAL(trace) << "app_start: GuideFrame url=" << url.ToStdString();
this->Show(); this->Show();
m_browser->LoadURL(url); WebView::LoadUrl(m_browser, url);
m_browser->SetFocus(); m_browser->SetFocus();
UpdateState(); UpdateState();
} }

10
src/slic3r/GUI/Widgets/WebView.cpp
View file

@ -98,6 +98,16 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
return webView; return webView;
} }
void WebView::LoadUrl(wxWebView * webView, wxString const &url)
{
auto url2 = url;
#ifdef __WIN32__
url2.Replace("\\", "/");
#endif
if (!url2.empty()) { url2 = wxURI(url2).BuildURI(); }
webView->LoadURL(url2);
}
bool WebView::RunScript(wxWebView *webView, wxString const &javascript) bool WebView::RunScript(wxWebView *webView, wxString const &javascript)
{ {
if (Slic3r::GUI::wxGetApp().get_mode() == Slic3r::comDevelop) if (Slic3r::GUI::wxGetApp().get_mode() == Slic3r::comDevelop)

2
src/slic3r/GUI/Widgets/WebView.hpp
View file

@ -8,6 +8,8 @@ class WebView
public: public:
static wxWebView *CreateWebView(wxWindow *parent, wxString const &url); static wxWebView *CreateWebView(wxWindow *parent, wxString const &url);
static void LoadUrl(wxWebView * webView, wxString const &url);
static bool RunScript(wxWebView * webView, wxString const & msg); static bool RunScript(wxWebView * webView, wxString const & msg);
}; };