diff --git a/resources/web/guide/js/globalapi.js b/resources/web/guide/js/globalapi.js index 2463dbe537..de48f14e16 100644 --- a/resources/web/guide/js/globalapi.js +++ b/resources/web/guide/js/globalapi.js @@ -260,7 +260,7 @@ function clearCookie(name) { /*--------Studio WX Message-------*/ function IsInSlicer() { - let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') ); + let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); return bMatch; } diff --git a/resources/web/homepage/js/globalapi.js b/resources/web/homepage/js/globalapi.js index 80bbaa01d5..80acac91b3 100644 --- a/resources/web/homepage/js/globalapi.js +++ b/resources/web/homepage/js/globalapi.js @@ -260,7 +260,7 @@ function clearCookie(name) { /*--------Studio WX Message-------*/ function IsInSlicer() { - let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') ); + let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); return bMatch; } diff --git a/resources/web/include/globalapi.js b/resources/web/include/globalapi.js index 0553483e1a..38e3e1f600 100644 --- a/resources/web/include/globalapi.js +++ b/resources/web/include/globalapi.js @@ -327,7 +327,7 @@ function clearCookie(name) { /*--------Studio WX Message-------*/ function IsInSlicer() { - let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') ); + let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); return bMatch; } diff --git a/resources/web/login/js/globalapi.js b/resources/web/login/js/globalapi.js index 3d56015018..0c1a6dd1f4 100644 --- a/resources/web/login/js/globalapi.js +++ b/resources/web/login/js/globalapi.js @@ -260,7 +260,7 @@ function clearCookie(name) { /*--------Studio WX Message-------*/ function IsInSlicer() { - let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') ); + let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); return bMatch; } diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index b95aa50b5f..929d972c63 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -87,7 +87,7 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN BOOST_LOG_TRIVIAL(info) << "login url = " << TargetUrl.ToStdString(); - m_bbl_user_agent = wxString::Format("BBL-Slicer/v%s", SLIC3R_VERSION); + m_bbl_user_agent = wxString::Format("OrcaSlicer/v%s", SLIC3R_VERSION); // set the frame icon diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp index 38afbfbd46..df6be60791 100644 --- a/src/slic3r/GUI/Widgets/WebView.cpp +++ b/src/slic3r/GUI/Widgets/WebView.cpp @@ -263,12 +263,12 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url) if (webView) { webView->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); #ifdef __WIN32__ - webView->SetUserAgent(wxString::Format("BBL-Slicer/v%s (%s) Mozilla/5.0 (Windows NT 10.0; Win64; x64) " + webView->SetUserAgent(wxString::Format("OrcaSlicer/v%s (%s) Mozilla/5.0 (Windows NT 10.0; Win64; x64) " "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.52", SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light")); webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); // We register the wxfs:// protocol for testing purposes - webView->RegisterHandler(wxSharedPtr(new wxWebViewArchiveHandler("bbl"))); + webView->RegisterHandler(wxSharedPtr(new wxWebViewArchiveHandler("orca"))); // And the memory: file system webView->RegisterHandler(wxSharedPtr(new wxWebViewFSHandler("memory"))); #else @@ -277,7 +277,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url) // And the memory: file system webView->RegisterHandler(wxSharedPtr(new wxWebViewFSHandler("memory"))); webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); - webView->SetUserAgent(wxString::Format("BBL-Slicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)", SLIC3R_VERSION, + webView->SetUserAgent(wxString::Format("OrcaSlicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)", SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light")); #endif #ifdef __WXMAC__ @@ -380,7 +380,7 @@ void WebView::RecreateAll() { auto dark = Slic3r::GUI::wxGetApp().dark_mode(); for (auto webView : g_webviews) { - webView->SetUserAgent(wxString::Format("BBL-Slicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)", SLIC3R_VERSION, + webView->SetUserAgent(wxString::Format("OrcaSlicer/v%s (%s) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)", SLIC3R_VERSION, dark ? "dark" : "light")); webView->Reload(); }