juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-30 21:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix connection issues with CC2 on Linux (#14024)

Browse Source
This commit is contained in:
anjis
2026-06-05 21:15:52 +08:00
committed by GitHub
parent 72f7b125c6
commit 1469576dec
5 changed files with 267 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

283
resources/plugins/elegoolink/web/lan_service_web/index.html
View File

File diff suppressed because one or more lines are too long

0
resources/plugins/elegoolink/web/lan_service_web/favicon.ico → resources/web/elegoolink/lan_service_web/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

265
resources/web/elegoolink/lan_service_web/index.html Normal file
View File

File diff suppressed because one or more lines are too long

4
src/slic3r/GUI/PrinterWebView.cpp
View File

@@ -243,12 +243,10 @@ void PrinterWebView::SendAPIKey()
m_apikey); m_apikey);
m_browser->RemoveAllUserScripts(); m_browser->RemoveAllUserScripts();
#ifdef _WIN32 // RemoveAllUserScripts causes WebView to forget about our script message handler,
// RemoveAllUserScripts causes WebView2 to forget about our script message handler,
// so re-add it here. // so re-add it here.
m_browser->RemoveScriptMessageHandler("wx"); m_browser->RemoveScriptMessageHandler("wx");
m_browser->AddScriptMessageHandler("wx"); m_browser->AddScriptMessageHandler("wx");
#endif
#ifdef __linux__ #ifdef __linux__
// Re-inject the vue-resize/WebKitGTK workaround that RemoveAllUserScripts just cleared. // Re-inject the vue-resize/WebKitGTK workaround that RemoveAllUserScripts just cleared.

2
src/slic3r/Utils/ElegooLink.cpp
View File

@@ -405,7 +405,7 @@ namespace Slic3r {
if (classify_printer_model(config->opt_string("printer_model")) != ElegooPrinterType::CC2) if (classify_printer_model(config->opt_string("printer_model")) != ElegooPrinterType::CC2)
return fallback_webui; return fallback_webui;
std::string web_path = resources_dir() + "/plugins/elegoolink/web/lan_service_web/index.html"; std::string web_path = resources_dir() + "/web/elegoolink/lan_service_web/index.html";
std::replace(web_path.begin(), web_path.end(), '\\', '/'); std::replace(web_path.begin(), web_path.end(), '\\', '/');
web_path = "file://" + web_path; web_path = "file://" + web_path;