3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: [STUDIO-3157] AMS material blacklist, prompt without translation

Browse source 
Change-Id: Id4ec08aea568680d2f08346bf18782830bebf205
This commit is contained in:
maosheng.wei 2023-06-14 10:24:39 +08:00 • committed by Lane.Wei
parent 3dd15ee681
commit ca1facfaa0
27 changed files with 746 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/DeviceManager.cpp
View file

@ -4792,6 +4792,14 @@ bool DeviceManager::load_filaments_blacklist_config(std::string config_file)
void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::string tag_type, bool& in_blacklist, std::string& ac, std::string& info)
{
std::unordered_map<std::string, wxString> blacklist_prompt =
{
{"TPU: not supported", _L("TPU is not supported by AMS.")},
{"Bambu PET-CF/PA6-CF: not supported", _L("Bambu PET-CF/PA6-CF is not supported by AMS.")},
{"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside AMS,please take care to dry it before use.")},
{"CF/GF: hard and brittle", _L("CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution.")}
};
in_blacklist = false;
if (filaments_blacklist.contains("blacklist")) {
@ -4811,6 +4819,8 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st
type = prohibited_filament["type"].get<std::string>();
action = prohibited_filament["action"].get<std::string>();
description = prohibited_filament["description"].get<std::string>();
description = blacklist_prompt[description].ToStdString();
}
else {
return;

2
src/slic3r/GUI/Plater.cpp
View file

@ -11634,7 +11634,7 @@ void Plater::show_object_info()
if (selCount > 1) {
notify_manager->bbl_close_objectsinfo_notification();
info_text += (boost::format(_utf8(L("Number of currently selected parts: %1%\n"))) % selCount).str();
info_text += (boost::format(_utf8(L("Number of currently selected: %1%\n"))) % selCount).str();
notify_manager->bbl_show_objectsinfo_notification(info_text, false, !(p->current_panel == p->view3D));
return;
}

2
src/slic3r/GUI/SelectMachine.cpp
View file

@ -2386,7 +2386,7 @@ void SelectMachineDialog::connect_printer_mqtt()
if (obj_->connection_type() == "cloud") {
show_status(PrintDialogStatus::PrintStatusSending);
m_status_bar->disable_cancel_button();
m_status_bar->set_status_text("Connecting to the printer. Unable to cancel during the connection process.");
m_status_bar->set_status_text(_L("Connecting to the printer. Unable to cancel during the connection process."));
#if !BBL_RELEASE_TO_PUBLIC
obj_->connect(false, wxGetApp().app_config->get("enable_ssl_for_mqtt") == "true" ? true : false);
#else