diff --git a/resources/web/data/text.js b/resources/web/data/text.js index a7577abc56..40e20fbbbc 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -107,6 +107,9 @@ var LangText = { t113: "You may change your choice in preference anytime.", orca1: "Edit Project Info", orca2: "no model information", + orca3: "Stealth Mode", + orca4: "This stops the transmission of data to Bambu's cloud services. Users who don't use BBL machines or use LAN mode only can safely turn on this function.", + orca5: "Enable Stealth Mode.", }, ca_ES: { t1: "Benvingut a Orca Slicer", diff --git a/resources/web/guide/21/index.html b/resources/web/guide/21/index.html index a5163568bd..3e19309d19 100644 --- a/resources/web/guide/21/index.html +++ b/resources/web/guide/21/index.html @@ -100,7 +100,7 @@
-
Back
+
Back
Next
diff --git a/resources/web/guide/22/22.js b/resources/web/guide/22/22.js index a335e75734..ff284ed91a 100644 --- a/resources/web/guide/22/22.js +++ b/resources/web/guide/22/22.js @@ -562,7 +562,7 @@ function ReturnPreviewPage() let nMode=m_ProfileItem["model"].length; if( nMode==1) - document.location.href="../3/index.html"; + document.location.href="../1/index.html"; else document.location.href="../21/index.html"; } @@ -573,7 +573,7 @@ function GotoNetPluginPage() let bRet=ResponseFilamentResult(); if(bRet) - window.location.href="../5/index.html"; + window.location.href="../4orca/index.html"; } function FinishGuide() diff --git a/resources/web/guide/4orca/4orca.css b/resources/web/guide/4orca/4orca.css new file mode 100644 index 0000000000..f12a7860fe --- /dev/null +++ b/resources/web/guide/4orca/4orca.css @@ -0,0 +1,33 @@ + +#Content +{ + padding:0% 15%; +} + +#FeatureText +{ + line-height: 30px; + margin-top: 10mm; +} + + +#CheckArea +{ + margin-top:10mm; + line-height: 30px; +} + +#StealthMode +{ + width: 30px; +} + +#RestartText +{ + padding-left:30px; +} + +.TextPoint +{ + font-size:14px; +} \ No newline at end of file diff --git a/resources/web/guide/4orca/4orca.js b/resources/web/guide/4orca/4orca.js new file mode 100644 index 0000000000..1dbb86abd2 --- /dev/null +++ b/resources/web/guide/4orca/4orca.js @@ -0,0 +1,48 @@ + +function OnInit() +{ + TranslatePage(); + + SendStealthModeCheck(); +} + + + +function SendStealthModeCheck() +{ + let nVal="no"; + if( $('#StealthMode').is(':checked') ) + nVal="yes"; + + var tSend={}; + tSend['sequence_id']=Math.round(new Date() / 1000); + tSend['command']="save_stealth_mode"; + tSend['data']={}; + tSend['data']['action']=nVal; + + SendWXMessage( JSON.stringify(tSend) ); + + return true; +} + +function GotoNetPluginPage() +{ + let bRet=SendStealthModeCheck(); + + if(bRet) + window.location.href="../5/index.html"; +} + + +function FinishGuide() +{ + var tSend={}; + tSend['sequence_id']=Math.round(new Date() / 1000); + tSend['command']="user_guide_finish"; + tSend['data']={}; + tSend['data']['action']="finish"; + + SendWXMessage( JSON.stringify(tSend) ); + + //window.location.href="../6/index.html"; +} diff --git a/resources/web/guide/4orca/index.html b/resources/web/guide/4orca/index.html new file mode 100644 index 0000000000..975123eabc --- /dev/null +++ b/resources/web/guide/4orca/index.html @@ -0,0 +1,38 @@ + + + + + +引导_P1 + + + + + + + + + + + +
+
Stealth Mode
+
+
+ +
+
This stops the transmission of data to Bambu's cloud services. Users who don't use BBL machines or use LAN mode only can safely turn on this function.
+
+ + + +
Enable Stealth Mode.
+
+ +
+
+
Back
+
Next
+
+ + diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 7ab0ad2329..054a09c4f7 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -81,6 +81,15 @@ std::string AppConfig::get_hms_host() // #endif } +bool AppConfig::get_stealth_mode() +{ + // always return true when user did not finish setup wizard yet + if (!get_bool("firstguide","finish")) { + return true; + } + return get_bool("stealth_mode"); +} + void AppConfig::reset() { m_storage.clear(); diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp index f58cfedb65..cf95b8ec8d 100644 --- a/src/libslic3r/AppConfig.hpp +++ b/src/libslic3r/AppConfig.hpp @@ -45,6 +45,7 @@ public: std::string get_language_code(); std::string get_hms_host(); + bool get_stealth_mode(); // Clear and reset to defaults. void reset(); @@ -80,8 +81,10 @@ public: { std::string value; this->get(section, key, value); return value; } std::string get(const std::string &key) const { std::string value; this->get("app", key, value); return value; } + bool get_bool(const std::string §ion, const std::string &key) const + { return this->get(section, key) == "true" || this->get(key) == "1"; } bool get_bool(const std::string &key) const - { return this->get(key) == "true" || this->get(key) == "1"; } + { return this->get_bool("app", key); } void set(const std::string §ion, const std::string &key, const std::string &value) { #ifndef NDEBUG diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 74c268c6a2..81e3c21fb2 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -940,7 +940,7 @@ void GUI_App::post_init() } #endif - if (app_config->get("stealth_mode") == "false") + if (!app_config->get_stealth_mode()) hms_query = new HMSQuery(); m_show_gcode_window = app_config->get_bool("show_gcode_window"); @@ -971,7 +971,7 @@ void GUI_App::post_init() this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); this->check_new_version_sf(); - if (is_user_login() && app_config->get("stealth_mode") == "false") { + if (is_user_login() && !app_config->get_stealth_mode()) { // this->check_privacy_version(0); request_user_handle(0); } @@ -4141,6 +4141,7 @@ void GUI_App::check_update(bool show_tips, int by_user) void GUI_App::check_new_version(bool show_tips, int by_user) { + return; // orca: not used, see check_new_version_sf std::string platform = "windows"; #ifdef __WINDOWS__ @@ -4674,7 +4675,7 @@ void GUI_App::sync_preset(Preset* preset) void GUI_App::start_sync_user_preset(bool with_progress_dlg) { - if (app_config->get("stealth_mode") == "true") + if (app_config->get_stealth_mode()) return; if (!m_agent || !m_agent->is_user_login()) return; diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index ecc3d533c5..94913348e1 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -109,6 +109,7 @@ GuideFrame::GuideFrame(GUI_App *pGUI, long style) // INI m_SectionName = "firstguide"; PrivacyUse = false; + StealthMode = false; InstallNetplugin = false; m_MainPtr = pGUI; @@ -486,6 +487,15 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt) else InstallNetplugin = false; } + else if (strCmd == "save_stealth_mode") { + wxString strAction = j["data"]["action"]; + + if (strAction == "yes") { + StealthMode = true; + } else { + StealthMode = false; + } + } } catch (std::exception &e) { // wxMessageBox(e.what(), "json Exception", MB_OK); BOOST_LOG_TRIVIAL(trace) << "GuideFrame::OnScriptMessage;Error:" << e.what(); @@ -616,6 +626,7 @@ int GuideFrame::SaveProfile() // m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "privacyuse", "0"); m_MainPtr->app_config->set("region", m_Region); + m_MainPtr->app_config->set_bool("stealth_mode", StealthMode); //finish m_MainPtr->app_config->set(std::string(m_SectionName.mb_str()), "finish", "1"); @@ -1222,6 +1233,9 @@ int GuideFrame::LoadProfile() m_ProfileJson["network_plugin_install"] = wxGetApp().app_config->get("app","installed_networking"); m_ProfileJson["network_plugin_compability"] = wxGetApp().is_compatibility_version() ? "1" : "0"; network_plugin_ready = wxGetApp().is_compatibility_version(); + + StealthMode = wxGetApp().app_config->get_bool("app","stealth_mode"); + m_ProfileJson["stealth_mode"] = StealthMode; } catch (std::exception &e) { //wxLogMessage("GUIDE: load_profile_error %s ", e.what()); diff --git a/src/slic3r/GUI/WebGuideDialog.hpp b/src/slic3r/GUI/WebGuideDialog.hpp index ff66f5cb34..4fd495fe6d 100644 --- a/src/slic3r/GUI/WebGuideDialog.hpp +++ b/src/slic3r/GUI/WebGuideDialog.hpp @@ -109,6 +109,7 @@ private: // User Config bool PrivacyUse; + bool StealthMode; std::string m_Region; bool InstallNetplugin;