diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index c3d9305fd7..c171010dba 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -664,7 +664,7 @@ void PrintConfigDef::init_common_params() def->label = L("Elephant foot compensation"); def->category = L("Quality"); def->tooltip = L("Shrinks the initial layer on build plate to compensate for elephant foot effect."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.)); @@ -684,14 +684,14 @@ void PrintConfigDef::init_common_params() def->label = L("Layer height"); def->category = L("Quality"); def->tooltip = L("Slicing height for each layer. Smaller layer height means more accurate and more printing time."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->set_default_value(new ConfigOptionFloat(0.2)); def = this->add("printable_height", coFloat); def->label = L("Printable height"); def->tooltip = L("Maximum printable height which is limited by mechanism of printer."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 214700; def->mode = comSimple; @@ -700,7 +700,7 @@ void PrintConfigDef::init_common_params() def = this->add("extruder_printable_height", coFloats); def->label = L("Extruder printable height"); def->tooltip = L("Maximum printable height of this extruder which is limited by mechanism of printer."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 1000; def->mode = comAdvanced; @@ -852,7 +852,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 120; @@ -862,7 +862,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -872,7 +872,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -882,7 +882,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -892,7 +892,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -902,7 +902,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -913,7 +913,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = 120; def->set_default_value(new ConfigOptionInts{ 35 }); @@ -923,7 +923,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = 120; def->set_default_value(new ConfigOptionInts{ 35 }); @@ -933,7 +933,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = 120; def->set_default_value(new ConfigOptionInts{ 40 }); @@ -943,7 +943,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = 300; def->set_default_value(new ConfigOptionInts{ 45 }); @@ -953,7 +953,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->max = 300; def->set_default_value(new ConfigOptionInts{ 45 }); @@ -962,7 +962,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = 300; def->set_default_value(new ConfigOptionInts{45}); @@ -1061,7 +1061,7 @@ void PrintConfigDef::init_fff_params() "thinner than this value. This can avoid having too thin shell when layer height is small. 0 means that " "this setting is disabled and thickness of bottom shell is absolutely determined by bottom shell layers."); def->full_label = L("Bottom shell thickness"); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->set_default_value(new ConfigOptionFloat(0.)); @@ -1503,7 +1503,7 @@ void PrintConfigDef::init_fff_params() "In addition, if Slow down for curled perimeters is disabled or Classic overhang mode is enabled, " "it will be the print speed of overhang walls that are supported by less than 13%, " "whether they are part of a bridge or an overhang."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(25)); @@ -1522,7 +1522,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Brim width"); def->category = L("Support"); def->tooltip = L("Distance from model to the outermost brim line."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 100; def->mode = comSimple; @@ -1555,7 +1555,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Brim-object gap"); def->category = L("Support"); def->tooltip = L("A gap between innermost brim line and object can make brim be removed more easily."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 2; def->mode = comAdvanced; @@ -1586,7 +1586,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("The geometry will be decimated before detecting sharp angles. " "This parameter indicates the minimum length of the deviation for the decimation.\n" "0 to deactivate."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(1)); @@ -1678,7 +1678,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(500.0)); @@ -1817,7 +1817,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Max bridge length"); def->category = L("Support"); def->tooltip = L("Max length of bridges that don't need support. Set it to 0 if you want all bridges to be supported, and set it to a very large value if you don't want any bridges to be supported."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10)); @@ -1926,7 +1926,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Speed"); def->tooltip = L("Speed of outer wall which is outermost and visible. " "It's used to be slower than inner wall speed to get better quality."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(60)); @@ -1947,7 +1947,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Small perimeters threshold"); def->category = L("Speed"); def->tooltip = L("This sets the threshold for small perimeter length. Default threshold is 0mm."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -2015,7 +2015,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Height to rod"); def->tooltip = L("Distance of the nozzle tip to the lower rod. " "Used for collision avoidance in by-object printing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(40)); @@ -2025,7 +2025,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Height to lid"); def->tooltip = L("Distance of the nozzle tip to the lid. " "Used for collision avoidance in by-object printing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(120)); @@ -2033,7 +2033,7 @@ void PrintConfigDef::init_fff_params() def = this->add("extruder_clearance_radius", coFloat); def->label = L("Radius"); def->tooltip = L("Clearance radius around extruder. Used for collision avoidance in by-object printing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(40)); @@ -2041,7 +2041,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_height", coFloat); def->label = L("Nozzle height"); def->tooltip = L("The height of nozzle tip."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comDevelop; def->set_default_value(new ConfigOptionFloat(2.5)); @@ -2054,7 +2054,7 @@ void PrintConfigDef::init_fff_params() "set appropriately. OrcaSlicer ensures that adaptive_bed_mesh_min/adaptive_bed_mesh_max values do not exceed these min/max " "points. This information can usually be obtained from your printer manufacturer. The default setting is (-99999, -99999), which " "means there are no limits, thus allowing probing across the entire bed."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionPoint(Vec2d(-99999, -99999))); @@ -2066,7 +2066,7 @@ void PrintConfigDef::init_fff_params() "set appropriately. OrcaSlicer ensures that adaptive_bed_mesh_min/adaptive_bed_mesh_max values do not exceed these min/max " "points. This information can usually be obtained from your printer manufacturer. The default setting is (99999, 99999), which " "means there are no limits, thus allowing probing across the entire bed."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionPoint(Vec2d(99999, 99999))); @@ -2075,20 +2075,20 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("This option sets the preferred distance between probe points (grid size) for the X and Y directions, with the " "default being 50mm for both X and Y."); def->min = 0; - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionPoint(Vec2d(50, 50))); def = this->add("adaptive_bed_mesh_margin", coFloat); def->label = L("Mesh margin"); def->tooltip = L("This option determines the additional distance by which the adaptive bed mesh area should be expanded in the XY directions."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); def = this->add("grab_length",coFloats); def->label = L("Grab length"); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comDevelop; def->set_default_value(new ConfigOptionFloats({0})); @@ -2107,7 +2107,7 @@ void PrintConfigDef::init_fff_params() // "to take it into account. This option lets you specify the displacement of each extruder " // "with respect to the first one. It expects positive coordinates (they will be subtracted " // "from the XY coordinate)."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionPoints { Vec2d(0,0) }); @@ -2235,7 +2235,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Layer time"); def->tooltip = L("Part cooling fan will be enabled for layers of which estimated time is shorter than this value. " "Fan speed is interpolated between the minimum and maximum fan speeds according to layer printing time."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->max = 1000; def->mode = comSimple; @@ -2319,7 +2319,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = max_temp; - def->sidetext = "°C"; + 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); @@ -2329,7 +2329,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = 200; - def->sidetext = u8"mm³/s"; // cubic milimeters per second, don't need translation + def->sidetext = L(u8"mm³/s"); // cubic milimeters per second, CIS languages need translation def->set_default_value(new ConfigOptionFloatsNullable{ 0 }); def = this->add("filament_max_volumetric_speed", coFloats); @@ -2337,7 +2337,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 = u8"mm³/s"; // cubic milimeters per second, don't need translation + def->sidetext = L(u8"mm³/s"); // cubic milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 2. }); @@ -2346,7 +2346,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Filament load time"); def->tooltip = L("Time to load new filament when switch filament. It's usually applicable for single-extruder multi-material machines. " "For tool changers or multi-tool machines, it's typically 0. For statistics only."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.0)); @@ -2355,7 +2355,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Filament unload time"); def->tooltip = L("Time to unload old filament when switch filament. It's usually applicable for single-extruder multi-material machines. " "For tool changers or multi-tool machines, it's typically 0. For statistics only."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.0)); @@ -2364,7 +2364,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Tool change time"); def->tooltip = L("Time taken to switch tools. It's usually applicable for tool changers or multi-tool machines. " "For single-extruder multi-material machines, it's typically 0. For statistics only."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat { 0. }); @@ -2388,7 +2388,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_diameter", coFloats); def->label = L("Diameter"); def->tooltip = L("Filament diameter is used to calculate extrusion in G-code, so it is important and should be accurate."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->set_default_value(new ConfigOptionFloats { 1.75 }); @@ -2472,7 +2472,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_loading_speed", coFloats); def->label = L("Loading speed"); def->tooltip = L("Speed used for loading the filament on the wipe tower."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 28. }); @@ -2480,7 +2480,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_loading_speed_start", coFloats); def->label = L("Loading speed at the start"); def->tooltip = L("Speed used at the very beginning of loading phase."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 3. }); @@ -2489,7 +2489,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Unloading speed"); def->tooltip = L("Speed used for unloading the filament on the wipe tower (does not affect " "initial part of unloading just after ramming)."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 90. }); @@ -2497,7 +2497,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_unloading_speed_start", coFloats); def->label = L("Unloading speed at the start"); def->tooltip = L("Speed used for unloading the tip of the filament immediately after ramming."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 100. }); @@ -2507,7 +2507,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Time to wait after the filament is unloaded. " "May help to get reliable tool changes with flexible materials " "that may need more time to shrink to original dimensions."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -2539,7 +2539,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_cooling_initial_speed", coFloats); def->label = L("Speed of the first cooling move"); def->tooltip = L("Cooling moves are gradually accelerating beginning at this speed."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 2.2 }); @@ -2550,7 +2550,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 = u8"mm³"; // cubic milimeters, don't need translation + def->sidetext = L(u8"mm³"); // cubic milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 15. }); @@ -2558,7 +2558,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_cooling_final_speed", coFloats); def->label = L("Speed of the last cooling move"); def->tooltip = L("Cooling moves are gradually accelerating towards this speed."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 3.4 }); @@ -2581,7 +2581,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 = u8"mm³"; // cubic milimeters, don't need translation + def->sidetext = L(u8"mm³"); // cubic milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 10. }); @@ -2589,7 +2589,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 = u8"mm³/s"; // cubic milimeters per second, don't need translation + def->sidetext = L(u8"mm³/s"); // cubic milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 10. }); @@ -2597,7 +2597,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 = u8"g/cm³"; // grams per cubic milimeter, don't need translation + def->sidetext = L(u8"g/cm³"); // grams per cubic centimeter, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -2625,7 +2625,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_change_length", coFloats); def->label = L("Filament ramming length"); def->tooltip = L("When changing the extruder, it is recommended to extrude a certain length of filament from the original extruder. This helps minimize nozzle oozing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats{10}); @@ -2651,7 +2651,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->mode = comSimple; def->set_default_value(new ConfigOptionInts{ 100 }); @@ -2875,7 +2875,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10000)); @@ -2883,7 +2883,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10000)); @@ -2891,7 +2891,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10000)); @@ -2899,7 +2899,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(500)); @@ -2907,7 +2907,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(500)); @@ -2942,7 +2942,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(300)); @@ -2965,7 +2965,7 @@ void PrintConfigDef::init_fff_params() def = this->add("default_jerk", coFloat); def->label = L("Default"); def->tooltip = L("Default jerk."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -2973,7 +2973,7 @@ void PrintConfigDef::init_fff_params() def = this->add("default_junction_deviation", coFloat); def->label = L("Junction Deviation"); def->tooltip = L("Marlin Firmware Junction Deviation (replaces the traditional XY Jerk setting)."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -2981,7 +2981,7 @@ void PrintConfigDef::init_fff_params() def = this->add("outer_wall_jerk", coFloat); def->label = L("Outer wall"); def->tooltip = L("Jerk of outer walls."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(9)); @@ -2989,7 +2989,7 @@ void PrintConfigDef::init_fff_params() def = this->add("inner_wall_jerk", coFloat); def->label = L("Inner wall"); def->tooltip = L("Jerk of inner walls."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(9)); @@ -2997,7 +2997,7 @@ void PrintConfigDef::init_fff_params() def = this->add("top_surface_jerk", coFloat); def->label = L("Top surface"); def->tooltip = L("Jerk for top surface."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(9)); @@ -3005,7 +3005,7 @@ void PrintConfigDef::init_fff_params() def = this->add("infill_jerk", coFloat); def->label = L("Infill"); def->tooltip = L("Jerk for infill."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(9)); @@ -3013,7 +3013,7 @@ void PrintConfigDef::init_fff_params() def = this->add("initial_layer_jerk", coFloat); def->label = L("Initial layer"); def->tooltip = L("Jerk for initial layer."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(9)); @@ -3021,7 +3021,7 @@ void PrintConfigDef::init_fff_params() def = this->add("travel_jerk", coFloat); def->label = L("Travel"); def->tooltip = L("Jerk for travel."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(12)); @@ -3043,7 +3043,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Initial layer height"); def->category = L("Quality"); def->tooltip = L("Height of initial layer. Making initial layer height to be thick slightly can improve build plate adhesion."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->set_default_value(new ConfigOptionFloat(0.2)); @@ -3058,7 +3058,7 @@ void PrintConfigDef::init_fff_params() def = this->add("initial_layer_speed", coFloat); def->label = L("Initial layer"); def->tooltip = L("Speed of initial layer except the solid infill part."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(30)); @@ -3066,7 +3066,7 @@ void PrintConfigDef::init_fff_params() def = this->add("initial_layer_infill_speed", coFloat); def->label = L("Initial layer infill"); def->tooltip = L("Speed of solid infill part of initial layer."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(60.0)); @@ -3095,7 +3095,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts { 200 }); @@ -3168,7 +3168,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Fuzzy skin thickness"); def->category = L("Others"); def->tooltip = L("The width within which to jitter. It's advised to be below outer wall line width."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 1; def->mode = comSimple; @@ -3178,7 +3178,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Fuzzy skin point distance"); def->category = L("Others"); def->tooltip = L("The average distance between the random points introduced on each line segment."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 5; def->mode = comSimple; @@ -3241,7 +3241,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Fuzzy skin feature size"); def->category = L("Others"); def->tooltip = L("The base size of the coherent noise features, in mm. Higher values will result in larger features."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0.1; def->max = 500; def->mode = comAdvanced; @@ -3270,7 +3270,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Layers and Perimeters"); def->tooltip = L("Don't print gap fill with a length is smaller than the threshold specified (in mm). This setting applies to top, " "bottom and solid infill and, if using the classic perimeter generator, to wall gap fill."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -3278,7 +3278,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Gap infill"); def->category = L("Speed"); def->tooltip = L("Speed of gap infill. Gap usually has irregular line width and should be printed more slowly."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(30)); @@ -3392,7 +3392,7 @@ void PrintConfigDef::init_fff_params() "\nIt won't move fan commands from custom G-code (they act as a sort of 'barrier')." "\nIt won't move fan commands into the start G-code if the 'only custom start G-code' is activated." "\nUse 0 to deactivate."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -3408,7 +3408,7 @@ void PrintConfigDef::init_fff_params() "\nThis is useful for fans where a low PWM/power may be insufficient to get the fan started spinning from a stop, or to " "get the fan up to speed faster." "\nSet to 0 to deactivate."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -3516,7 +3516,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Infill shift step"); def->category = L("Strength"); def->tooltip = L("This parameter adds a slight displacement to each layer of infill to create a cross texture."); - def->sidetext = L("mm"); + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 10; def->mode = comAdvanced; @@ -3578,7 +3578,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Skin infill depth"); def->category = L("Strength"); def->tooltip = L("The parameter sets the depth of skin."); - def->sidetext = L("mm"); + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 100; def->mode = comAdvanced; @@ -3588,7 +3588,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Infill lock depth"); def->category = L("Strength"); def->tooltip = L("The parameter sets the overlapping depth between the interior and skin."); - def->sidetext = L("mm"); + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 100; def->mode = comAdvanced; @@ -3598,7 +3598,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Skin line width"); def->category = L("Strength"); def->tooltip = L("Adjust the line width of the selected skin paths."); - def->sidetext = L("mm"); + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->ratio_over = "nozzle_diameter"; def->min = 0; def->mode = comAdvanced; @@ -3608,7 +3608,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Skeleton line width"); def->category = L("Strength"); def->tooltip = L("Adjust the line width of the selected skeleton paths."); - def->sidetext = L("mm"); + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->ratio_over = "nozzle_diameter"; def->min = 0; def->mode = comAdvanced; @@ -3708,7 +3708,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Sparse infill"); def->category = L("Speed"); def->tooltip = L("Speed of internal sparse infill."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(100)); @@ -3739,7 +3739,7 @@ void PrintConfigDef::init_fff_params() def = this->add("mmu_segmented_region_max_width", coFloat); def->label = L("Maximum width of a segmented region"); def->tooltip = L("Maximum width of a segmented region. Zero disables this feature."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->category = L("Advanced"); def->mode = comAdvanced; @@ -3750,7 +3750,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Interlocking depth of a segmented region. It will be ignored if " "\"mmu_segmented_region_max_width\" is zero or if \"mmu_segmented_region_interlocking_depth\" " "is bigger than \"mmu_segmented_region_max_width\". Zero disables this feature."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->category = L("Advanced"); def->mode = comAdvanced; @@ -3766,7 +3766,7 @@ void PrintConfigDef::init_fff_params() def = this->add("interlocking_beam_width", coFloat); def->label = L("Interlocking beam width"); def->tooltip = L("The width of the interlocking structure beams."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0.01; def->category = L("Advanced"); def->mode = comAdvanced; @@ -3856,7 +3856,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Ironing line spacing"); def->category = L("Quality"); def->tooltip = L("The distance between the lines of ironing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 1; def->mode = comAdvanced; @@ -3866,7 +3866,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Ironing inset"); def->category = L("Quality"); def->tooltip = L("The distance to keep from the edges. A value of 0 sets this to half of the nozzle diameter."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 100; def->mode = comAdvanced; @@ -3876,7 +3876,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Ironing speed"); def->category = L("Quality"); def->tooltip = L("Print speed of ironing lines."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(20)); @@ -4009,7 +4009,7 @@ void PrintConfigDef::init_fff_params() (void)L("Maximum Y speed"); (void)L("Maximum Z speed"); (void)L("Maximum E speed"); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloats(axis.max_feedrate)); @@ -4027,7 +4027,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloats(axis.max_acceleration)); @@ -4045,7 +4045,7 @@ void PrintConfigDef::init_fff_params() (void)L("Maximum jerk of the Y axis"); (void)L("Maximum jerk of the Z axis"); (void)L("Maximum jerk of the E axis"); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloats(axis.max_jerk)); @@ -4056,7 +4056,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Maximum Junction Deviation"); def->category = L("Machine limits"); def->tooltip = L("Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin Firmware\nIf your Marlin 2 printer uses Classic Jerk set this value to 0.)"); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 1; def->mode = comAdvanced; @@ -4067,7 +4067,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Minimum speed for extruding"); def->category = L("Machine limits"); def->tooltip = L("Minimum speed for extruding (M205 S)"); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comDevelop; def->set_default_value(new ConfigOptionFloats{ 0., 0. }); @@ -4077,7 +4077,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Minimum travel speed"); def->category = L("Machine limits"); def->tooltip = L("Minimum travel speed (M205 T)"); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comDevelop; def->set_default_value(new ConfigOptionFloats{ 0., 0. }); @@ -4089,7 +4089,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->readonly = false; def->mode = comSimple; @@ -4101,7 +4101,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->readonly = false; def->mode = comSimple; @@ -4112,7 +4112,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 = u8"mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = L(u8"mm/s²"); // milimeters per second per second, CIS languages need translation def->min = 0; def->readonly = false; def->mode = comAdvanced; @@ -4130,7 +4130,7 @@ void PrintConfigDef::init_fff_params() def = this->add("min_resonance_avoidance_speed", coFloat); def->label = L("Min"); def->tooltip = L("Minimum speed of resonance avoidance."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(70)); @@ -4138,7 +4138,7 @@ void PrintConfigDef::init_fff_params() def = this->add("max_resonance_avoidance_speed", coFloat); def->label = L("Max"); def->tooltip = L("Maximum speed of resonance avoidance."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(120)); @@ -4157,7 +4157,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Max"); def->tooltip = L("The highest printable layer height for the extruder. " "Used to limit the maximum layer height when enable adaptive layer height."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -4178,7 +4178,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 = u8"mm³/s²"; // cubic milimeters per second per second, don't need translation + def->sidetext = L(u8"mm³/s²"); // cubic milimeters per second per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -4191,7 +4191,7 @@ void PrintConfigDef::init_fff_params() "Allowed values: 0.5-5"); def->min = 0.5; def->max = 5; - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(3.0)); @@ -4226,7 +4226,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Min"); def->tooltip = L("The lowest printable layer height for the extruder. " "Used to limit the minimum layer height when enable adaptive layer height."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0.07 }); @@ -4235,7 +4235,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Min print speed"); def->tooltip = L("The minimum print speed to which the printer slows down to maintain the minimum layer time defined above " "when the slowdown for better layer cooling is enabled."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 10. }); @@ -4243,7 +4243,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_diameter", coFloats); def->label = L("Nozzle diameter"); def->tooltip = L("The diameter of nozzle."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->max = 100; def->set_default_value(new ConfigOptionFloats { 0.4 }); @@ -4298,7 +4298,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_volume", coFloats); def->label = L("Nozzle volume"); def->tooltip = L("Volume of nozzle between the cutter and the end of nozzle."); - def->sidetext = u8"mm³"; // cubic milimeters, don't need translation + def->sidetext = L(u8"mm³"); // cubic milimeters, CIS languages need translation def->mode = comAdvanced; def->readonly = false; def->nullable = true; @@ -4307,7 +4307,7 @@ void PrintConfigDef::init_fff_params() def = this->add("cooling_tube_retraction", coFloat); def->label = L("Cooling tube position"); def->tooltip = L("Distance of the center-point of the cooling tube from the extruder tip."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(91.5)); @@ -4315,7 +4315,7 @@ void PrintConfigDef::init_fff_params() def = this->add("cooling_tube_length", coFloat); def->label = L("Cooling tube length"); def->tooltip = L("Length of the cooling tube to limit space for cooling moves inside it."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(5.)); @@ -4332,7 +4332,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Filament parking position"); def->tooltip = L("Distance of the extruder tip from the position where the filament is parked " "when unloaded. This should match the value in printer firmware."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(92.)); @@ -4342,7 +4342,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("When set to zero, the distance the filament is moved from parking position during load " "is exactly the same as it was moved back during unload. When positive, it is loaded further, " "if negative, the loading move is shorter than unloading."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(-2.)); @@ -4399,7 +4399,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Quality"); def->tooltip = L("Maximum area of a hole in the base of the model before it's filled by conical material. " "A value of 0 will fill all the holes in the model base."); - def->sidetext = u8"mm²"; // square millimeters, don't need translation + def->sidetext = L(u8"mm²"); // square milimeters, CIS languages need translation def->mode = comAdvanced; def->min = 0.; def->set_default_value(new ConfigOptionFloat(0.)); @@ -4437,7 +4437,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Inner wall"); def->category = L("Speed"); def->tooltip = L("Speed of inner wall."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->aliases = { "perimeter_feed_rate" }; def->min = 1; def->mode = comAdvanced; @@ -4508,7 +4508,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Raft contact Z distance"); def->category = L("Support"); def->tooltip = L("Z gap between object and raft. Ignored for soluble interface."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.1)); @@ -4517,7 +4517,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Raft expansion"); def->category = L("Support"); def->tooltip = L("Expand all raft layers in XY plane."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(1.5)); @@ -4536,7 +4536,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Initial layer expansion"); def->category = L("Support"); def->tooltip = L("Expand the first raft or support layer to improve bed plate adhesion."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; //BBS: change from 3.0 to 2.0 @@ -4557,7 +4557,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Resolution"); def->tooltip = L("The G-code path is generated after simplifying the contour of models to avoid too many points and G-code lines. " "Smaller value means higher resolution and more time to slice."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.01)); @@ -4565,7 +4565,7 @@ void PrintConfigDef::init_fff_params() def = this->add("retraction_minimum_travel", coFloats); def->label = L("Travel distance threshold"); def->tooltip = L("Only trigger retraction when the travel distance is longer than this threshold."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 2. }); @@ -4587,7 +4587,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Retraction Length"); def->tooltip = L("Some amount of material in extruder is pulled back to avoid ooze during long travel. " "Set zero to disable retraction."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comSimple; def->set_default_value(new ConfigOptionFloats { 0.8 }); @@ -4622,7 +4622,7 @@ void PrintConfigDef::init_fff_params() def->nullable = true; def->min = 0; def->max = 10; - def->sidetext = L("mm"); + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->set_default_value(new ConfigOptionFloatsNullable{10}); def = this->add("retract_length_toolchange", coFloats); @@ -4632,7 +4632,7 @@ void PrintConfigDef::init_fff_params() //def->tooltip = L("When retraction is triggered before changing tool, filament is pulled back " // "by the specified amount (the length is measured on raw filament, before it enters " // "the extruder)."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 10. }); @@ -4641,7 +4641,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Whenever the retraction is done, the nozzle is lifted a little to create clearance between nozzle and the print. " "It prevents nozzle from hitting the print when travel move. " "Using spiral lines to lift Z can prevent stringing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comSimple; def->min = 0; def->max = 5; @@ -4650,7 +4650,7 @@ void PrintConfigDef::init_fff_params() def = this->add("retract_lift_above", coFloats); def->label = L("Z-hop lower boundary"); def->tooltip = L("Z-hop will only come into effect when Z is above this value and is below the parameter: \"Z-hop upper boundary\"."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->min = 0; def->set_default_value(new ConfigOptionFloats{0.}); @@ -4658,7 +4658,7 @@ void PrintConfigDef::init_fff_params() def = this->add("retract_lift_below", coFloats); def->label = L("Z-hop upper boundary"); def->tooltip = L("If this value is positive, Z-hop will only come into effect when Z is above the parameter: \"Z-hop lower boundary\" and is below this value."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->min = 0; def->set_default_value(new ConfigOptionFloats{0.}); @@ -4690,14 +4690,14 @@ void PrintConfigDef::init_fff_params() def = this->add("retract_lift_above", coFloats); def->label = L("Only lift Z above"); def->tooltip = L("If you set this to a positive value, Z lift will only take place above the specified absolute Z."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats{0.}); def = this->add("retract_lift_below", coFloats); def->label = L("Only lift Z below"); def->tooltip = L("If you set this to a positive value, Z lift will only take place below the specified absolute Z."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats{0.}); @@ -4824,7 +4824,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Extra length on restart"); def->tooltip = L("When the retraction is compensated after the travel move, the extruder will push " "this additional amount of filament. This setting is rarely needed."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -4832,7 +4832,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Extra length on restart"); def->tooltip = L("When the retraction is compensated after changing tool, the extruder will push " "this additional amount of filament."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -4840,7 +4840,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Retraction Speed"); def->full_label = L("Retraction Speed"); def->tooltip = L("Speed for retracting filament from the nozzle."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 30. }); @@ -4848,7 +4848,7 @@ void PrintConfigDef::init_fff_params() def->label = L("De-retraction Speed"); def->full_label = L("De-retraction Speed"); def->tooltip = L("Speed for reloading filament into the nozzle. Zero means same speed of retraction."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -4986,7 +4986,7 @@ void PrintConfigDef::init_fff_params() def = this->add("seam_slope_min_length", coFloat); def->label = L("Scarf length"); def->tooltip = L("Length of the scarf. Setting this parameter to zero effectively disables the scarf."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(20)); @@ -5041,7 +5041,7 @@ void PrintConfigDef::init_fff_params() def = this->add("skirt_distance", coFloat); def->label = L("Skirt distance"); def->tooltip = L("The distance from the skirt to the brim or the object."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 60; def->mode = comAdvanced; @@ -5111,7 +5111,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Skirt speed"); def->tooltip = L("Speed of skirt, in mm/s. Zero means use default layer extrusion speed."); def->min = 0; - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(50.0)); @@ -5122,7 +5122,7 @@ void PrintConfigDef::init_fff_params() "Using a non-zero value is useful if the printer is set up to print without a prime line.\n" "Final number of loops is not taking into account while arranging or validating objects distance. Increase loop number in such case."); def->min = 0; - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.0)); @@ -5130,7 +5130,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Layer time"); def->tooltip = L("The printing speed in exported G-code will be slowed down when the estimated layer time is " "shorter than this value in order to get better cooling for these layers."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->max = 1000; def->mode = comSimple; @@ -5140,7 +5140,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Minimum sparse infill threshold"); def->category = L("Strength"); def->tooltip = L("Sparse infill area which is smaller than threshold value is replaced by internal solid infill."); - def->sidetext = u8"mm²"; // square millimeters, don't need translation + def->sidetext = L(u8"mm²"); // square milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(15)); @@ -5170,7 +5170,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Internal solid infill"); def->category = L("Speed"); def->tooltip = L("Speed of internal solid infill, not the top and bottom surface."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(100)); @@ -5248,7 +5248,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Temperature difference to be applied when an extruder is not active. " "The value is not used when 'idle_temperature' in filament settings " "is set to non-zero value."); - def->sidetext = u8"∆\u2103"; // delta degrees Celsius, don't need translation + def->sidetext = L(u8"∆\u2103"); // delta degrees Celsius, CIS languages need translation def->min = -max_temp; def->max = max_temp; def->mode = comAdvanced; @@ -5258,7 +5258,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Preheat time"); def->tooltip = L("To reduce the waiting time after tool change, Orca can preheat the next tool while the current tool is still in use. " "This setting specifies the time in seconds to preheat the next tool. Orca will insert a M104 command to preheat the tool in advance."); - def->sidetext = "s"; // seconds, don't need translation + def->sidetext = L("s"); // seconds, CIS languages need translation def->min = 0; def->max = 120; def->mode = comAdvanced; @@ -5338,7 +5338,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Quality"); def->tooltip = L("Cracks smaller than 2x gap closing radius are being filled during the triangle mesh slicing. " "The gap closing operation may reduce the final print resolution, therefore it is advisable to keep the value reasonably low."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.049)); @@ -5363,7 +5363,7 @@ void PrintConfigDef::init_fff_params() "in the output G-code. It is used to compensate for bad Z endstop position: " "for example, if your endstop zero actually leaves the nozzle 0.3mm far " "from the print bed, set this to -0.3 (or fix your endstop)."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -5395,7 +5395,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Support/object XY distance"); def->category = L("Support"); def->tooltip = L("XY separation between an object and its support."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 10; def->mode = comAdvanced; @@ -5406,7 +5406,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Support/object first layer gap"); def->category = L("Support"); def->tooltip = L("XY separation between an object and its support at the first layer."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 10; def->mode = comAdvanced; @@ -5453,7 +5453,7 @@ void PrintConfigDef::init_fff_params() def->min = 0; def->category = L("Support"); def->tooltip = L("The Z gap between the top support interface and object."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation // def->min = 0; #if 0 //def->enum_values.push_back("0"); @@ -5470,7 +5470,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Bottom Z distance"); def->category = L("Support"); def->tooltip = L("The Z gap between the bottom support interface and object."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.2)); @@ -5571,7 +5571,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Support"); def->tooltip = L("Spacing of interface lines. Zero means solid interface.\n" "Force using solid interface when support ironing is enabled."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.5)); @@ -5581,7 +5581,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Bottom interface spacing"); def->category = L("Support"); def->tooltip = L("Spacing of bottom interface lines. Zero means solid interface."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0.5)); @@ -5590,7 +5590,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Support interface"); def->category = L("Speed"); def->tooltip = L("Speed of support interface."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(80)); @@ -5639,7 +5639,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Base pattern spacing"); def->category = L("Support"); def->tooltip = L("Spacing between support lines."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(2.5)); @@ -5648,7 +5648,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Normal Support expansion"); def->category = L("Support"); def->tooltip = L("Expand (+) or shrink (-) the horizontal span of normal support."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -5656,7 +5656,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Support"); def->category = L("Speed"); def->tooltip = L("Speed of support."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(80)); @@ -5756,7 +5756,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Tree support branch distance"); def->category = L("Support"); def->tooltip = L("This setting determines the distance between neighboring tree support nodes."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 1.0; def->max = 10; def->mode = comAdvanced; @@ -5766,7 +5766,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Tree support branch distance"); def->category = L("Support"); def->tooltip = L("This setting determines the distance between neighboring tree support nodes."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 1.0; def->max = 10; def->mode = comAdvanced; @@ -5804,7 +5804,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Support"); // TRN PrintSettings: "Organic supports" > "Tip Diameter" def->tooltip = L("Branch tip diameter for organic supports."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0.1f; def->max = 100.f; def->mode = comAdvanced; @@ -5814,7 +5814,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Tree support branch diameter"); def->category = L("Support"); def->tooltip = L("This setting determines the initial diameter of support nodes."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 1.0; def->max = 10; def->mode = comAdvanced; @@ -5838,7 +5838,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Tree support branch diameter"); def->category = L("Support"); def->tooltip = L("This setting determines the initial diameter of support nodes."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 1.0; def->max = 10; def->mode = comAdvanced; @@ -5896,7 +5896,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Support Ironing line spacing"); def->category = L("Support"); def->tooltip = L("The distance between the lines of ironing."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 1; def->mode = comAdvanced; @@ -5926,7 +5926,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Chamber temperature"); def->min = 0; def->max = max_temp; @@ -5935,7 +5935,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->full_label = L("Nozzle temperature"); def->min = 0; def->max = max_temp; @@ -5944,7 +5944,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_temperature_range_low", coInts); def->label = L("Min"); //def->tooltip = L(""); - def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts { 190 }); @@ -5952,7 +5952,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_temperature_range_high", coInts); def->label = L("Max"); //def->tooltip = L(""); - def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts { 240 }); @@ -6004,7 +6004,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Top surface"); def->category = L("Speed"); def->tooltip = L("Speed of top surface infill which is solid."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(100)); @@ -6027,7 +6027,7 @@ void PrintConfigDef::init_fff_params() "thinner than this value. This can avoid having too thin shell when layer height is small. 0 means that " "this setting is disabled and thickness of top shell is absolutely determined by top shell layers."); def->full_label = L("Top shell thickness"); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->set_default_value(new ConfigOptionFloat(0.6)); @@ -6058,7 +6058,7 @@ void PrintConfigDef::init_fff_params() def = this->add("travel_speed", coFloat); def->label = L("Travel"); def->tooltip = L("Speed of travel which is faster and without extrusion."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 1; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(120)); @@ -6068,7 +6068,7 @@ void PrintConfigDef::init_fff_params() //def->tooltip = L("Speed of vertical travel along z axis. " // "This is typically lower because build plate or gantry is hard to be moved. " // "Zero means using travel speed directly in G-code, but will be limited by printer's ability when run G-code."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->min = 0; def->mode = comDevelop; def->set_default_value(new ConfigOptionFloat(0.)); @@ -6086,7 +6086,7 @@ void PrintConfigDef::init_fff_params() "Depending on how long the wipe operation lasts, how fast and long the extruder/filament retraction settings are, " "a retraction move may be needed to retract the remaining filament.\n\n" "Setting a value in the retract amount before wipe setting below will perform any excess retraction before the wipe, else it will be performed after."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 1. }); @@ -6127,14 +6127,14 @@ void PrintConfigDef::init_fff_params() def = this->add("flush_multiplier", coFloats); def->label = L("Flush multiplier"); def->tooltip = L("The actual flushing volumes is equal to the flush multiplier multiplied by the flushing volumes in the table."); - def->sidetext = ""; + //def->sidetext = ""; def->set_default_value(new ConfigOptionFloats{0.3}); // BBS 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 = u8"mm³"; // cubic milimeters, don't need translation + def->sidetext = L(u8"mm³"); // cubic milimeters, CIS languages need translation def->min = 1.0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloat(45.)); @@ -6142,7 +6142,7 @@ void PrintConfigDef::init_fff_params() def = this->add("wipe_tower_x", coFloats); //def->label = L("Position X"); //def->tooltip = L("X coordinate of the left front corner of a wipe tower."); - //def->sidetext = "mm"; // milimeters, don't need translation + //def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comDevelop; // BBS: change data type to floats to add partplate logic def->set_default_value(new ConfigOptionFloats{ 15. }); @@ -6150,7 +6150,7 @@ void PrintConfigDef::init_fff_params() def = this->add("wipe_tower_y", coFloats); //def->label = L("Position Y"); //def->tooltip = L("Y coordinate of the left front corner of a wipe tower."); - //def->sidetext = "mm"; // milimeters, don't need translation + //def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comDevelop; // BBS: change data type to floats to add partplate logic def->set_default_value(new ConfigOptionFloats{ 220. }); @@ -6158,7 +6158,7 @@ void PrintConfigDef::init_fff_params() def = this->add("prime_tower_width", coFloat); def->label = L("Width"); def->tooltip = L("Width of the prime tower."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 2.0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloat(60.)); @@ -6174,7 +6174,7 @@ void PrintConfigDef::init_fff_params() def->gui_type = ConfigOptionDef::GUIType::f_enum_open; def->label = L("Brim width"); def->tooltip = L("Brim width of prime tower, negative number means auto calculated width based on the height of prime tower."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->min = -1; def->enum_values.push_back("-1"); @@ -6199,7 +6199,7 @@ void PrintConfigDef::init_fff_params() "Increasing this speed may affect the tower's stability as well as increase the force with which the nozzle collides with any blobs that may have formed on the wipe tower.\n\n" "Before increasing this parameter beyond the default of 90 mm/s, make sure your printer can reliably bridge at the increased speeds and that ooze when tool changing is well controlled.\n\n" "For the wipe tower external perimeters the internal perimeter speed is used regardless of this setting."); - def->sidetext = "mm/s"; // milimeters per second, don't need translation + def->sidetext = L("mm/s"); // milimeters per second, CIS languages need translation def->mode = comAdvanced; def->min = 10; def->set_default_value(new ConfigOptionFloat(90.)); @@ -6224,7 +6224,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Extra rib length"); def->tooltip = L("Positive values can increase the size of the rib wall, while negative values can reduce the size. " "However, the size of the rib wall can not be smaller than that determined by the cleaning volume."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->max = 300; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -6232,7 +6232,7 @@ void PrintConfigDef::init_fff_params() def = this->add("wipe_tower_rib_width", coFloat); def->label = L("Rib width"); def->tooltip = L("Rib width."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->min = 0; def->set_default_value(new ConfigOptionFloat(8)); @@ -6307,7 +6307,7 @@ void PrintConfigDef::init_fff_params() def = this->add("wipe_tower_bridging", coFloat); def->label = L("Maximal bridging distance"); def->tooltip = L("Maximal distance between supports on sparse infill sections."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10.)); @@ -6334,7 +6334,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 = u8"\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts{0}); @@ -6345,7 +6345,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Holes in objects will expand or contract in the XY plane by the configured value. " "Positive values make holes bigger, negative values make holes smaller. " "This function is used to adjust sizes slightly when the objects have assembling issues."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -6355,7 +6355,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Contours of objects will expand or contract in the XY plane by the configured value. " "Positive values make contours bigger, negative values make contours smaller. " "This function is used to adjust sizes slightly when the objects have assembling issues."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -6502,7 +6502,7 @@ void PrintConfigDef::init_fff_params() "NOTE: Bottom and top surfaces will not be affected by this value to prevent visual gaps on the outside of the model. " "Adjust 'One wall threshold' in the Advanced settings below to adjust the sensitivity of what is considered a top-surface. " "'One wall threshold' is only visible if this setting is set above the default value of 0.5, or if single-wall top surfaces is enabled."); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->mode = comAdvanced; def->min = 0.0; def->max = 25.0; @@ -7116,7 +7116,7 @@ void PrintConfigDef::init_sla_params() //def->label = L(""); //def->category = L(""); //def->tooltip = L(""); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->set_default_value(new ConfigOptionFloat(1.)); @@ -7257,7 +7257,7 @@ void PrintConfigDef::init_sla_params() //def->label = L(""); //def->category = L(""); //def->tooltip = L(""); - def->sidetext = "mm"; // milimeters, don't need translation + def->sidetext = L("mm"); // milimeters, CIS languages need translation def->min = 0; def->max = 10; def->mode = comAdvanced; diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp index ff2697558b..fea07e7540 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -50,7 +50,7 @@ void BedShape::append_option_line(ConfigOptionsGroupShp optgroup, Parameter para def.min = 0; def.max = 214700; def.width = 10; // increase width for large scale printers with 4 digit values - def.sidetext = "mm"; // milimeters, don't need translation + def.sidetext = L("mm"); // milimeters, CIS languages need translation def.label = get_option_label(param); def.tooltip = L("Size in X and Y of the rectangular plate."); key = "rect_size"; @@ -61,7 +61,7 @@ void BedShape::append_option_line(ConfigOptionsGroupShp optgroup, Parameter para def.min = -107350; def.max = 107350; def.width = 10; // increase width for large scale printers with 4 digit values - def.sidetext = "mm"; // milimeters, don't need translation + def.sidetext = L("mm"); // milimeters, CIS languages need translation def.label = get_option_label(param); def.tooltip = L("Distance of the 0,0 G-code coordinate from the front left corner of the rectangle."); key = "rect_origin"; @@ -70,7 +70,7 @@ void BedShape::append_option_line(ConfigOptionsGroupShp optgroup, Parameter para def.type = coFloat; def.set_default_value(new ConfigOptionFloat(200)); def.width = 10; // match size - def.sidetext = "mm"; // milimeters, don't need translation + def.sidetext = L("mm"); // milimeters, CIS languages need translation def.label = get_option_label(param); def.tooltip = L("Diameter of the print bed. It is assumed that origin (0,0) is located in the center."); key = "diameter"; diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 981f7f5392..4532a5e5c9 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -338,7 +338,7 @@ void CaliPresetCustomRangePanel::create_panel(wxWindow* parent) m_title_texts[i]->Wrap(-1); m_title_texts[i]->SetFont(::Label::Body_14); item_sizer->Add(m_title_texts[i], 0, wxALL, 0); - m_value_inputs[i] = new TextInput(parent, wxEmptyString, wxString::FromUTF8("\u2103" /* °C */), "", wxDefaultPosition, CALIBRATION_FROM_TO_INPUT_SIZE, 0); + m_value_inputs[i] = new TextInput(parent, wxEmptyString, _L("\u2103" /* °C */), "", wxDefaultPosition, CALIBRATION_FROM_TO_INPUT_SIZE, 0); m_value_inputs[i]->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); m_value_inputs[i]->GetTextCtrl()->Bind(wxEVT_TEXT, [this, i](wxCommandEvent& event) { std::string number = m_value_inputs[i]->GetTextCtrl()->GetValue().ToStdString(); @@ -417,7 +417,7 @@ void CaliPresetTipsPanel::create_panel(wxWindow* parent) auto nozzle_temp_sizer = new wxBoxSizer(wxVERTICAL); auto nozzle_temp_text = new Label(parent, _L("Nozzle temperature")); nozzle_temp_text->SetFont(Label::Body_12); - m_nozzle_temp = new TextInput(parent, wxEmptyString, wxString::FromUTF8("\u2103" /* °C */), "", wxDefaultPosition, CALIBRATION_FROM_TO_INPUT_SIZE, wxTE_READONLY); + m_nozzle_temp = new TextInput(parent, wxEmptyString, _L("\u2103" /* °C */), "", wxDefaultPosition, CALIBRATION_FROM_TO_INPUT_SIZE, wxTE_READONLY); m_nozzle_temp->SetBorderWidth(0); nozzle_temp_sizer->Add(nozzle_temp_text, 0, wxALIGN_LEFT); nozzle_temp_sizer->Add(m_nozzle_temp, 0, wxEXPAND); @@ -432,7 +432,7 @@ void CaliPresetTipsPanel::create_panel(wxWindow* parent) auto bed_temp_text = new Label(parent, _L("Bed temperature")); bed_temp_text->SetFont(Label::Body_12); - m_bed_temp = new Label(parent, wxString::FromUTF8("- °C")); + m_bed_temp = new Label(parent, _L("- \u2103" /* °C */)); m_bed_temp->SetFont(Label::Body_12); bed_temp_sizer->Add(bed_temp_text, 0, wxALIGN_CENTER | wxRIGHT, FromDIP(10)); bed_temp_sizer->Add(m_bed_temp, 0, wxALIGN_CENTER); @@ -440,7 +440,7 @@ void CaliPresetTipsPanel::create_panel(wxWindow* parent) auto max_flow_sizer = new wxBoxSizer(wxVERTICAL); auto max_flow_text = new Label(parent, _L("Max volumetric speed")); max_flow_text->SetFont(Label::Body_12); - m_max_volumetric_speed = new TextInput(parent, wxEmptyString, wxString::FromUTF8("mm³"), "", wxDefaultPosition, CALIBRATION_FROM_TO_INPUT_SIZE, wxTE_READONLY); + m_max_volumetric_speed = new TextInput(parent, wxEmptyString, _L("mm³"), "", wxDefaultPosition, CALIBRATION_FROM_TO_INPUT_SIZE, wxTE_READONLY); m_max_volumetric_speed->SetBorderWidth(0); max_flow_sizer->Add(max_flow_text, 0, wxALIGN_LEFT); max_flow_sizer->Add(m_max_volumetric_speed, 0, wxEXPAND); @@ -2773,7 +2773,7 @@ MaxVolumetricSpeedPresetPage::MaxVolumetricSpeedPresetPage( titles.push_back(_L("Step")); m_custom_range_panel->set_titles(titles); - m_custom_range_panel->set_unit(wxString::FromUTF8("mm³/s")); + m_custom_range_panel->set_unit(_L("mm³/s")); } } }} diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 063f7c088a..58df5b1c09 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -278,7 +278,7 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt const auto &variant = model.variants[i]; const auto label = model.technology == ptFFF - ? from_u8((boost::format("%1% %2% %3%") % variant.name % _utf8("mm") % _utf8(L("nozzle"))).str()) + ? from_u8((boost::format("%1% %2% %3%") % variant.name % _utf8(L("mm")) % _utf8(L("nozzle"))).str()) : from_u8(model.name); if (i == 1) { @@ -1353,7 +1353,7 @@ PageDiameters::PageDiameters(ConfigWizard *parent) auto *sizer_nozzle = new wxFlexGridSizer(3, 5, 5); auto *text_nozzle = new wxStaticText(this, wxID_ANY, _L("Nozzle Diameter:")); - auto *unit_nozzle = new wxStaticText(this, wxID_ANY, "mm"); + auto *unit_nozzle = new wxStaticText(this, wxID_ANY, _L("mm")); sizer_nozzle->AddGrowableCol(0, 1); sizer_nozzle->Add(text_nozzle, 0, wxALIGN_CENTRE_VERTICAL); sizer_nozzle->Add(diam_nozzle); @@ -1367,7 +1367,7 @@ PageDiameters::PageDiameters(ConfigWizard *parent) auto *sizer_filam = new wxFlexGridSizer(3, 5, 5); auto *text_filam = new wxStaticText(this, wxID_ANY, _L("Filament Diameter:")); - auto *unit_filam = new wxStaticText(this, wxID_ANY, "mm"); + auto *unit_filam = new wxStaticText(this, wxID_ANY, _L("mm")); sizer_filam->AddGrowableCol(0, 1); sizer_filam->Add(text_filam, 0, wxALIGN_CENTRE_VERTICAL); sizer_filam->Add(diam_filam); @@ -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, wxString::FromUTF8("\u2103") /* °C */); + auto *unit_extr = new wxStaticText(this, wxID_ANY, _L("\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, wxString::FromUTF8("\u2103") /* °C */); + auto *unit_bed = new wxStaticText(this, wxID_ANY, _L("\u2103" /* °C */)); sizer_bed->AddGrowableCol(0, 1); sizer_bed->Add(text_bed, 0, wxALIGN_CENTRE_VERTICAL); sizer_bed->Add(spin_bed); diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 65d3fe0bf3..089ab42953 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -1922,7 +1922,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_bed_size_item(wxWindow *parent) // ORCA use icon on input box to match style with other Point fields horizontal_sizer->Add(length_sizer, 0, wxEXPAND | wxLEFT | wxTOP | wxALIGN_CENTER_VERTICAL, FromDIP(10)); wxBoxSizer *length_input_sizer = new wxBoxSizer(wxVERTICAL); - m_bed_size_x_input = new TextInput(parent, "200", "mm", "inputbox_x", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); + m_bed_size_x_input = new TextInput(parent, "200", _L("mm"), "inputbox_x", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); wxTextValidator validator(wxFILTER_DIGITS); m_bed_size_x_input->GetTextCtrl()->SetValidator(validator); length_input_sizer->Add(m_bed_size_x_input, 0, wxEXPAND | wxLEFT, FromDIP(5)); @@ -1932,7 +1932,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_bed_size_item(wxWindow *parent) // ORCA use icon on input box to match style with other Point fields horizontal_sizer->Add(width_sizer, 0, wxEXPAND | wxLEFT | wxTOP | wxALIGN_CENTER_VERTICAL, FromDIP(10)); wxBoxSizer *width_input_sizer = new wxBoxSizer(wxVERTICAL); - m_bed_size_y_input = new TextInput(parent, "200", "mm", "inputbox_y", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); + m_bed_size_y_input = new TextInput(parent, "200", _L("mm"), "inputbox_y", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); m_bed_size_y_input->GetTextCtrl()->SetValidator(validator); width_input_sizer->Add(m_bed_size_y_input, 0, wxEXPAND | wxALL, 0); horizontal_sizer->Add(width_input_sizer, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -1955,7 +1955,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_origin_item(wxWindow *parent) // ORCA use icon on input box to match style with other Point fields horizontal_sizer->Add(length_sizer, 0, wxEXPAND | wxLEFT | wxTOP | wxALIGN_CENTER_VERTICAL, FromDIP(10)); wxBoxSizer *length_input_sizer = new wxBoxSizer(wxVERTICAL); - m_bed_origin_x_input = new TextInput(parent, "0", "mm", "inputbox_x", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); + m_bed_origin_x_input = new TextInput(parent, "0", _L("mm"), "inputbox_x", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); wxTextValidator validator(wxFILTER_DIGITS); m_bed_origin_x_input->GetTextCtrl()->SetValidator(validator); length_input_sizer->Add(m_bed_origin_x_input, 0, wxEXPAND | wxLEFT, FromDIP(5)); // Align with other @@ -1965,7 +1965,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_origin_item(wxWindow *parent) // ORCA use icon on input box to match style with other Point fields horizontal_sizer->Add(width_sizer, 0, wxEXPAND | wxLEFT | wxTOP | wxALIGN_CENTER_VERTICAL, FromDIP(10)); wxBoxSizer *width_input_sizer = new wxBoxSizer(wxVERTICAL); - m_bed_origin_y_input = new TextInput(parent, "0", "mm", "inputbox_y", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); + m_bed_origin_y_input = new TextInput(parent, "0", _L("mm"), "inputbox_y", wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); m_bed_origin_y_input->GetTextCtrl()->SetValidator(validator); width_input_sizer->Add(m_bed_origin_y_input, 0, wxEXPAND | wxALL, 0); horizontal_sizer->Add(width_input_sizer, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -2036,7 +2036,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_max_print_height_item(wxWindow *pa horizontal_sizer->Add(optionSizer, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(10)); wxBoxSizer *hight_input_sizer = new wxBoxSizer(wxVERTICAL); - m_print_height_input = new TextInput(parent, "200", "mm", wxEmptyString, wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); // Use same alignment with all other input boxes + m_print_height_input = new TextInput(parent, "200", _L("mm"), wxEmptyString, wxDefaultPosition, PRINTER_SPACE_SIZE, wxTE_PROCESS_ENTER); // Use same alignment with all other input boxes wxTextValidator validator(wxFILTER_DIGITS); m_print_height_input->GetTextCtrl()->SetValidator(validator); hight_input_sizer->Add(m_print_height_input, 0, wxEXPAND | wxLEFT, FromDIP(5)); diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index 78d839f747..fc8e294283 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -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, wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); + m_nozzle_temp = new TextInput(m_step_1_panel, wxEmptyString, _L("\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, wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); + m_bed_temp = new TextInput(m_step_1_panel, wxEmptyString, _L("\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, wxString::FromUTF8("mm³"), "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); + m_max_flow_ratio = new TextInput(m_step_1_panel, wxEmptyString, _L("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); diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 2cfb45340b..98cbcc0e54 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -4943,13 +4943,13 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv auto upto_label = [](double z) { char buf[64]; ::sprintf(buf, "%.2f", z); - return _u8L("up to") + " " + std::string(buf) + " " + "mm"; + return _u8L("up to") + " " + std::string(buf) + " " + _u8L("mm"); }; auto above_label = [](double z) { char buf[64]; ::sprintf(buf, "%.2f", z); - return _u8L("above") + " " + std::string(buf) + " " + "mm"; + return _u8L("above") + " " + std::string(buf) + " " + _u8L("mm"); }; auto fromto_label = [](double z1, double z2) { @@ -4957,7 +4957,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv ::sprintf(buf1, "%.2f", z1); char buf2[64]; ::sprintf(buf2, "%.2f", z2); - return _u8L("from") + " " + std::string(buf1) + " " + _u8L("to") + " " + std::string(buf2) + " " + "mm"; + return _u8L("from") + " " + std::string(buf1) + " " + _u8L("to") + " " + std::string(buf2) + " " + _u8L("mm"); }; auto role_time_and_percent = [time_mode](ExtrusionRole role) { diff --git a/src/slic3r/GUI/GUI_ObjectLayers.cpp b/src/slic3r/GUI/GUI_ObjectLayers.cpp index a96891bcf2..3b36158bd1 100644 --- a/src/slic3r/GUI/GUI_ObjectLayers.cpp +++ b/src/slic3r/GUI/GUI_ObjectLayers.cpp @@ -139,7 +139,7 @@ wxSizer* ObjectLayers::create_layer(const t_layer_height_range& range, PlusMinus m_grid_sizer->Add(editor, 1, wxEXPAND); auto sizer2 = new wxBoxSizer(wxHORIZONTAL); - auto unit_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, "mm", wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); + auto unit_text = new wxStaticText(m_og->ctrl_parent(), wxID_ANY, _L("mm"), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); unit_text->SetBackgroundStyle(wxBG_STYLE_PAINT); unit_text->SetFont(wxGetApp().normal_font()); sizer2->Add(unit_text, 0, wxALIGN_CENTER_VERTICAL); @@ -160,7 +160,7 @@ wxSizer* ObjectLayers::create_layer(const t_layer_height_range& range, PlusMinus //auto sizer = new wxBoxSizer(wxHORIZONTAL); //sizer->Add(editor); - //auto temp = new wxStaticText(m_parent, wxID_ANY, "mm"); + //auto temp = new wxStaticText(m_parent, wxID_ANY, _L("mm")); //temp->SetBackgroundStyle(wxBG_STYLE_PAINT); //temp->SetFont(wxGetApp().normal_font()); //sizer->Add(temp, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, wxGetApp().em_unit()); diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index fc777a36d8..14f1e86b44 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -158,7 +158,7 @@ ObjectDataViewModelNode::ObjectDataViewModelNode(ObjectDataViewModelNode* parent parent->GetNthChild(i)->SetIdx(i + 1); } const std::string label_range = (boost::format(" %.2f-%.2f ") % layer_range.first % layer_range.second).str(); - m_name = _(L("Range")) + label_range + "(" + _("mm") + ")"; + m_name = _(L("Range")) + label_range + "(" + _(L("mm")) + ")"; m_bmp = create_scaled_bitmap(LayerIcon); set_icons(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 713a98665f..08874c0d91 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -11773,7 +11773,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)) + wxString::FromUTF8("mm/s²")}; + _L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + _L(u8"mm/s²")}; get_notification_manager()->push_notification(msg.ToStdString()); } else { // set max acceleration in case of batch mode to get correct test pattern size @@ -11840,7 +11840,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params) speeds.assign({speed}); const auto msg{_L("INFO:") + "\n" + - _L("No speeds provided for calibration. Use default optimal speed ") + std::to_string(long(speed)) + "mm/s"}; + _L("No speeds provided for calibration. Use default optimal speed ") + std::to_string(long(speed)) + _L("mm/s")}; get_notification_manager()->push_notification(msg.ToStdString()); } else if (speeds.size() == 1) { // If we have single value provided, set speed using global configuration. diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp index 9dd1c85965..96cd3b65a7 100644 --- a/src/slic3r/GUI/RammingChart.cpp +++ b/src/slic3r/GUI/RammingChart.cpp @@ -89,10 +89,10 @@ void Chart::draw() { } // axis labels: - wxString label = _(L("Time")) + " (" + _("s") + ")"; + wxString label = _(L("Time")) + " (" + _(L("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")) + " (" + wxString::FromUTF8("mm³/s") + ")"; + label = _(L("Volumetric speed")) + " (" + _(L(u8"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); diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 52b7a416f5..7872f0d36b 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -106,8 +106,8 @@ RammingPanel::RammingPanel(wxWindow* parent, const std::string& parameters) label->SetLabel(multiline_message); 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, wxString::FromUTF8("mm³"), wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 10000, 0 ); + m_widget_time = new SpinInput(this, wxEmptyString, _L("ms"), wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 5000 , 3000, 250); + m_widget_volume = new SpinInput(this, wxEmptyString, _L("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 ); diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index f9d42bc19f..d38e0822f1 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -356,7 +356,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), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size); + m_tiStart = new TextInput(this, std::to_string(230), _L("\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)); @@ -365,7 +365,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), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size); + m_tiEnd = new TextInput(this, std::to_string(190), _L("\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)); @@ -374,7 +374,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), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size); + m_tiStep = new TextInput(this, wxString::FromDouble(5), _L("\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)); @@ -409,7 +409,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat return; if(t> 350 || t < 170){ MessageDialog msg_dlg(nullptr, wxString::Format(L"Supported range: 170%s - 350%s", - wxString::FromUTF8("\u2103") /* °C */, wxString::FromUTF8("\u2103") /* °C */), + _L("\u2103" /* °C */), _L("\u2103" /* °C */)), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); if(t > 350) @@ -537,7 +537,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), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size); + m_tiStart = new TextInput(this, std::to_string(5), _L(u8"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)); @@ -547,7 +547,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), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size); + m_tiEnd = new TextInput(this, std::to_string(20), _L(u8"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)); @@ -556,7 +556,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), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size); + m_tiStep = new TextInput(this, wxString::FromDouble(0.5), _L(u8"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)); @@ -641,7 +641,7 @@ VFA_Test_Dlg::VFA_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) // start vol auto start_vol_sizer = new wxBoxSizer(wxHORIZONTAL); auto start_vol_text = new wxStaticText(this, wxID_ANY, start_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStart = new TextInput(this, std::to_string(40), "mm/s", "", wxDefaultPosition, ti_size); + m_tiStart = new TextInput(this, std::to_string(40), _L("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)); @@ -651,7 +651,7 @@ VFA_Test_Dlg::VFA_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) // 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(200), "mm/s", "", wxDefaultPosition, ti_size); + m_tiEnd = new TextInput(this, std::to_string(200), _L("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)); @@ -660,7 +660,7 @@ VFA_Test_Dlg::VFA_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) // 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(10), "mm/s", "", wxDefaultPosition, ti_size); + m_tiStep = new TextInput(this, wxString::FromDouble(10), _L("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)); @@ -748,7 +748,7 @@ Retraction_Test_Dlg::Retraction_Test_Dlg(wxWindow* parent, wxWindowID id, Plater // start length auto start_length_sizer = new wxBoxSizer(wxHORIZONTAL); auto start_length_text = new wxStaticText(this, wxID_ANY, start_length_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStart = new TextInput(this, std::to_string(0), "mm", "", wxDefaultPosition, ti_size); + m_tiStart = new TextInput(this, std::to_string(0), _L("mm"), "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); start_length_sizer->Add(start_length_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -758,7 +758,7 @@ Retraction_Test_Dlg::Retraction_Test_Dlg(wxWindow* parent, wxWindowID id, Plater // end length auto end_length_sizer = new wxBoxSizer(wxHORIZONTAL); auto end_length_text = new wxStaticText(this, wxID_ANY, end_length_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiEnd = new TextInput(this, std::to_string(2), "mm", "", wxDefaultPosition, ti_size); + m_tiEnd = new TextInput(this, std::to_string(2), _L("mm"), "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); end_length_sizer->Add(end_length_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); end_length_sizer->Add(m_tiEnd , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -767,7 +767,7 @@ Retraction_Test_Dlg::Retraction_Test_Dlg(wxWindow* parent, wxWindowID id, Plater // length step auto length_step_sizer = new wxBoxSizer(wxHORIZONTAL); auto length_step_text = new wxStaticText(this, wxID_ANY, length_step_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStep = new TextInput(this, wxString::FromDouble(0.1), "mm", "", wxDefaultPosition, ti_size); + m_tiStep = new TextInput(this, wxString::FromDouble(0.1), _L("mm"), "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); length_step_sizer->Add(length_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); length_step_sizer->Add(m_tiStep , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -898,9 +898,9 @@ Input_Shaping_Freq_Test_Dlg::Input_Shaping_Freq_Test_Dlg(wxWindow* parent, wxWin // X axis frequencies auto x_freq_sizer = new wxBoxSizer(wxHORIZONTAL); auto start_x_text = new wxStaticText(this, wxID_ANY, x_axis_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiFreqStartX = new TextInput(this, std::to_string(15) , "Hz", "", wxDefaultPosition, ti_size); + m_tiFreqStartX = new TextInput(this, std::to_string(15) , _L("Hz"), "", wxDefaultPosition, ti_size); m_tiFreqStartX->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); - m_tiFreqEndX = new TextInput(this, std::to_string(110), "Hz", "", wxDefaultPosition, ti_size); + m_tiFreqEndX = new TextInput(this, std::to_string(110), _L("Hz"), "", wxDefaultPosition, ti_size); m_tiFreqEndX->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); x_freq_sizer->Add(start_x_text , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -1112,9 +1112,9 @@ Input_Shaping_Damp_Test_Dlg::Input_Shaping_Damp_Test_Dlg(wxWindow* parent, wxWin auto freq_sizer = new wxBoxSizer(wxHORIZONTAL); auto freq_text = new wxStaticText(this, wxID_ANY, freq_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiFreqX = new TextInput(this, std::to_string(30), "Hz", "", wxDefaultPosition, ti_size); + m_tiFreqX = new TextInput(this, std::to_string(30), _L("Hz"), "", wxDefaultPosition, ti_size); m_tiFreqX->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); - m_tiFreqY = new TextInput(this, std::to_string(30), "Hz", "", wxDefaultPosition, ti_size); + m_tiFreqY = new TextInput(this, std::to_string(30), _L("Hz"), "", wxDefaultPosition, ti_size); m_tiFreqY->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); freq_sizer->Add(freq_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); freq_sizer->Add(m_tiFreqX, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));