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

Fix of webview dialog closing.

Browse Source 
Custom script message handlers.
This commit is contained in:
David Kocik 2024-05-20 13:03:58 +02:00
parent 84653cc984
commit e553ac5360
4 changed files with 42 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/WebView.cpp
View File

@ -1,12 +1,13 @@
#include "WebView.hpp" #include "WebView.hpp"
#include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/GUI_App.hpp"
#include "slic3r/GUI/GUI.hpp"
#include <wx/uri.h> #include <wx/uri.h>
#include <wx/webview.h> #include <wx/webview.h>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
wxWebView* WebView::CreateWebView(wxWindow * parent, const wxString& url) wxWebView* WebView::CreateWebView(wxWindow * parent, const wxString& url, std::vector<std::string>& message_handlers)
{ {
#if wxUSE_WEBVIEW_EDGE #if wxUSE_WEBVIEW_EDGE
bool backend_available = wxWebView::IsBackendAvailable(wxWebViewBackendEdge); bool backend_available = wxWebView::IsBackendAvailable(wxWebViewBackendEdge);
@ -37,12 +38,14 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, const wxString& url)
webView->SetUserAgent(wxString::FromUTF8(SLIC3R_APP_FULL_NAME)); webView->SetUserAgent(wxString::FromUTF8(SLIC3R_APP_FULL_NAME));
#endif #endif
#ifndef __WIN32__ #ifndef __WIN32__
Slic3r::GUI::wxGetApp().CallAfter([webView] { Slic3r::GUI::wxGetApp().CallAfter([message_handlers, webView] {
#endif #endif
if (!webView->AddScriptMessageHandler("_prusaSlicer")) { for (const std::string& handler : message_handlers) {
if (!webView->AddScriptMessageHandler(Slic3r::GUI::into_u8(handler))) {
// TODO: dialog to user !!! // TODO: dialog to user !!!
//wxLogError("Could not add script message handler"); //wxLogError("Could not add script message handler");
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << "Could not add script message handler"; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << "Could not add script message handler " << handler;
}
} }
#ifndef __WIN32__ #ifndef __WIN32__
}); });

2
src/slic3r/GUI/WebView.hpp
View File

@ -7,7 +7,7 @@ class wxString;
namespace WebView namespace WebView
{ {
wxWebView *CreateWebView(wxWindow *parent, const wxString& url); wxWebView *CreateWebView(wxWindow *parent, const wxString& url, std::vector<std::string>& message_handlers);
}; };
#endif // !slic3r_GUI_WebView_hpp_ #endif // !slic3r_GUI_WebView_hpp_

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

@ -22,10 +22,11 @@ namespace Slic3r {
namespace GUI { namespace GUI {
WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const std::string& loading_html/* = "loading"*/) WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const std::vector<std::string>& message_handler_names, const std::string& loading_html/* = "loading"*/)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
, m_default_url (default_url) , m_default_url (default_url)
, m_loading_html(loading_html) , m_loading_html(loading_html)
, m_script_message_hadler_names(message_handler_names)
{ {
wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
#ifdef DEBUG_URL_PANEL #ifdef DEBUG_URL_PANEL
@ -70,7 +71,7 @@ WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const
SetSizer(topsizer); SetSizer(topsizer);
// Create the webview // Create the webview
m_browser = WebView::CreateWebView(this, /*m_default_url*/ GUI::format_wxstr("file://%1%/web/%2%.html", boost::filesystem::path(resources_dir()).generic_string(), m_loading_html)); m_browser = WebView::CreateWebView(this, /*m_default_url*/ GUI::format_wxstr("file://%1%/web/%2%.html", boost::filesystem::path(resources_dir()).generic_string(), m_loading_html), m_script_message_hadler_names);
if (!m_browser) { if (!m_browser) {
wxStaticText* text = new wxStaticText(this, wxID_ANY, _L("Failed to load a web browser.")); wxStaticText* text = new wxStaticText(this, wxID_ANY, _L("Failed to load a web browser."));
topsizer->Add(text, 0, wxALIGN_LEFT | wxBOTTOM, 10); topsizer->Add(text, 0, wxALIGN_LEFT | wxBOTTOM, 10);
@ -122,8 +123,6 @@ WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const
#endif #endif
//Connect the idle events //Connect the idle events
Bind(wxEVT_IDLE, &WebViewPanel::on_idle, this); Bind(wxEVT_IDLE, &WebViewPanel::on_idle, this);
Bind(wxEVT_CLOSE_WINDOW, &WebViewPanel::on_close, this);
} }
WebViewPanel::~WebViewPanel() WebViewPanel::~WebViewPanel()
@ -245,11 +244,6 @@ void WebViewPanel::on_reload_button(wxCommandEvent& WXUNUSED(evt))
m_browser->Reload(); m_browser->Reload();
} }
void WebViewPanel::on_close(wxCloseEvent& evt)
{
this->Hide();
}
void WebViewPanel::on_script_message(wxWebViewEvent& evt) void WebViewPanel::on_script_message(wxWebViewEvent& evt)
{ {
} }
@ -548,7 +542,7 @@ void ConnectRequestHandler::on_connect_action_request_config()
} }
ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent) ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent)
: WebViewPanel(parent, L"https://connect.prusa3d.com/", "connect_loading") : WebViewPanel(parent, L"https://connect.prusa3d.com/", { "_prusaSlicer" }, "connect_loading")
{ {
} }
@ -581,7 +575,7 @@ void ConnectWebViewPanel::on_connect_action_print()
} }
PrinterWebViewPanel::PrinterWebViewPanel(wxWindow* parent, const wxString& default_url) PrinterWebViewPanel::PrinterWebViewPanel(wxWindow* parent, const wxString& default_url)
: WebViewPanel(parent, default_url) : WebViewPanel(parent, default_url, {})
{ {
if (!m_browser) if (!m_browser)
return; return;
@ -654,9 +648,10 @@ void PrinterWebViewPanel::sys_color_changed()
{ {
} }
WebViewDialog::WebViewDialog(wxWindow* parent, const wxString& url, const wxString& dialog_name, const wxSize& size, const std::string& loading_html/* = "loading"*/) WebViewDialog::WebViewDialog(wxWindow* parent, const wxString& url, const wxString& dialog_name, const wxSize& size, const std::vector<std::string>& message_handler_names, const std::string& loading_html/* = "loading"*/)
: wxDialog(parent, wxID_ANY, dialog_name, wxDefaultPosition, size, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) : wxDialog(parent, wxID_ANY, dialog_name, wxDefaultPosition, size, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
, m_loading_html(loading_html) , m_loading_html(loading_html)
, m_script_message_hadler_names (message_handler_names)
{ {
wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
#ifdef DEBUG_URL_PANEL #ifdef DEBUG_URL_PANEL
@ -697,7 +692,7 @@ WebViewDialog::WebViewDialog(wxWindow* parent, const wxString& url, const wxStri
SetSizerAndFit(topsizer); SetSizerAndFit(topsizer);
// Create the webview // Create the webview
m_browser = WebView::CreateWebView(this, GUI::format_wxstr("file://%1%/web/%2%.html", boost::filesystem::path(resources_dir()).generic_string(), m_loading_html)); m_browser = WebView::CreateWebView(this, GUI::format_wxstr("file://%1%/web/%2%.html", boost::filesystem::path(resources_dir()).generic_string(), m_loading_html), m_script_message_hadler_names);
if (!m_browser) { if (!m_browser) {
wxStaticText* text = new wxStaticText(this, wxID_ANY, _L("Failed to load a web browser.")); wxStaticText* text = new wxStaticText(this, wxID_ANY, _L("Failed to load a web browser."));
topsizer->Add(text, 0, wxALIGN_LEFT | wxBOTTOM, 10); topsizer->Add(text, 0, wxALIGN_LEFT | wxBOTTOM, 10);
@ -732,7 +727,6 @@ WebViewDialog::WebViewDialog(wxWindow* parent, const wxString& url, const wxStri
Bind(wxEVT_WEBVIEW_ERROR, &WebViewDialog::on_error, this, m_browser->GetId()); Bind(wxEVT_WEBVIEW_ERROR, &WebViewDialog::on_error, this, m_browser->GetId());
//Connect the idle events //Connect the idle events
Bind(wxEVT_IDLE, &WebViewDialog::on_idle, this); Bind(wxEVT_IDLE, &WebViewDialog::on_idle, this);
Bind(wxEVT_CLOSE_WINDOW, &WebViewDialog::on_close, this);
#ifdef DEBUG_URL_PANEL #ifdef DEBUG_URL_PANEL
// Connect the button events // Connect the button events
Bind(wxEVT_BUTTON, &WebViewDialog::on_back_button, this, m_button_back->GetId()); Bind(wxEVT_BUTTON, &WebViewDialog::on_back_button, this, m_button_back->GetId());
@ -752,6 +746,8 @@ WebViewDialog::WebViewDialog(wxWindow* parent, const wxString& url, const wxStri
Bind(wxEVT_MENU, &WebViewDialog::on_add_user_script, this, addUserScript->GetId()); Bind(wxEVT_MENU, &WebViewDialog::on_add_user_script, this, addUserScript->GetId());
#endif #endif
Bind(wxEVT_CLOSE_WINDOW, ([this](wxCloseEvent& evt) { EndModal(wxID_CANCEL); }));
m_browser->LoadURL(url); m_browser->LoadURL(url);
#ifdef DEBUG_URL_PANEL #ifdef DEBUG_URL_PANEL
m_url->SetLabelText(url); m_url->SetLabelText(url);
@ -761,10 +757,6 @@ WebViewDialog::~WebViewDialog()
{ {
} }
void WebViewDialog::on_idle(wxIdleEvent& WXUNUSED(evt)) void WebViewDialog::on_idle(wxIdleEvent& WXUNUSED(evt))
{ {
if (!m_browser) if (!m_browser)
@ -836,11 +828,6 @@ void WebViewDialog::on_reload_button(wxCommandEvent& WXUNUSED(evt))
m_browser->Reload(); m_browser->Reload();
} }
void WebViewDialog::on_close(wxCloseEvent& evt)
{
this->Hide();
}
void WebViewDialog::on_script_message(wxWebViewEvent& evt) void WebViewDialog::on_script_message(wxWebViewEvent& evt)
{ {
} }
@ -1040,11 +1027,23 @@ void WebViewDialog::run_script(const wxString& javascript)
m_browser->RunScriptAsync(javascript); m_browser->RunScriptAsync(javascript);
} }
void WebViewDialog::EndModal(int retCode)
{
if (m_browser) {
for (const std::string& handler : m_script_message_hadler_names) {
m_browser->RemoveScriptMessageHandler(GUI::into_u8(handler));
}
}
wxDialog::EndModal(retCode);
}
PrinterPickWebViewDialog::PrinterPickWebViewDialog(wxWindow* parent, std::string& ret_val) PrinterPickWebViewDialog::PrinterPickWebViewDialog(wxWindow* parent, std::string& ret_val)
: WebViewDialog(parent : WebViewDialog(parent
, L"https://connect.prusa3d.com/slicer-select-printer" , L"https://connect.prusa3d.com/slicer-select-printer"
, _L("Choose a printer") , _L("Choose a printer")
, wxSize(std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 2, 50 * wxGetApp().em_unit())) , wxSize(std::max(parent->GetClientSize().x / 2, 100 * wxGetApp().em_unit()), std::max(parent->GetClientSize().y / 2, 50 * wxGetApp().em_unit()))
,{"_prusaSlicer"}
, "connect_loading") , "connect_loading")
, m_ret_val(ret_val) , m_ret_val(ret_val)
{ {
@ -1074,7 +1073,6 @@ void PrinterPickWebViewDialog::on_connect_action_select_printer()
void PrinterPickWebViewDialog::on_connect_action_print() void PrinterPickWebViewDialog::on_connect_action_print()
{ {
m_ret_val = m_message_data; m_ret_val = m_message_data;
m_browser->RemoveScriptMessageHandler("_prusaSlicer");
this->EndModal(wxID_OK); this->EndModal(wxID_OK);
} }

33
src/slic3r/GUI/WebViewDialog.hpp
View File

@ -16,7 +16,7 @@ namespace GUI {
class WebViewPanel : public wxPanel class WebViewPanel : public wxPanel
{ {
public: public:
WebViewPanel(wxWindow *parent, const wxString& default_url, const std::string& loading_html = "loading"); WebViewPanel(wxWindow *parent, const wxString& default_url, const std::vector<std::string>& message_handler_names, const std::string& loading_html = "loading");
virtual ~WebViewPanel(); virtual ~WebViewPanel();
void load_url(const wxString& url); void load_url(const wxString& url);
@ -47,7 +47,6 @@ public:
void on_select_all(wxCommandEvent& evt); void on_select_all(wxCommandEvent& evt);
void On_enable_context_menu(wxCommandEvent& evt); void On_enable_context_menu(wxCommandEvent& evt);
void On_enable_dev_tools(wxCommandEvent& evt); void On_enable_dev_tools(wxCommandEvent& evt);
void on_close(wxCloseEvent& evt);
wxString get_default_url() const { return m_default_url; } wxString get_default_url() const { return m_default_url; }
void set_default_url(const wxString& url) { m_default_url = url; } void set_default_url(const wxString& url) { m_default_url = url; }
@ -55,7 +54,7 @@ public:
virtual void sys_color_changed(); virtual void sys_color_changed();
protected: protected:
wxWebView* m_browser; wxWebView* m_browser { nullptr };
bool m_load_default_url { false }; bool m_load_default_url { false };
#ifdef DEBUG_URL_PANEL #ifdef DEBUG_URL_PANEL
@ -87,13 +86,15 @@ protected:
bool m_load_error_page { false }; bool m_load_error_page { false };
bool m_shown { false }; bool m_shown { false };
std::vector<std::string> m_script_message_hadler_names;
}; };
class WebViewDialog : public wxDialog class WebViewDialog : public wxDialog
{ {
public: public:
WebViewDialog(wxWindow* parent, const wxString& url, const wxString& dialog_name, const wxSize& size, const std::string& loading_html = "loading"); WebViewDialog(wxWindow* parent, const wxString& url, const wxString& dialog_name, const wxSize& size, const std::vector<std::string>& message_handler_names, const std::string& loading_html = "loading");
virtual ~WebViewDialog(); virtual ~WebViewDialog();
virtual void on_show(wxShowEvent& evt) = 0; virtual void on_show(wxShowEvent& evt) = 0;
@ -119,14 +120,14 @@ public:
void on_select_all(wxCommandEvent& evt); void on_select_all(wxCommandEvent& evt);
void On_enable_context_menu(wxCommandEvent& evt); void On_enable_context_menu(wxCommandEvent& evt);
void On_enable_dev_tools(wxCommandEvent& evt); void On_enable_dev_tools(wxCommandEvent& evt);
void on_close(wxCloseEvent& evt);
void run_script(const wxString& javascript); void run_script(const wxString& javascript);
void load_error_page(); void load_error_page();
virtual void EndModal(int retCode) wxOVERRIDE;
protected: protected:
wxWebView* m_browser; wxWebView* m_browser {nullptr};
std::string m_loading_html; std::string m_loading_html;
bool m_load_error_page{ false }; bool m_load_error_page{ false };
@ -152,6 +153,8 @@ protected:
wxString m_javascript; wxString m_javascript;
wxString m_response_js; wxString m_response_js;
wxString m_default_url; wxString m_default_url;
std::vector<std::string> m_script_message_hadler_names;
}; };
class ConnectRequestHandler class ConnectRequestHandler
@ -210,23 +213,6 @@ private:
bool m_api_key_sent {false}; bool m_api_key_sent {false};
}; };
/*
class WebViewDialog : public wxDialog
{
public:
WebViewDialog(wxWindow* parent, const wxString& url, const wxString& dialog_name, const wxSize& size, const std::string& loading_html = "loading");
virtual ~WebViewDialog();
virtual void on_show(wxShowEvent& evt) = 0;
virtual void on_script_message(wxWebViewEvent& evt) = 0;
void run_script(const wxString& javascript);
protected:
wxWebView* m_browser;
std::string m_loading_html;
};
*/
class PrinterPickWebViewDialog : public WebViewDialog, public ConnectRequestHandler class PrinterPickWebViewDialog : public WebViewDialog, public ConnectRequestHandler
{ {
public: public:
@ -240,6 +226,7 @@ protected:
void request_compatible_printers_FFF(); void request_compatible_printers_FFF();
void request_compatible_printers_SLA(); void request_compatible_printers_SLA();
void run_script_bridge(const wxString& script) override { run_script(script); } void run_script_bridge(const wxString& script) override { run_script(script); }
private: private:
std::string& m_ret_val; std::string& m_ret_val;
}; };