juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the appropriate Unicode char for °C (Celsius) (#14849)

Browse Source
This commit is contained in:
Alexandre Folle de Menezes
2026-07-20 09:46:29 -03:00
committed by GitHub
parent 48d5f6c1e3
commit 73f6bca9fe
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/PrintConfig.cpp
+4 -4
View File
@@ -2863,7 +2863,7 @@ void PrintConfigDef::init_fff_params()
def->nullable = true; def->nullable = true;
def->min = 0; def->min = 0;
def->max = max_temp; 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->set_default_value(new ConfigOptionIntsNullable{0});
def = this->add("filament_flush_volumetric_speed", coFloats); def = this->add("filament_flush_volumetric_speed", coFloats);
@@ -7960,7 +7960,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Extruder change"); 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->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->mode = comAdvanced;
def->sidetext = "°C"; def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->min = 0; def->min = 0;
def->nullable = true; def->nullable = true;
def->set_default_value(new ConfigOptionIntsNullable{0}); def->set_default_value(new ConfigOptionIntsNullable{0});
@@ -7990,7 +7990,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L( 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."); "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->mode = comAdvanced;
def->sidetext = "°C"; def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->min = 0; def->min = 0;
def->nullable = true; def->nullable = true;
def->set_default_value(new ConfigOptionIntsNullable{0}); 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 = this->add("filament_preheat_temperature_delta", coFloats);
def->label = L("Preheat temperature delta"); def->label = L("Preheat temperature delta");
def->tooltip = L("Temperature delta applied during pre-heating before tool change."); 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->mode = comDevelop;
def->nullable = true; def->nullable = true;
def->set_default_value(new ConfigOptionFloatsNullable{0}); def->set_default_value(new ConfigOptionFloatsNullable{0});
src/slic3r/GUI/AMSDryControl.cpp
+4 -4
View File
@@ -454,7 +454,7 @@ wxBoxSizer* AMSDryCtrWin::create_normal_state_panel(wxPanel* parent)
m_temperature_input->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); m_temperature_input->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
m_temperature_input->SetForegroundColour(StateColor::darkModeColorFor(*wxBLACK)); 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_unit_label->SetForegroundColour(*wxBLACK);
temp_sizer->Add(m_temperature_input, 1, wxRIGHT, FromDIP(1)); temp_sizer->Add(m_temperature_input, 1, wxRIGHT, FromDIP(1));
temp_sizer->Add(temp_unit_label, 0, wxALIGN_CENTER_VERTICAL); 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(); m_ams_info.m_ams_id = dev_ams->GetAmsId();
if (dev_ams->GetAmsType() == DevAmsType::N3F) { 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) { } 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"); 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()) { if (m_ams_info.m_temperature != dev_ams->GetCurrentTemperature()) {
updated += 1; updated += 1;
m_ams_info.m_temperature = dev_ams->GetCurrentTemperature(); 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)) { if (is_dry_ctr_idle(dev_ams)) {
src/slic3r/GUI/Tab.cpp
+1 -1
View File
@@ -7917,7 +7917,7 @@ bool Tab::validate_filament_temperature_pairs()
if (delta <= rule.max_delta) if (delta <= rule.max_delta)
continue; continue;
const wxString deg_c = wxString::FromUTF8("℃"); const wxString deg_c = wxString::FromUTF8(u8"\u2103" /* °C */);
const wxString bullet = wxString::FromUTF8("•"); 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"), 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); rule.label, bullet, first_temp, deg_c, other_temp, deg_c, bullet, rule.max_delta, deg_c, delta, deg_c);