From 73f6bca9fef1842fd7ced8d50b9deff7283e0a66 Mon Sep 17 00:00:00 2001 From: Alexandre Folle de Menezes Date: Mon, 20 Jul 2026 09:46:29 -0300 Subject: [PATCH] =?UTF-8?q?Use=20the=20appropriate=20Unicode=20char=20for?= =?UTF-8?q?=20=C2=B0C=20(Celsius)=20(#14849)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libslic3r/PrintConfig.cpp | 8 ++++---- src/slic3r/GUI/AMSDryControl.cpp | 8 ++++---- src/slic3r/GUI/Tab.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index e3d417d224..9c7442096d 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2863,7 +2863,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = max_temp; - def->sidetext = L(u8"℃" /* °C */); // degrees Celsius, CIS languages need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->set_default_value(new ConfigOptionIntsNullable{0}); def = this->add("filament_flush_volumetric_speed", coFloats); @@ -7960,7 +7960,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Extruder change"); def->tooltip = L("To prevent oozing, the nozzle temperature will be cooled during ramming. Therefore, the ramming time must be greater than the cooldown time. 0 means disabled."); def->mode = comAdvanced; - def->sidetext = "°C"; + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->nullable = true; def->set_default_value(new ConfigOptionIntsNullable{0}); @@ -7990,7 +7990,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L( "To prevent oozing, the nozzle temperature will be cooled during ramming. Note: only a cooldown command and fan activation are triggered, reaching the target temperature is not guaranteed. 0 means disabled."); def->mode = comAdvanced; - def->sidetext = "°C"; + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->nullable = true; def->set_default_value(new ConfigOptionIntsNullable{0}); @@ -8041,7 +8041,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_preheat_temperature_delta", coFloats); def->label = L("Preheat temperature delta"); def->tooltip = L("Temperature delta applied during pre-heating before tool change."); - def->sidetext = "°C"; + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->mode = comDevelop; def->nullable = true; def->set_default_value(new ConfigOptionFloatsNullable{0}); diff --git a/src/slic3r/GUI/AMSDryControl.cpp b/src/slic3r/GUI/AMSDryControl.cpp index 943fad3230..a5209fdef7 100644 --- a/src/slic3r/GUI/AMSDryControl.cpp +++ b/src/slic3r/GUI/AMSDryControl.cpp @@ -454,7 +454,7 @@ wxBoxSizer* AMSDryCtrWin::create_normal_state_panel(wxPanel* parent) m_temperature_input->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); m_temperature_input->SetForegroundColour(StateColor::darkModeColorFor(*wxBLACK)); - Label* temp_unit_label = new Label(parent, wxString::FromUTF8("℃")); + Label* temp_unit_label = new Label(parent, wxString::FromUTF8(u8"\u2103" /* °C */)); temp_unit_label->SetForegroundColour(*wxBLACK); temp_sizer->Add(m_temperature_input, 1, wxRIGHT, FromDIP(1)); temp_sizer->Add(temp_unit_label, 0, wxALIGN_CENTER_VERTICAL); @@ -1444,9 +1444,9 @@ int AMSDryCtrWin::update_ams_change(DevAms* dev_ams) m_ams_info.m_ams_id = dev_ams->GetAmsId(); if (dev_ams->GetAmsType() == DevAmsType::N3F) { - m_temperature_input->SetHint("45-65" + wxString::FromUTF8("°C")); + m_temperature_input->SetHint("45-65" + wxString::FromUTF8(u8"\u2103" /* °C */)); } else if (dev_ams->GetAmsType() == DevAmsType::N3S) { - m_temperature_input->SetHint("45-85" + wxString::FromUTF8("°C")); + m_temperature_input->SetHint("45-85" + wxString::FromUTF8(u8"\u2103" /* °C */)); } m_time_input->SetHint("1-24 h"); @@ -1467,7 +1467,7 @@ int AMSDryCtrWin::update_dryness_status(DevAms* dev_ams) if (m_ams_info.m_temperature != dev_ams->GetCurrentTemperature()) { updated += 1; m_ams_info.m_temperature = dev_ams->GetCurrentTemperature(); - m_temperature_data_label->SetLabel(std::to_string(m_ams_info.m_temperature) + wxString::FromUTF8("°C")); + m_temperature_data_label->SetLabel(std::to_string(m_ams_info.m_temperature) + wxString::FromUTF8(u8"\u2103" /* °C */)); } if (is_dry_ctr_idle(dev_ams)) { diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 28d4ac8614..326425bc4f 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -7917,7 +7917,7 @@ bool Tab::validate_filament_temperature_pairs() if (delta <= rule.max_delta) continue; - const wxString deg_c = wxString::FromUTF8("℃"); + const wxString deg_c = wxString::FromUTF8(u8"\u2103" /* °C */); const wxString bullet = wxString::FromUTF8("•"); invalid_pairs += wxString::Format(_L(" - %s:\n %s first layer %d %s, other layers %d %s\n %s max delta %d %s, current delta %d %s\n"), rule.label, bullet, first_temp, deg_c, other_temp, deg_c, bullet, rule.max_delta, deg_c, delta, deg_c);