3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 17:58:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: wrong text encoding [STUDIO-3753]

Browse source 
Change-Id: Ie05367ab294c87426dc4ce534ffb28a183a447bf
This commit is contained in:
liz.li 2023-07-24 15:20:46 +08:00 • committed by Lane.Wei
parent 5328d346c7
commit 8ae8b6b878
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/AMSMaterialsSetting.cpp
View file

@ -507,13 +507,13 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
if (in_blacklist) { if (in_blacklist) {
if (action == "prohibition") { 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(); msg_wingow.ShowModal();
//m_comboBox_filament->SetSelection(m_filament_selection); //m_comboBox_filament->SetSelection(m_filament_selection);
return; return;
} }
else if (action == "warning") { 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(); msg_wingow.ShowModal();
} }
} }

13
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View file

@ -1046,7 +1046,7 @@ bool CalibrationPresetPage::is_filaments_compatiable(const std::vector<Preset*>
} }
if (!Print::check_multi_filaments_compatibility(filament_types)) { 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; return false;
} }
@ -1164,11 +1164,12 @@ void CalibrationPresetPage::update_show_status()
} }
} }
if (is_blocking_printing()) { //if (is_blocking_printing()) {
show_status(CaliPresetPageStatus::CaliPresetStatusUnsupportedPrinter); // show_status(CaliPresetPageStatus::CaliPresetStatusUnsupportedPrinter);
return; // return;
} //}
else if (obj_->is_connecting() || !obj_->is_connected()) { //else
if (obj_->is_connecting() || !obj_->is_connected()) {
show_status(CaliPresetPageStatus::CaliPresetStatusInConnecting); show_status(CaliPresetPageStatus::CaliPresetStatusInConnecting);
return; return;
} }

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

@ -5140,7 +5140,7 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st
action = prohibited_filament["action"].get<std::string>(); action = prohibited_filament["action"].get<std::string>();
description = prohibited_filament["description"].get<std::string>(); description = prohibited_filament["description"].get<std::string>();
description = blacklist_prompt[description].ToStdString(); description = blacklist_prompt[description].ToUTF8().data();
} }
else { else {
return; return;