From 0cf0bd52fc6bfd6465c174553cc6e124d1c2c52e Mon Sep 17 00:00:00 2001 From: "maosheng.wei" Date: Wed, 24 May 2023 10:29:43 +0800 Subject: [PATCH] NEW: [STUDIO-2769] add jump check ams blacklist checkbox Change-Id: I827c54fcfe24aa153d5b1f43a948d558d1abb03e --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 2 +- src/slic3r/GUI/Preferences.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index cb399c3dc..de9630d2e 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -535,7 +535,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event) //check is it in the filament blacklist - if(!is_virtual_tray()){ + if (!is_virtual_tray() && wxGetApp().app_config->get("skip_ams_blacklist_check") != "true") { bool in_blacklist = false; std::string action; std::string info; diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index b92f3a578..ac4a95cf3 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -993,6 +993,7 @@ wxWindow* PreferencesDialog::create_general_page() auto title_develop_mode = create_item_title(_L("Develop mode"), page, _L("Develop mode")); auto item_develop_mode = create_item_checkbox(_L("Develop mode"), page, _L("Develop mode"), 50, "developer_mode"); + auto item_skip_ams_blacklist_check = create_item_checkbox(_L("Skip AMS blacklist check"), page, _L("Skip AMS blacklist check"), 50, "skip_ams_blacklist_check"); sizer_page->Add(title_general_settings, 0, wxEXPAND, 0); sizer_page->Add(item_language, 0, wxTOP, FromDIP(3)); @@ -1029,6 +1030,7 @@ wxWindow* PreferencesDialog::create_general_page() sizer_page->Add(title_develop_mode, 0, wxTOP | wxEXPAND, FromDIP(20)); sizer_page->Add(item_develop_mode, 0, wxTOP, FromDIP(3)); + sizer_page->Add(item_skip_ams_blacklist_check, 0, wxTOP, FromDIP(3)); page->SetSizer(sizer_page); page->Layout();