juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standard units don't need translation, part 2 (#9974)

Browse Source 
* Revert unit change made by mistake, and fix some unit translations

* Fix the declaration of untranslated Unicode strings
This commit is contained in:
Alexandre Folle de Menezes
2025-07-16 22:48:29 -03:00
committed by GitHub
parent 03d25c97b4
commit fd0d716f53
29 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/libslic3r/PrintConfig.cpp
View File

@@ -697,7 +697,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->max = 120;
@@ -707,7 +707,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Cool Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->max = 300;
@@ -717,7 +717,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Textured Cool Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->max = 300;
@@ -727,7 +727,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Engineering Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->max = 300;
@@ -737,7 +737,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the High Temp Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->max = 300;
@@ -747,7 +747,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Textured PEI Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->max = 300;
@@ -758,7 +758,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = 120;
def->set_default_value(new ConfigOptionInts{ 35 });
@@ -768,7 +768,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Cool Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = 120;
def->set_default_value(new ConfigOptionInts{ 35 });
@@ -778,7 +778,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Textured Cool Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = 120;
def->set_default_value(new ConfigOptionInts{ 40 });
@@ -788,7 +788,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Engineering Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = 300;
def->set_default_value(new ConfigOptionInts{ 45 });
@@ -798,7 +798,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the High Temp Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->max = 300;
def->set_default_value(new ConfigOptionInts{ 45 });
@@ -807,7 +807,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Textured PEI Plate.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = 300;
def->set_default_value(new ConfigOptionInts{45});
@@ -1415,7 +1415,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("default_acceleration", coFloat);
def->label = L("Normal printing");
def->tooltip = L("The default acceleration of both normal printing and travel except initial layer.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(500.0));
@@ -2009,7 +2009,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("This setting stands for how much volume of filament can be melted and extruded per second. "
"Printing speed is limited by max volumetric speed, in case of too high and unreasonable speed setting. "
"Can't be zero.");
def->sidetext = "mm³/s"; // cubic milimeters per second, don't need translation
def->sidetext = u8"mm³/s"; // cubic milimeters per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 2. });
@@ -2186,7 +2186,7 @@ void PrintConfigDef::init_fff_params()
"the nozzle may not be known, and the filament pressure is likely not yet stable. "
"Before purging the print head into an infill or a sacrificial object, Orca Slicer will always prime "
"this amount of material into the wipe tower to produce successive infill or sacrificial object extrusions reliably.");
def->sidetext = "mm³"; // cubic milimeters, don't need translation
def->sidetext = u8"mm³"; // cubic milimeters, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 15. });
@@ -2217,7 +2217,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("filament_multitool_ramming_volume", coFloats);
def->label = L("Multi-tool ramming volume");
def->tooltip = L("The volume to be rammed before the tool change.");
def->sidetext = "mm³"; // cubic milimeters, don't need translation
def->sidetext = u8"mm³"; // cubic milimeters, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 10. });
@@ -2225,7 +2225,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("filament_multitool_ramming_flow", coFloats);
def->label = L("Multi-tool ramming flow");
def->tooltip = L("Flow used for ramming the filament before the tool change.");
def->sidetext = "mm³/s"; // cubic milimeters per second, don't need translation
def->sidetext = u8"mm³/s"; // cubic milimeters per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 10. });
@@ -2233,7 +2233,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("filament_density", coFloats);
def->label = L("Density");
def->tooltip = L("Filament density. For statistics only.");
def->sidetext = "g/cm³"; // grams per cubic milimeter, don't need translation
def->sidetext = u8"g/cm³"; // grams per cubic milimeter, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 0. });
@@ -2303,7 +2303,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Softening temperature");
def->tooltip = L("The material softens at this temperature, so when the bed temperature is equal to or greater than this, "
"it's highly recommended to open the front door and/or remove the upper glass to avoid clogging.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->mode = comSimple;
def->set_default_value(new ConfigOptionInts{ 100 });
@@ -2510,7 +2510,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("outer_wall_acceleration", coFloat);
def->label = L("Outer wall");
def->tooltip = L("Acceleration of outer walls.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(10000));
@@ -2518,7 +2518,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("inner_wall_acceleration", coFloat);
def->label = L("Inner wall");
def->tooltip = L("Acceleration of inner walls.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(10000));
@@ -2526,7 +2526,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("travel_acceleration", coFloat);
def->label = L("Travel");
def->tooltip = L("Acceleration of travel moves.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(10000));
@@ -2534,7 +2534,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("top_surface_acceleration", coFloat);
def->label = L("Top surface");
def->tooltip = L("Acceleration of top surface infill. Using a lower value may improve top surface quality.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(500));
@@ -2542,7 +2542,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("outer_wall_acceleration", coFloat);
def->label = L("Outer wall");
def->tooltip = L("Acceleration of outer wall. Using a lower value can improve quality.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(500));
@@ -2577,7 +2577,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("initial_layer_acceleration", coFloat);
def->label = L("Initial layer");
def->tooltip = L("Acceleration of initial layer. Using a lower value can improve build plate adhesion.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(300));
@@ -2730,7 +2730,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Initial layer");
def->full_label = L("Initial layer nozzle temperature");
def->tooltip = L("Nozzle temperature for printing initial layer when using this filament.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = max_temp;
def->set_default_value(new ConfigOptionInts { 200 });
@@ -3586,7 +3586,7 @@ void PrintConfigDef::init_fff_params()
(void)L("Maximum acceleration of the Y axis");
(void)L("Maximum acceleration of the Z axis");
(void)L("Maximum acceleration of the E axis");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->mode = comSimple;
def->set_default_value(new ConfigOptionFloats(axis.max_acceleration));
@@ -3647,7 +3647,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Maximum acceleration for extruding (M204 P)");
// "Marlin (legacy) firmware flavor will use this also "
// "as travel acceleration (M204 T).");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->readonly = false;
def->mode = comSimple;
@@ -3659,7 +3659,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Maximum acceleration for retracting");
def->category = L("Machine limits");
def->tooltip = L("Maximum acceleration for retracting (M204 R)");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->readonly = false;
def->mode = comSimple;
@@ -3670,7 +3670,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Maximum acceleration for travel");
def->category = L("Machine limits");
def->tooltip = L("Maximum acceleration for travel (M204 T), it only applies to Marlin 2.");
def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation
def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation
def->min = 0;
def->readonly = false;
def->mode = comAdvanced;
@@ -3725,7 +3725,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("This parameter smooths out sudden extrusion rate changes that happen when "
"the printer transitions from printing a high flow (high speed/larger width) "
"extrusion to a lower flow (lower speed/smaller width) extrusion and vice versa.\n\n"
"It defines the maximum rate by which the extruded volumetric flow in mm³/s² can change over time. "
"It defines the maximum rate by which the extruded volumetric flow in mm³/s can change over time. "
"Higher values mean higher extrusion rate changes are allowed, resulting in faster speed transitions.\n\n"
"A value of 0 disables the feature.\n\n"
"For a high speed, high flow direct drive printer (like the Bambu lab or Voron) this value is usually not needed. "
@@ -3736,7 +3736,7 @@ void PrintConfigDef::init_fff_params()
"A value of 10-15 mm³/s² is a good starting point for direct drive extruders and 5-10 mm³/s² for Bowden style.\n\n"
"This feature is known as Pressure Equalizer in Prusa slicer.\n\n"
"Note: this parameter disables arc fitting.");
def->sidetext = "mm³/s²"; // cubic milimeters per second per second, don't need translation
def->sidetext = u8"mm³/s²"; // cubic milimeters per second per second, don't need translation
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0));
@@ -3857,7 +3857,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_volume", coFloat);
def->label = L("Nozzle volume");
def->tooltip = L("Volume of nozzle between the cutter and the end of nozzle.");
def->sidetext = "mm³"; // cubic milimeters, don't need translation
def->sidetext = u8"mm³"; // cubic milimeters, don't need translation
def->mode = comAdvanced;
def->readonly = false;
def->set_default_value(new ConfigOptionFloat { 0.0 });
@@ -5369,7 +5369,7 @@ void PrintConfigDef::init_fff_params()
"This may be useful if your printer does not support M141/M191 commands, or if you desire "
"to handle heat soaking in the print start macro if no active chamber heater is installed."
);
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Chamber temperature");
def->min = 0;
def->max = max_temp;
@@ -5378,7 +5378,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_temperature", coInts);
def->label = L("Other layers");
def->tooltip = L("Nozzle temperature for layers after the initial one.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->full_label = L("Nozzle temperature");
def->min = 0;
def->max = max_temp;
@@ -5387,7 +5387,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_temperature_range_low", coInts);
def->label = L("Min");
//def->tooltip = L("");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = max_temp;
def->set_default_value(new ConfigOptionInts { 190 });
@@ -5395,7 +5395,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_temperature_range_high", coInts);
def->label = L("Max");
//def->tooltip = L("");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = max_temp;
def->set_default_value(new ConfigOptionInts { 240 });
@@ -5571,7 +5571,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("prime_volume", coFloat);
def->label = L("Prime volume");
def->tooltip = L("The volume of material to prime extruder on tower.");
def->sidetext = "mm³"; // cubic milimeters, don't need translation
def->sidetext = u8"mm³"; // cubic milimeters, don't need translation
def->min = 1.0;
def->mode = comSimple;
def->set_default_value(new ConfigOptionFloat(45.));
@@ -5750,7 +5750,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Idle temperature");
def->tooltip = L("Nozzle temperature when the tool is currently not used in multi-tool setups. "
"This is only used when 'Ooze prevention' is active in Print Settings. Set to 0 to disable.");
def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation
def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation
def->min = 0;
def->max = max_temp;
def->set_default_value(new ConfigOptionInts{0});

2
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@@ -1918,7 +1918,7 @@ MaxVolumetricSpeedPresetPage::MaxVolumetricSpeedPresetPage(
titles.push_back(_L("Step"));
m_custom_range_panel->set_titles(titles);
m_custom_range_panel->set_unit("mm³/s");
m_custom_range_panel->set_unit(wxString::FromUTF8("mm³/s"));
}
}
}}

4
src/slic3r/GUI/ConfigWizard.cpp
View File

@@ -1448,7 +1448,7 @@ PageTemperatures::PageTemperatures(ConfigWizard *parent)
auto *sizer_extr = new wxFlexGridSizer(3, 5, 5);
auto *text_extr = new wxStaticText(this, wxID_ANY, _L("Extrusion Temperature:"));
auto *unit_extr = new wxStaticText(this, wxID_ANY, "\u2103" /* °C */);
auto *unit_extr = new wxStaticText(this, wxID_ANY, wxString::FromUTF8("\u2103") /* °C */);
sizer_extr->AddGrowableCol(0, 1);
sizer_extr->Add(text_extr, 0, wxALIGN_CENTRE_VERTICAL);
sizer_extr->Add(spin_extr);
@@ -1462,7 +1462,7 @@ PageTemperatures::PageTemperatures(ConfigWizard *parent)
auto *sizer_bed = new wxFlexGridSizer(3, 5, 5);
auto *text_bed = new wxStaticText(this, wxID_ANY, _L("Bed Temperature:"));
auto *unit_bed = new wxStaticText(this, wxID_ANY, "\u2103" /* °C */);
auto *unit_bed = new wxStaticText(this, wxID_ANY, wxString::FromUTF8("\u2103") /* °C */);
sizer_bed->AddGrowableCol(0, 1);
sizer_bed->Add(text_bed, 0, wxALIGN_CENTRE_VERTICAL);
sizer_bed->Add(spin_bed);

6
src/slic3r/GUI/ExtrusionCalibration.cpp
View File

@@ -127,21 +127,21 @@ void ExtrusionCalibration::create()
wxWindow::GetTextExtent(_L("Bed Temperature")).x),
wxWindow::GetTextExtent(_L("Max volumetric speed")).x),
EXTRUSION_CALIBRATION_INPUT_SIZE.x);
m_nozzle_temp = new TextInput(m_step_1_panel, wxEmptyString, "\u2103" /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY);
m_nozzle_temp = new TextInput(m_step_1_panel, wxEmptyString, wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY);
nozzle_temp_sizer->Add(nozzle_temp_text, 0, wxALIGN_LEFT);
nozzle_temp_sizer->AddSpacer(FromDIP(4));
nozzle_temp_sizer->Add(m_nozzle_temp, 0, wxEXPAND);
auto bed_temp_sizer = new wxBoxSizer(wxVERTICAL);
auto bed_temp_text = new wxStaticText(m_step_1_panel, wxID_ANY, _L("Bed temperature"));
m_bed_temp = new TextInput(m_step_1_panel, wxEmptyString, "\u2103" /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY);
m_bed_temp = new TextInput(m_step_1_panel, wxEmptyString, wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY);
bed_temp_sizer->Add(bed_temp_text, 0, wxALIGN_LEFT);
bed_temp_sizer->AddSpacer(FromDIP(4));
bed_temp_sizer->Add(m_bed_temp, 0, wxEXPAND);
auto max_flow_sizer = new wxBoxSizer(wxVERTICAL);
auto max_flow_text = new wxStaticText(m_step_1_panel, wxID_ANY, _L("Max volumetric speed"));
m_max_flow_ratio = new TextInput(m_step_1_panel, wxEmptyString, "mm³", "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY);
m_max_flow_ratio = new TextInput(m_step_1_panel, wxEmptyString, wxString::FromUTF8("mm³"), "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY);
max_flow_sizer->Add(max_flow_text, 0, wxALIGN_LEFT);
max_flow_sizer->AddSpacer(FromDIP(4));
max_flow_sizer->Add(m_max_flow_ratio, 0, wxEXPAND);

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

@@ -9555,7 +9555,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
if (accels.empty()) {
accels.assign({accel});
const auto msg{_L("INFO:") + "\n" +
_L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + _L("mm/s²")};
_L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + wxString::FromUTF8("mm/s²")};
get_notification_manager()->push_notification(msg.ToStdString());
} else {
// set max acceleration in case of batch mode to get correct test pattern size

4
src/slic3r/GUI/RammingChart.cpp
View File

@@ -89,10 +89,10 @@ void Chart::draw() {
}
// axis labels:
wxString label = _(L("Time")) + " ("+_("s")+")";
wxString label = _(L("Time")) + " (" + _("s") + ")";
dc.GetTextExtent(label,&text_width,&text_height);
dc.DrawText(label,wxPoint(0.5*(m_rect.GetRight()+m_rect.GetLeft())-text_width/2.f, m_rect.GetBottom()+0.6*legend_side));
label = _(L("Volumetric speed")) + " (" + _("mm³/s") + ")";
label = _(L("Volumetric speed")) + " (" + wxString::FromUTF8("mm³/s") + ")";
dc.GetTextExtent(label,&text_width,&text_height);
dc.DrawRotatedText(label,wxPoint(0,0.5*(m_rect.GetBottom()+m_rect.GetTop())+text_width/2.f),90);

2
src/slic3r/GUI/WipeTowerDialog.cpp
View File

@@ -132,7 +132,7 @@ RammingPanel::RammingPanel(wxWindow* parent, const std::string& parameters)
sizer_chart->Add(label, 0, wxEXPAND | wxALL, 5);
m_widget_time = new SpinInput(this, wxEmptyString, "ms" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 5000 , 3000, 250);
m_widget_volume = new SpinInput(this, wxEmptyString, "mm³", wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 10000, 0 );
m_widget_volume = new SpinInput(this, wxEmptyString, wxString::FromUTF8("mm³"), wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 10000, 0 );
m_widget_ramming_line_width_multiplicator = new SpinInput(this, wxEmptyString, "%" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 10, 300 , 100 );
m_widget_ramming_step_multiplicator = new SpinInput(this, wxEmptyString, "%" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 10, 300 , 100 );

16
src/slic3r/GUI/calib_dlg.cpp
View File

@@ -306,7 +306,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
// start temp
auto start_temp_sizer = new wxBoxSizer(wxHORIZONTAL);
auto start_temp_text = new wxStaticText(this, wxID_ANY, start_temp_str, wxDefaultPosition, st_size, wxALIGN_LEFT);
m_tiStart = new TextInput(this, std::to_string(230), "\u2103" /* °C */, "", wxDefaultPosition, ti_size);
m_tiStart = new TextInput(this, std::to_string(230), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size);
m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
start_temp_sizer->Add(start_temp_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
start_temp_sizer->Add(m_tiStart , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
@@ -315,7 +315,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
// end temp
auto end_temp_sizer = new wxBoxSizer(wxHORIZONTAL);
auto end_temp_text = new wxStaticText(this, wxID_ANY, end_temp_str, wxDefaultPosition, st_size, wxALIGN_LEFT);
m_tiEnd = new TextInput(this, std::to_string(190), "\u2103" /* °C */, "", wxDefaultPosition, ti_size);
m_tiEnd = new TextInput(this, std::to_string(190), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size);
m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
end_temp_sizer->Add(end_temp_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
end_temp_sizer->Add(m_tiEnd , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
@@ -324,7 +324,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
// temp step
auto temp_step_sizer = new wxBoxSizer(wxHORIZONTAL);
auto temp_step_text = new wxStaticText(this, wxID_ANY, temp_step_str, wxDefaultPosition, st_size, wxALIGN_LEFT);
m_tiStep = new TextInput(this, wxString::FromDouble(5),"\u2103" /* °C */, "", wxDefaultPosition, ti_size);
m_tiStep = new TextInput(this, wxString::FromDouble(5), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size);
m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_tiStep->Enable(false);
temp_step_sizer->Add(temp_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
@@ -353,7 +353,9 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
if(!ti->GetTextCtrl()->GetValue().ToULong(&t))
return;
if(t> 350 || t < 170){
MessageDialog msg_dlg(nullptr, wxString::Format(L"Supported range: 170%s - 350%s","\u2103" /* °C */,"\u2103" /* °C */), wxEmptyString, wxICON_WARNING | wxOK);
MessageDialog msg_dlg(nullptr, wxString::Format(L"Supported range: 170%s - 350%s",
wxString::FromUTF8("\u2103") /* °C */, wxString::FromUTF8("\u2103") /* °C */),
wxEmptyString, wxICON_WARNING | wxOK);
msg_dlg.ShowModal();
if(t > 350)
t = 350;
@@ -479,7 +481,7 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin
// start vol
auto start_vol_sizer = new wxBoxSizer(wxHORIZONTAL);
auto start_vol_text = new wxStaticText(this, wxID_ANY, start_vol_str, wxDefaultPosition, st_size, wxALIGN_LEFT);
m_tiStart = new TextInput(this, std::to_string(5), "mm³/s", "", wxDefaultPosition, ti_size);
m_tiStart = new TextInput(this, std::to_string(5), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size);
m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
start_vol_sizer->Add(start_vol_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
@@ -489,7 +491,7 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin
// end vol
auto end_vol_sizer = new wxBoxSizer(wxHORIZONTAL);
auto end_vol_text = new wxStaticText(this, wxID_ANY, end_vol_str, wxDefaultPosition, st_size, wxALIGN_LEFT);
m_tiEnd = new TextInput(this, std::to_string(20), "mm³/s", "", wxDefaultPosition, ti_size);
m_tiEnd = new TextInput(this, std::to_string(20), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size);
m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
end_vol_sizer->Add(end_vol_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
end_vol_sizer->Add(m_tiEnd , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
@@ -498,7 +500,7 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin
// vol step
auto vol_step_sizer = new wxBoxSizer(wxHORIZONTAL);
auto vol_step_text = new wxStaticText(this, wxID_ANY, vol_step_str, wxDefaultPosition, st_size, wxALIGN_LEFT);
m_tiStep = new TextInput(this, wxString::FromDouble(0.5), "mm³/s", "", wxDefaultPosition, ti_size);
m_tiStep = new TextInput(this, wxString::FromDouble(0.5), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size);
m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
vol_step_sizer->Add(vol_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
vol_step_sizer->Add(m_tiStep , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));