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

Revert "update user agent" for now as it cause trouble to login

Browse source 
This reverts commit ae8995fec2.

(cherry picked from commit cd35171fd18d47839faa3ea119f3cbfc356c0a65)
This commit is contained in:
SoftFever 2023-12-19 23:30:44 +08:00
parent bba367cde8
commit 8dd9c11241
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/web/guide/js/globalapi.js
View file

@ -260,7 +260,7 @@ function clearCookie(name) {
/*--------Studio WX Message-------*/ /*--------Studio WX Message-------*/
function IsInSlicer() function IsInSlicer()
{ {
let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') );
return bMatch; return bMatch;
} }

2
resources/web/homepage/js/globalapi.js
View file

@ -260,7 +260,7 @@ function clearCookie(name) {
/*--------Studio WX Message-------*/ /*--------Studio WX Message-------*/
function IsInSlicer() function IsInSlicer()
{ {
let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') );
return bMatch; return bMatch;
} }

2
resources/web/include/globalapi.js
View file

@ -327,7 +327,7 @@ function clearCookie(name) {
/*--------Studio WX Message-------*/ /*--------Studio WX Message-------*/
function IsInSlicer() function IsInSlicer()
{ {
let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') );
return bMatch; return bMatch;
} }

2
resources/web/login/js/globalapi.js
View file

@ -260,7 +260,7 @@ function clearCookie(name) {
/*--------Studio WX Message-------*/ /*--------Studio WX Message-------*/
function IsInSlicer() function IsInSlicer()
{ {
let bMatch=navigator.userAgent.match( RegExp('OrcaSlicer','i') ); let bMatch=navigator.userAgent.match( RegExp('BBL-Slicer','i') );
return bMatch; return bMatch;
} }

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

@ -87,7 +87,7 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN
BOOST_LOG_TRIVIAL(info) << "login url = " << TargetUrl.ToStdString(); BOOST_LOG_TRIVIAL(info) << "login url = " << TargetUrl.ToStdString();
m_bbl_user_agent = wxString::Format("OrcaSlicer/v%s", SLIC3R_VERSION); m_bbl_user_agent = wxString::Format("BBL-Slicer/v%s", SLIC3R_VERSION);
// set the frame icon // set the frame icon

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

@ -263,12 +263,12 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
if (webView) { if (webView) {
webView->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); webView->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
#ifdef __WIN32__ #ifdef __WIN32__
webView->SetUserAgent(wxString::Format("OrcaSlicer/v%s (%s) Mozilla/5.0 (Windows NT 10.0; Win64; x64) " webView->SetUserAgent(wxString::Format("BBL-Slicer/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, "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")); Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light"));
webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
// We register the wxfs:// protocol for testing purposes // We register the wxfs:// protocol for testing purposes
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewArchiveHandler("orca"))); webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewArchiveHandler("bbl")));
// And the memory: file system // And the memory: file system
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory"))); webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory")));
#else #else
@ -277,7 +277,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
// And the memory: file system // And the memory: file system
webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory"))); webView->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory")));
webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
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, 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,
Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light")); Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light"));
#endif #endif
#ifdef __WXMAC__ #ifdef __WXMAC__
@ -380,7 +380,7 @@ void WebView::RecreateAll()
{ {
auto dark = Slic3r::GUI::wxGetApp().dark_mode(); auto dark = Slic3r::GUI::wxGetApp().dark_mode();
for (auto webView : g_webviews) { for (auto webView : g_webviews) {
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, 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,
dark ? "dark" : "light")); dark ? "dark" : "light"));
webView->Reload(); webView->Reload();
} }