From ce991e6632dbb971cdcebfb924e60c685a829a37 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Wed, 6 Nov 2024 15:24:21 +0100 Subject: [PATCH] SPE-2551: PrusaConnect_v2 api use --- src/slic3r/GUI/ConnectRequestHandler.cpp | 2 +- src/slic3r/GUI/WebViewDialog.cpp | 6 +++--- src/slic3r/GUI/WebViewPanel.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/ConnectRequestHandler.cpp b/src/slic3r/GUI/ConnectRequestHandler.cpp index 1fe6ac3b0d..4af2f92148 100644 --- a/src/slic3r/GUI/ConnectRequestHandler.cpp +++ b/src/slic3r/GUI/ConnectRequestHandler.cpp @@ -98,7 +98,7 @@ void ConnectRequestHandler::on_connect_action_request_config(const std::string& wxString language = GUI::wxGetApp().current_language_code(); language = language.SubString(0, 1); const std::string init_options = GUI::format("{\"accessToken\": \"%4%\",\"clientVersion\": \"%1%\", \"colorMode\": \"%2%\", \"language\": \"%3%\"}", SLIC3R_VERSION, dark_mode, language, token ); - wxString script = GUI::format_wxstr("window._prusaConnect_v1.init(%1%)", init_options); + wxString script = GUI::format_wxstr("window._prusaConnect_v2.init(%1%)", init_options); run_script_bridge(script); } diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index a90aa494e6..485c974c27 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -586,9 +586,9 @@ void PrinterPickWebViewDialog::request_compatible_printers_FFF() { "\"filament_abrasive\": %6%," "\"high_flow\": %7%" "}" - , filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized, uuid, filename, nozzle_high_flow_serialized, filament_abrasive_serialized); + , filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized, uuid, filename, filament_abrasive_serialized, nozzle_high_flow_serialized); - wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); + wxString script = GUI::format_wxstr("window._prusaConnect_v2.requestCompatiblePrinter(%1%)", request); run_script(script); } void PrinterPickWebViewDialog::request_compatible_printers_SLA() @@ -621,7 +621,7 @@ void PrinterPickWebViewDialog::request_compatible_printers_SLA() "\"filename\": \"%4%\" " "}", material_type_serialized, printer_model_serialized, uuid, filename); - wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); + wxString script = GUI::format_wxstr("window._prusaConnect_v2.requestCompatiblePrinter(%1%)", request); run_script(script); } diff --git a/src/slic3r/GUI/WebViewPanel.cpp b/src/slic3r/GUI/WebViewPanel.cpp index 6cacdc2f10..583c7ec960 100644 --- a/src/slic3r/GUI/WebViewPanel.cpp +++ b/src/slic3r/GUI/WebViewPanel.cpp @@ -801,7 +801,7 @@ void ConnectWebViewPanel::logout() if (!m_browser || m_do_late_webview_create) { return; } - wxString script = L"window._prusaConnect_v1.logout()"; + wxString script = L"window._prusaConnect_v2.logout()"; run_script(script); Plater* plater = wxGetApp().plater();