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

FIX:block HTTP links&open in default browser 

fixed:https://jira.bambooolab.com/browse/STUDIO-3030
Block web page redirect requests and open them in the default browser

Change-Id: Ie79f8259859fa6ba158f31710179a8c7c53d6fa4
This commit is contained in:
tao wang 2023-07-19 09:42:00 +08:00 committed by Lane.Wei
parent 297e4d1373
commit 46a48539bb
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/Project.cpp
View File

@ -58,6 +58,7 @@ ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos,
main_sizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1)); main_sizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
m_browser->Bind(wxEVT_WEBVIEW_NAVIGATED, &ProjectPanel::on_navigated, this); m_browser->Bind(wxEVT_WEBVIEW_NAVIGATED, &ProjectPanel::on_navigated, this);
m_browser->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &ProjectPanel::OnScriptMessage, this, m_browser->GetId()); m_browser->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &ProjectPanel::OnScriptMessage, this, m_browser->GetId());
Bind(wxEVT_WEBVIEW_NAVIGATING, &ProjectPanel::onWebNavigating, this, m_browser->GetId());
Bind(EVT_PROJECT_RELOAD, &ProjectPanel::on_reload, this); Bind(EVT_PROJECT_RELOAD, &ProjectPanel::on_reload, this);
@ -68,6 +69,19 @@ ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos,
ProjectPanel::~ProjectPanel() {} ProjectPanel::~ProjectPanel() {}
void ProjectPanel::onWebNavigating(wxWebViewEvent& evt)
{
wxString tmpUrl = evt.GetURL();
//wxString NowUrl = m_browser->GetCurrentURL();
if (boost::starts_with(tmpUrl, "http://") || boost::starts_with(tmpUrl, "https://")) {
m_browser->Stop();
evt.Veto();
wxLaunchDefaultApplication(tmpUrl);
}
}
void ProjectPanel::on_reload(wxCommandEvent& evt) void ProjectPanel::on_reload(wxCommandEvent& evt)
{ {
boost::thread reload = boost::thread([this] { boost::thread reload = boost::thread([this] {

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

@ -73,6 +73,7 @@ public:
~ProjectPanel(); ~ProjectPanel();
void onWebNavigating(wxWebViewEvent& evt);
void on_reload(wxCommandEvent& evt); void on_reload(wxCommandEvent& evt);
void on_size(wxSizeEvent &event); void on_size(wxSizeEvent &event);
void on_navigated(wxWebViewEvent& event); void on_navigated(wxWebViewEvent& event);