diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index c46d1d8bfd..cf79b83a0b 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -507,13 +507,13 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event) if (in_blacklist) { if (action == "prohibition") { - MessageDialog msg_wingow(nullptr, info, _L("Error"), wxICON_WARNING | wxOK); + MessageDialog msg_wingow(nullptr, wxString::FromUTF8(info), _L("Error"), wxICON_WARNING | wxOK); msg_wingow.ShowModal(); //m_comboBox_filament->SetSelection(m_filament_selection); return; } else if (action == "warning") { - MessageDialog msg_wingow(nullptr, info, _L("Warning"), wxICON_INFORMATION | wxOK); + MessageDialog msg_wingow(nullptr, wxString::FromUTF8(info), _L("Warning"), wxICON_INFORMATION | wxOK); msg_wingow.ShowModal(); } } diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 387817599a..63ec7527d1 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1046,7 +1046,7 @@ bool CalibrationPresetPage::is_filaments_compatiable(const std::vector } if (!Print::check_multi_filaments_compatibility(filament_types)) { - error_tips = L("Can not print multiple filaments which have large difference of temperature together. Otherwise, the extruder and nozzle may be blocked or damaged during printing"); + error_tips = _u8L("Can not print multiple filaments which have large difference of temperature together. Otherwise, the extruder and nozzle may be blocked or damaged during printing"); return false; } @@ -1164,11 +1164,12 @@ void CalibrationPresetPage::update_show_status() } } - if (is_blocking_printing()) { - show_status(CaliPresetPageStatus::CaliPresetStatusUnsupportedPrinter); - return; - } - else if (obj_->is_connecting() || !obj_->is_connected()) { + //if (is_blocking_printing()) { + // show_status(CaliPresetPageStatus::CaliPresetStatusUnsupportedPrinter); + // return; + //} + //else + if (obj_->is_connecting() || !obj_->is_connected()) { show_status(CaliPresetPageStatus::CaliPresetStatusInConnecting); return; } diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 65ff027025..6062a65344 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -5140,7 +5140,7 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st action = prohibited_filament["action"].get(); description = prohibited_filament["description"].get(); - description = blacklist_prompt[description].ToStdString(); + description = blacklist_prompt[description].ToUTF8().data(); } else { return;