From 4fd8a2b957ec9501b3ec68956ca09abdd53252b2 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Mon, 10 Apr 2023 14:14:53 +0800 Subject: [PATCH] FIX: turn off staffpick by switch Change-Id: I7ab5c2aa14273a7e7bb2badccdddac22b784f342 (cherry picked from commit b2aa5e32ce61677838621aaedb9ddbe3699bddf7) --- src/slic3r/GUI/Preferences.cpp | 2 -- src/slic3r/GUI/WebViewDialog.cpp | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index ac4a95cf3b..3c36be40e5 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -967,7 +967,6 @@ wxWindow* PreferencesDialog::create_general_page() // auto item_backup = create_item_switch(_L("Backup switch"), page, _L("Backup switch"), "units"); auto item_modelmall = create_item_checkbox(_L("Show online staff-picked models on the home page"), page, _L("Show online staff-picked models on the home page"), 50, "staff_pick_switch"); - auto title_project = create_item_title(_L("Project"), page, ""); auto item_max_recent_count = create_item_input(_L("Maximum recent projects"), "", page, _L("Maximum count of recent projects"), "max_recent_count", [](wxString value) { long max = 0; @@ -1013,7 +1012,6 @@ wxWindow* PreferencesDialog::create_general_page() #endif // _WIN32 sizer_page->Add(title_modelmall, 0, wxTOP | wxEXPAND, FromDIP(20)); sizer_page->Add(item_modelmall, 0, wxTOP, FromDIP(3)); - sizer_page->Add(title_project, 0, wxTOP| wxEXPAND, FromDIP(20)); sizer_page->Add(item_max_recent_count, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_save_choise, 0, wxTOP, FromDIP(3)); diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 4a9a1eb11d..6b6f7ba451 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -441,6 +441,10 @@ void WebViewPanel::SendDesignStaffpick(NetworkAgent *agent) RunScript(wxString::Format("window.postMessage(%s)", body2)); }); }); + } else { + std::string body2 = "{\"total\":0, \"hits\":[]}"; + body2.insert(1, "\"command\": \"modelmall_model_advise_get\", "); + RunScript(wxString::Format("window.postMessage(%s)", body2)); } }