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

Remove markers from strings that don't need to be translated (#8842)

Browse source 
Remove markers from text that does not need to be translated
This commit is contained in:
Alexandre Folle de Menezes 2025-05-11 04:04:48 -03:00 • committed by GitHub
parent 75dd55fcf6
commit 3e48390cee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 93 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

136
src/libslic3r/PrintConfig.cpp
View file

@ -542,7 +542,7 @@ void PrintConfigDef::init_common_params()
def = this->add("preferred_orientation", coFloat); def = this->add("preferred_orientation", coFloat);
def->label = L("Preferred orientation"); def->label = L("Preferred orientation");
def->tooltip = L("Automatically orient stls on the Z-axis upon initial import"); def->tooltip = L("Automatically orient stls on the Z-axis upon initial import");
def->sidetext = L("°"); def->sidetext = "°";
def->max = 360; def->max = 360;
def->min = -360; def->min = -360;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -695,7 +695,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers"); def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. " 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."); "A value of 0 means the filament does not support printing on the Cool Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Bed temperature"); def->full_label = L("Bed temperature");
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
@ -705,7 +705,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers"); def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. " 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."); "A value of 0 means the filament does not support printing on the Textured Cool Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Bed temperature"); def->full_label = L("Bed temperature");
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
@ -715,7 +715,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers"); def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. " 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."); "A value of 0 means the filament does not support printing on the Engineering Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Bed temperature"); def->full_label = L("Bed temperature");
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
@ -725,7 +725,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers"); def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. " 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."); "A value of 0 means the filament does not support printing on the High Temp Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Bed temperature"); def->full_label = L("Bed temperature");
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
@ -735,7 +735,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Other layers"); def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. " 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."); "A value of 0 means the filament does not support printing on the Textured PEI Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Bed temperature"); def->full_label = L("Bed temperature");
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
@ -756,7 +756,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature"); def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. " def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Cool Plate."); "A value of 0 means the filament does not support printing on the Cool Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = 120; def->max = 120;
def->set_default_value(new ConfigOptionInts{ 35 }); def->set_default_value(new ConfigOptionInts{ 35 });
@ -766,7 +766,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature"); def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. " 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."); "A value of 0 means the filament does not support printing on the Textured Cool Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = 120; def->max = 120;
def->set_default_value(new ConfigOptionInts{ 40 }); def->set_default_value(new ConfigOptionInts{ 40 });
@ -776,7 +776,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature"); def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. " def->tooltip = L("Bed temperature of the initial layer. "
"A value of 0 means the filament does not support printing on the Engineering Plate."); "A value of 0 means the filament does not support printing on the Engineering Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
def->set_default_value(new ConfigOptionInts{ 45 }); def->set_default_value(new ConfigOptionInts{ 45 });
@ -786,7 +786,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature"); def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. " 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."); "A value of 0 means the filament does not support printing on the High Temp Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->max = 300; def->max = 300;
def->set_default_value(new ConfigOptionInts{ 45 }); def->set_default_value(new ConfigOptionInts{ 45 });
@ -795,7 +795,7 @@ void PrintConfigDef::init_fff_params()
def->full_label = L("Initial layer bed temperature"); def->full_label = L("Initial layer bed temperature");
def->tooltip = L("Bed temperature of the initial layer. " 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."); "A value of 0 means the filament does not support printing on the Textured PEI Plate.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = 300; def->max = 300;
def->set_default_value(new ConfigOptionInts{45}); def->set_default_value(new ConfigOptionInts{45});
@ -934,7 +934,7 @@ void PrintConfigDef::init_fff_params()
"and bridges can improve the overall print quality of these features.\n\n" "and bridges can improve the overall print quality of these features.\n\n"
"Please note, this fan speed is clamped on the lower end by the minimum fan speed threshold set above. It is also adjusted " "Please note, this fan speed is clamped on the lower end by the minimum fan speed threshold set above. It is also adjusted "
"upwards up to the maximum fan speed threshold when the minimum layer time threshold is not met."); "upwards up to the maximum fan speed threshold when the minimum layer time threshold is not met.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -970,7 +970,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Bridging angle override. If left to zero, the bridging angle will be calculated " def->tooltip = L("Bridging angle override. If left to zero, the bridging angle will be calculated "
"automatically. Otherwise the provided angle will be used for external bridges. " "automatically. Otherwise the provided angle will be used for external bridges. "
"Use 180°for zero angle."); "Use 180°for zero angle.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0.)); def->set_default_value(new ConfigOptionFloat(0.));
@ -982,7 +982,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Internal bridging angle override. If left to zero, the bridging angle will be calculated " def->tooltip = L("Internal bridging angle override. If left to zero, the bridging angle will be calculated "
"automatically. Otherwise the provided angle will be used for internal bridges. " "automatically. Otherwise the provided angle will be used for internal bridges. "
"Use 180°for zero angle.\n\nIt is recommended to leave it at 0 unless there is a specific model need not to."); "Use 180°for zero angle.\n\nIt is recommended to leave it at 0 unless there is a specific model need not to.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0.)); def->set_default_value(new ConfigOptionFloat(0.));
@ -993,7 +993,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Controls the density (spacing) of external bridge lines. 100% means solid bridge. Default is 100%.\n\n" def->tooltip = L("Controls the density (spacing) of external bridge lines. 100% means solid bridge. Default is 100%.\n\n"
"Lower density external bridges can help improve reliability as there is more space for air to circulate " "Lower density external bridges can help improve reliability as there is more space for air to circulate "
"around the extruded bridge, improving its cooling speed."); "around the extruded bridge, improving its cooling speed.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 10; def->min = 10;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -1007,7 +1007,7 @@ void PrintConfigDef::init_fff_params()
"air to circulate around the extruded bridge, improving its cooling speed. \n\n" "air to circulate around the extruded bridge, improving its cooling speed. \n\n"
"This option works particularly well when combined with the second internal bridge over infill option, " "This option works particularly well when combined with the second internal bridge over infill option, "
"further improving internal bridging structure before solid infill is extruded."); "further improving internal bridging structure before solid infill is extruded.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 10; def->min = 10;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -1300,7 +1300,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Support"); def->category = L("Support");
def->tooltip = L("Maximum angle to let a brim ear appear. \nIf set to 0, no brim will be created. \nIf set to " def->tooltip = L("Maximum angle to let a brim ear appear. \nIf set to 0, no brim will be created. \nIf set to "
"~180, brim will be created on everything but straight sections."); "~180, brim will be created on everything but straight sections.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 180; def->max = 180;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -1430,7 +1430,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("during_print_exhaust_fan_speed", coInts); def = this->add("during_print_exhaust_fan_speed", coInts);
def->label = L("Fan speed"); def->label = L("Fan speed");
def->tooltip=L("Speed of exhaust fan during printing. This speed will override the speed in filament custom G-code."); def->tooltip=L("Speed of exhaust fan during printing. This speed will override the speed in filament custom G-code.");
def->sidetext = L("%"); def->sidetext = "%";
def->min=0; def->min=0;
def->max=100; def->max=100;
def->mode = comSimple; def->mode = comSimple;
@ -1438,7 +1438,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("complete_print_exhaust_fan_speed", coInts); def = this->add("complete_print_exhaust_fan_speed", coInts);
def->label = L("Fan speed"); def->label = L("Fan speed");
def->sidetext = L("%"); def->sidetext = "%";
def->tooltip=L("Speed of exhaust fan after printing completes"); def->tooltip=L("Speed of exhaust fan after printing completes");
def->min=0; def->min=0;
def->max=100; def->max=100;
@ -2060,7 +2060,7 @@ void PrintConfigDef::init_fff_params()
" The part will be scaled in xy to compensate." " The part will be scaled in xy to compensate."
" Only the filament used for the perimeter is taken into account." " Only the filament used for the perimeter is taken into account."
"\nBe sure to allow enough space between objects, as this compensation is done after the checks."); "\nBe sure to allow enough space between objects, as this compensation is done after the checks.");
def->sidetext = L("%"); def->sidetext = "%";
def->ratio_over = ""; def->ratio_over = "";
def->min = 10; def->min = 10;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2071,7 +2071,7 @@ void PrintConfigDef::init_fff_params()
// xgettext:no-c-format, no-boost-format // xgettext:no-c-format, no-boost-format
def->tooltip = L("Enter the shrinkage percentage that the filament will get after cooling (94% if you measure 94mm instead of 100mm)." def->tooltip = L("Enter the shrinkage percentage that the filament will get after cooling (94% if you measure 94mm instead of 100mm)."
" The part will be scaled in Z to compensate."); " The part will be scaled in Z to compensate.");
def->sidetext = L("%"); def->sidetext = "%";
def->ratio_over = ""; def->ratio_over = "";
def->min = 10; def->min = 10;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2274,7 +2274,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("temperature_vitrification", coInts); def = this->add("temperature_vitrification", coInts);
def->label = L("Softening temperature"); 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 it, it's highly recommended to open the front door and/or remove the upper glass to avoid clogging."); def->tooltip = L("The material softens at this temperature, so when the bed temperature is equal to or greater than it, it's highly recommended to open the front door and/or remove the upper glass to avoid clogging.");
def->sidetext = L("°C"); // ORCA add side text def->sidetext = "°C"; // ORCA add side text
def->mode = comSimple; def->mode = comSimple;
def->set_default_value(new ConfigOptionInts{ 100 }); def->set_default_value(new ConfigOptionInts{ 100 });
@ -2306,7 +2306,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Sparse infill direction"); def->label = L("Sparse infill direction");
def->category = L("Strength"); def->category = L("Strength");
def->tooltip = L("Angle for sparse infill pattern, which controls the start or main direction of line"); def->tooltip = L("Angle for sparse infill pattern, which controls the start or main direction of line");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 360; def->max = 360;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2316,7 +2316,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Solid infill direction"); def->label = L("Solid infill direction");
def->category = L("Strength"); def->category = L("Strength");
def->tooltip = L("Angle for solid infill pattern, which controls the start or main direction of line"); def->tooltip = L("Angle for solid infill pattern, which controls the start or main direction of line");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 360; def->max = 360;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2334,7 +2334,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Strength"); def->category = L("Strength");
// xgettext:no-c-format, no-boost-format // xgettext:no-c-format, no-boost-format
def->tooltip = L("Density of internal sparse infill, 100% turns all sparse infill into solid infill and internal solid infill pattern will be used"); def->tooltip = L("Density of internal sparse infill, 100% turns all sparse infill into solid infill and internal solid infill pattern will be used");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
def->set_default_value(new ConfigOptionPercent(20)); def->set_default_value(new ConfigOptionPercent(20));
@ -2390,7 +2390,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Lattice angle 1"); def->label = L("Lattice angle 1");
def->category = L("Strength"); def->category = L("Strength");
def->tooltip = L("The angle of the first set of 2D lattice elements in the Z direction. Zero is vertical."); def->tooltip = L("The angle of the first set of 2D lattice elements in the Z direction. Zero is vertical.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = -75; def->min = -75;
def->max = 75; def->max = 75;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2400,7 +2400,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Lattice angle 2"); def->label = L("Lattice angle 2");
def->category = L("Strength"); def->category = L("Strength");
def->tooltip = L("The angle of the second set of 2D lattice elements in the Z direction. Zero is vertical."); def->tooltip = L("The angle of the second set of 2D lattice elements in the Z direction. Zero is vertical.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = -75; def->min = -75;
def->max = 75; def->max = 75;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2539,7 +2539,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("accel_to_decel_factor", coPercent); def = this->add("accel_to_decel_factor", coPercent);
def->label = L("accel_to_decel"); def->label = L("accel_to_decel");
def->tooltip = L("Klipper's max_accel_to_decel will be adjusted to this %% of acceleration"); def->tooltip = L("Klipper's max_accel_to_decel will be adjusted to this %% of acceleration");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 1; def->min = 1;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2678,7 +2678,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Initial layer"); def->label = L("Initial layer");
def->full_label = L("Initial layer nozzle temperature"); def->full_label = L("Initial layer nozzle temperature");
def->tooltip = L("Nozzle temperature for printing initial layer when using this filament"); def->tooltip = L("Nozzle temperature for printing initial layer when using this filament");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = max_temp; def->max = max_temp;
def->set_default_value(new ConfigOptionInts { 200 }); def->set_default_value(new ConfigOptionInts { 200 });
@ -2701,7 +2701,7 @@ void PrintConfigDef::init_fff_params()
" reduces the layer binding strength between supports and the supported part, making them easier to separate." " reduces the layer binding strength between supports and the supported part, making them easier to separate."
"\nSet to -1 to disable it." "\nSet to -1 to disable it."
"\nThis setting is overridden by disable_fan_first_layers."); "\nThis setting is overridden by disable_fan_first_layers.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = -1; def->min = -1;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2713,7 +2713,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("The part cooling fan speed used for all internal bridges. Set to -1 to use the overhang fan speed settings instead.\n\n" def->tooltip = L("The part cooling fan speed used for all internal bridges. Set to -1 to use the overhang fan speed settings instead.\n\n"
"Reducing the internal bridges fan speed, compared to your regular fan speed, can help reduce part warping due to excessive " "Reducing the internal bridges fan speed, compared to your regular fan speed, can help reduce part warping due to excessive "
"cooling applied over a large surface for a prolonged period of time."); "cooling applied over a large surface for a prolonged period of time.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = -1; def->min = -1;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -3097,7 +3097,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Strength"); def->category = L("Strength");
// xgettext:no-c-format, no-boost-format // xgettext:no-c-format, no-boost-format
def->tooltip = L("Infill area is enlarged slightly to overlap with wall for better bonding. The percentage value is relative to line width of sparse infill. Set this value to ~10-15% to minimize potential over extrusion and accumulation of material resulting in rough top surfaces."); def->tooltip = L("Infill area is enlarged slightly to overlap with wall for better bonding. The percentage value is relative to line width of sparse infill. Set this value to ~10-15% to minimize potential over extrusion and accumulation of material resulting in rough top surfaces.");
def->sidetext = L("%"); def->sidetext = "%";
def->ratio_over = "inner_wall_line_width"; def->ratio_over = "inner_wall_line_width";
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercent(15)); def->set_default_value(new ConfigOptionPercent(15));
@ -3107,7 +3107,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Strength"); def->category = L("Strength");
// xgettext:no-c-format, no-boost-format // xgettext:no-c-format, no-boost-format
def->tooltip = L("Top solid infill area is enlarged slightly to overlap with wall for better bonding and to minimize the appearance of pinholes where the top infill meets the walls. A value of 25-30% is a good starting point, minimizing the appearance of pinholes. The percentage value is relative to line width of sparse infill"); def->tooltip = L("Top solid infill area is enlarged slightly to overlap with wall for better bonding and to minimize the appearance of pinholes where the top infill meets the walls. A value of 25-30% is a good starting point, minimizing the appearance of pinholes. The percentage value is relative to line width of sparse infill");
def->sidetext = L("%"); def->sidetext = "%";
def->ratio_over = "inner_wall_line_width"; def->ratio_over = "inner_wall_line_width";
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercent(25)); def->set_default_value(new ConfigOptionPercent(25));
@ -3183,7 +3183,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("interlocking_orientation", coFloat); def = this->add("interlocking_orientation", coFloat);
def->label = L("Interlocking direction"); def->label = L("Interlocking direction");
def->tooltip = L("Orientation of interlock beams."); def->tooltip = L("Orientation of interlock beams.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 360; def->max = 360;
def->category = L("Advanced"); def->category = L("Advanced");
@ -3253,7 +3253,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Quality"); def->category = L("Quality");
def->tooltip = L("The amount of material to extrude during ironing. Relative to flow of normal layer height. " def->tooltip = L("The amount of material to extrude during ironing. Relative to flow of normal layer height. "
"Too high value results in overextrusion on the surface"); "Too high value results in overextrusion on the surface");
def->sidetext = L("%"); def->sidetext = "%";
def->ratio_over = "layer_height"; def->ratio_over = "layer_height";
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
@ -3293,7 +3293,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Ironing angle"); def->label = L("Ironing angle");
def->category = L("Quality"); def->category = L("Quality");
def->tooltip = L("The angle ironing is done at. A negative number disables this function and uses the default method."); def->tooltip = L("The angle ironing is done at. A negative number disables this function and uses the default method.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = -1; def->min = -1;
def->max = 359; def->max = 359;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -3514,7 +3514,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Fan speed"); def->label = L("Fan speed");
def->tooltip = L("Part cooling fan speed may be increased when auto cooling is enabled. " def->tooltip = L("Part cooling fan speed may be increased when auto cooling is enabled. "
"This is the maximum speed limitation of part cooling fan"); "This is the maximum speed limitation of part cooling fan");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
def->mode = comSimple; def->mode = comSimple;
@ -3573,7 +3573,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("fan_min_speed", coFloats); def = this->add("fan_min_speed", coFloats);
def->label = L("Fan speed"); def->label = L("Fan speed");
def->tooltip = L("Minimum speed for part cooling fan"); def->tooltip = L("Minimum speed for part cooling fan");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
def->mode = comSimple; def->mode = comSimple;
@ -3583,7 +3583,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Fan speed"); def->label = L("Fan speed");
def->tooltip = L("Speed of auxiliary part cooling fan. Auxiliary fan will run at this speed during printing except the first several layers " def->tooltip = L("Speed of auxiliary part cooling fan. Auxiliary fan will run at this speed during printing except the first several layers "
"which is defined by no cooling layers.\nPlease enable auxiliary_fan in printer settings to use this feature. G-code command: M106 P2 S(0-255)"); "which is defined by no cooling layers.\nPlease enable auxiliary_fan in printer settings to use this feature. G-code command: M106 P2 S(0-255)");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
def->mode = comSimple; def->mode = comSimple;
@ -3755,7 +3755,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Maximum angle of overhangs to allow after making more steep overhangs printable." def->tooltip = L("Maximum angle of overhangs to allow after making more steep overhangs printable."
"90° will not change the model at all and allow any overhang, while 0 will " "90° will not change the model at all and allow any overhang, while 0 will "
"replace all overhangs with conical material."); "replace all overhangs with conical material.");
def->sidetext = L("°"); def->sidetext = "°";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0.; def->min = 0.;
def->max = 90.; def->max = 90.;
@ -3891,7 +3891,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Initial layer density"); def->label = L("Initial layer density");
def->category = L("Support"); def->category = L("Support");
def->tooltip = L("Density of the first raft or support layer"); def->tooltip = L("Density of the first raft or support layer");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 10; def->min = 10;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -3937,7 +3937,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("retract_before_wipe", coPercents); def = this->add("retract_before_wipe", coPercents);
def->label = L("Retract amount before wipe"); def->label = L("Retract amount before wipe");
def->tooltip = L("The length of fast retraction before wipe, relative to retraction length"); def->tooltip = L("The length of fast retraction before wipe, relative to retraction length");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercents { 100 }); def->set_default_value(new ConfigOptionPercents { 100 });
@ -4038,7 +4038,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("travel_slope", coFloats); def = this->add("travel_slope", coFloats);
def->label = L("Traveling angle"); def->label = L("Traveling angle");
def->tooltip = L("Traveling angle for Slope and Spiral Z-hop type. Setting it to 90° results in Normal Lift."); def->tooltip = L("Traveling angle for Slope and Spiral Z-hop type. Setting it to 90° results in Normal Lift.");
def->sidetext = L("°"); def->sidetext = "°";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 1; def->min = 1;
def->max = 90; def->max = 90;
@ -4180,7 +4180,7 @@ void PrintConfigDef::init_fff_params()
"This option sets the threshold angle for applying a conditional scarf joint seam.\nIf the maximum angle within the perimeter loop " "This option sets the threshold angle for applying a conditional scarf joint seam.\nIf the maximum angle within the perimeter loop "
"exceeds this value (indicating the absence of sharp corners), a scarf joint seam will be used. The default value is 155°."); "exceeds this value (indicating the absence of sharp corners), a scarf joint seam will be used. The default value is 155°.");
def->mode = comAdvanced; def->mode = comAdvanced;
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 180; def->max = 180;
def->set_default_value(new ConfigOptionInt(155)); def->set_default_value(new ConfigOptionInt(155));
@ -4192,7 +4192,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("This option determines the overhang threshold for the application of scarf joint seams. If the unsupported portion " def->tooltip = L("This option determines the overhang threshold for the application of scarf joint seams. If the unsupported portion "
"of the perimeter is less than this threshold, scarf joint seams will be applied. The default threshold is set at 40% " "of the perimeter is less than this threshold, scarf joint seams will be applied. The default threshold is set at 40% "
"of the external wall's width. Due to performance considerations, the degree of overhang is estimated."); "of the external wall's width. Due to performance considerations, the degree of overhang is estimated.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercent(40)); def->set_default_value(new ConfigOptionPercent(40));
@ -4301,7 +4301,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("skirt_start_angle", coFloat); def = this->add("skirt_start_angle", coFloat);
def->label = L("Skirt start point"); def->label = L("Skirt start point");
def->tooltip = L("Angle from the object center to skirt start point. Zero is the most right position, counter clockwise is positive angle."); def->tooltip = L("Angle from the object center to skirt start point. Zero is the most right position, counter clockwise is positive angle.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = -180; def->min = -180;
def->max = 180; def->max = 180;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -4668,7 +4668,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Pattern angle"); def->label = L("Pattern angle");
def->category = L("Support"); def->category = L("Support");
def->tooltip = L("Use this setting to rotate the support pattern on the horizontal plane."); def->tooltip = L("Use this setting to rotate the support pattern on the horizontal plane.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 359; def->max = 359;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -4951,7 +4951,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Threshold angle"); def->label = L("Threshold angle");
def->category = L("Support"); def->category = L("Support");
def->tooltip = L("Support will be generated for overhangs whose slope angle is below the threshold."); def->tooltip = L("Support will be generated for overhangs whose slope angle is below the threshold.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 90; def->max = 90;
def->mode = comSimple; def->mode = comSimple;
@ -4973,7 +4973,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Support"); def->category = L("Support");
def->tooltip = L("This setting determines the maximum overhang angle that t he branches of tree support allowed to make." def->tooltip = L("This setting determines the maximum overhang angle that t he branches of tree support allowed to make."
"If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther."); "If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 60; def->max = 60;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -4984,7 +4984,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Support"); def->category = L("Support");
def->tooltip = L("This setting determines the maximum overhang angle that t he branches of tree support allowed to make." def->tooltip = L("This setting determines the maximum overhang angle that t he branches of tree support allowed to make."
"If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther."); "If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 60; def->max = 60;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -4996,7 +4996,7 @@ void PrintConfigDef::init_fff_params()
// TRN PrintSettings: "Organic supports" > "Preferred Branch Angle" // TRN PrintSettings: "Organic supports" > "Preferred Branch Angle"
def->tooltip = L("The preferred angle of the branches, when they do not have to avoid the model. " def->tooltip = L("The preferred angle of the branches, when they do not have to avoid the model. "
"Use a lower angle to make them more vertical and more stable. Use a higher angle for branches to merge faster."); "Use a lower angle to make them more vertical and more stable. Use a higher angle for branches to merge faster.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 10; def->min = 10;
def->max = 85; def->max = 85;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -5030,7 +5030,7 @@ void PrintConfigDef::init_fff_params()
"A higher value results in better overhangs but the supports are harder to remove, " "A higher value results in better overhangs but the supports are harder to remove, "
"thus it is recommended to enable top support interfaces instead of a high branch density value " "thus it is recommended to enable top support interfaces instead of a high branch density value "
"if dense interfaces are needed."); "if dense interfaces are needed.");
def->sidetext = L("%"); def->sidetext = "%";
def->min = 5; def->min = 5;
def->max_literal = 35; def->max_literal = 35;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -5084,7 +5084,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("The angle of the branches' diameter as they gradually become thicker towards the bottom. " def->tooltip = L("The angle of the branches' diameter as they gradually become thicker towards the bottom. "
"An angle of 0 will cause the branches to have uniform thickness over their length. " "An angle of 0 will cause the branches to have uniform thickness over their length. "
"A bit of an angle can increase stability of the organic support."); "A bit of an angle can increase stability of the organic support.");
def->sidetext = L("°"); def->sidetext = "°";
def->min = 0; def->min = 0;
def->max = 15; def->max = 15;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -5139,7 +5139,7 @@ void PrintConfigDef::init_fff_params()
"This may be useful if your printer does not support M141/M191 commands, or if you desire " "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." "to handle heat soaking in the print start macro if no active chamber heater is installed."
); );
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Chamber temperature"); def->full_label = L("Chamber temperature");
def->min = 0; def->min = 0;
def->max = max_temp; def->max = max_temp;
@ -5148,7 +5148,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_temperature", coInts); def = this->add("nozzle_temperature", coInts);
def->label = L("Other layers"); def->label = L("Other layers");
def->tooltip = L("Nozzle temperature for layers after the initial one"); def->tooltip = L("Nozzle temperature for layers after the initial one");
def->sidetext = L("°C"); def->sidetext = "°C";
def->full_label = L("Nozzle temperature"); def->full_label = L("Nozzle temperature");
def->min = 0; def->min = 0;
def->max = max_temp; def->max = max_temp;
@ -5157,7 +5157,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_temperature_range_low", coInts); def = this->add("nozzle_temperature_range_low", coInts);
def->label = L("Min"); def->label = L("Min");
//def->tooltip = L(""); //def->tooltip = L("");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = max_temp; def->max = max_temp;
def->set_default_value(new ConfigOptionInts { 190 }); def->set_default_value(new ConfigOptionInts { 190 });
@ -5165,7 +5165,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("nozzle_temperature_range_high", coInts); def = this->add("nozzle_temperature_range_high", coInts);
def->label = L("Max"); def->label = L("Max");
//def->tooltip = L(""); //def->tooltip = L("");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = max_temp; def->max = max_temp;
def->set_default_value(new ConfigOptionInts { 240 }); def->set_default_value(new ConfigOptionInts { 240 });
@ -5346,7 +5346,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("wipe_tower_rotation_angle", coFloat); def = this->add("wipe_tower_rotation_angle", coFloat);
def->label = L("Wipe tower rotation angle"); def->label = L("Wipe tower rotation angle");
def->tooltip = L("Wipe tower rotation angle with respect to x-axis."); def->tooltip = L("Wipe tower rotation angle with respect to x-axis.");
def->sidetext = L("°"); def->sidetext = "°";
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0.)); def->set_default_value(new ConfigOptionFloat(0.));
@ -5362,7 +5362,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Stabilization cone apex angle"); def->label = L("Stabilization cone apex angle");
def->tooltip = L("Angle at the apex of the cone that is used to stabilize the wipe tower. " def->tooltip = L("Angle at the apex of the cone that is used to stabilize the wipe tower. "
"Larger angle means wider base."); "Larger angle means wider base.");
def->sidetext = L("°"); def->sidetext = "°";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0.; def->min = 0.;
def->max = 90.; def->max = 90.;
@ -5433,7 +5433,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("wipe_tower_extra_spacing", coPercent); def = this->add("wipe_tower_extra_spacing", coPercent);
def->label = L("Wipe tower purge lines spacing"); def->label = L("Wipe tower purge lines spacing");
def->tooltip = L("Spacing of purge lines on the wipe tower."); def->tooltip = L("Spacing of purge lines on the wipe tower.");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 100.; def->min = 100.;
def->max = 300.; def->max = 300.;
@ -5443,7 +5443,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Extra flow for purging"); def->label = L("Extra flow for purging");
def->tooltip = L("Extra flow used for the purging lines on the wipe tower. This makes the purging lines thicker or narrower " def->tooltip = L("Extra flow used for the purging lines on the wipe tower. This makes the purging lines thicker or narrower "
"than they normally would be. The spacing is adjusted automatically."); "than they normally would be. The spacing is adjusted automatically.");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 100.; def->min = 100.;
def->max = 300.; def->max = 300.;
@ -5453,7 +5453,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Idle temperature"); def->label = L("Idle temperature");
def->tooltip = L("Nozzle temperature when the tool is currently not used in multi-tool setups." 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."); "This is only used when 'Ooze prevention' is active in Print Settings. Set to 0 to disable.");
def->sidetext = L("°C"); def->sidetext = "°C";
def->min = 0; def->min = 0;
def->max = max_temp; def->max = max_temp;
def->set_default_value(new ConfigOptionInts{0}); def->set_default_value(new ConfigOptionInts{0});
@ -5560,7 +5560,7 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("When transitioning between different numbers of walls as the part becomes " def->tooltip = L("When transitioning between different numbers of walls as the part becomes "
"thinner, a certain amount of space is allotted to split or join the wall segments. " "thinner, a certain amount of space is allotted to split or join the wall segments. "
"It's expressed as a percentage over nozzle diameter"); "It's expressed as a percentage over nozzle diameter");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionPercent(100)); def->set_default_value(new ConfigOptionPercent(100));
@ -5575,7 +5575,7 @@ void PrintConfigDef::init_fff_params()
"starts/stops and travel time. However, large extrusion width variation can lead to " "starts/stops and travel time. However, large extrusion width variation can lead to "
"under- or overextrusion problems. " "under- or overextrusion problems. "
"It's expressed as a percentage over nozzle diameter"); "It's expressed as a percentage over nozzle diameter");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionPercent(25)); def->set_default_value(new ConfigOptionPercent(25));
@ -5587,7 +5587,7 @@ void PrintConfigDef::init_fff_params()
" an angle greater than this setting will not have transitions and no walls will be " " an angle greater than this setting will not have transitions and no walls will be "
"printed in the center to fill the remaining space. Reducing this setting reduces " "printed in the center to fill the remaining space. Reducing this setting reduces "
"the number and length of these center walls, but may leave gaps or overextrude"); "the number and length of these center walls, but may leave gaps or overextrude");
def->sidetext = L("°"); def->sidetext = "°";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 1.; def->min = 1.;
def->max = 59.; def->max = 59.;
@ -5609,7 +5609,7 @@ void PrintConfigDef::init_fff_params()
"not be printed, while features thicker than the Minimum feature size will be widened to " "not be printed, while features thicker than the Minimum feature size will be widened to "
"the Minimum wall width. " "the Minimum wall width. "
"It's expressed as a percentage over nozzle diameter"); "It's expressed as a percentage over nozzle diameter");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionPercent(25)); def->set_default_value(new ConfigOptionPercent(25));
@ -5633,7 +5633,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Quality"); def->category = L("Quality");
def->tooltip = L("The minimum wall width that should be used for the first layer is recommended to be set " def->tooltip = L("The minimum wall width that should be used for the first layer is recommended to be set "
"to the same size as the nozzle. This adjustment is expected to enhance adhesion."); "to the same size as the nozzle. This adjustment is expected to enhance adhesion.");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionPercent(85)); def->set_default_value(new ConfigOptionPercent(85));
@ -5645,7 +5645,7 @@ void PrintConfigDef::init_fff_params()
"of the model. If the Minimum wall width is thinner than the thickness of the feature," "of the model. If the Minimum wall width is thinner than the thickness of the feature,"
" the wall will become as thick as the feature itself. " " the wall will become as thick as the feature itself. "
"It's expressed as a percentage over nozzle diameter"); "It's expressed as a percentage over nozzle diameter");
def->sidetext = L("%"); def->sidetext = "%";
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionPercent(85)); def->set_default_value(new ConfigOptionPercent(85));

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

@ -406,9 +406,9 @@ void CameraPopup::update(bool vcamera_streaming)
wxString CameraPopup::to_resolution_label_string(CameraResolution resolution) { wxString CameraPopup::to_resolution_label_string(CameraResolution resolution) {
switch (resolution) { switch (resolution) {
case RESOLUTION_720P: case RESOLUTION_720P:
return _L("720p"); return "720p";
case RESOLUTION_1080P: case RESOLUTION_1080P:
return _L("1080p"); return "1080p";
default: default:
return ""; return "";
} }

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

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

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

@ -4867,8 +4867,8 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
} }
// ORCA use % symbol for percentage and use "Usage" for "Used filaments" // ORCA use % symbol for percentage and use "Usage" for "Used filaments"
offsets = calculate_offsets({ {_u8L("Line Type"), labels}, {_u8L("Time"), times}, {_u8L("%"), percents}, {"", used_filaments_length}, {"", used_filaments_weight}, {_u8L("Display"), {""}}}, icon_size); offsets = calculate_offsets({ {_u8L("Line Type"), labels}, {_u8L("Time"), times}, {"%", percents}, {"", used_filaments_length}, {"", used_filaments_weight}, {_u8L("Display"), {""}}}, icon_size);
append_headers({{_u8L("Line Type"), offsets[0]}, {_u8L("Time"), offsets[1]}, {_u8L("%"), offsets[2]}, {_u8L("Usage"), offsets[3]}, {_u8L("Display"), offsets[5]}}); append_headers({{_u8L("Line Type"), offsets[0]}, {_u8L("Time"), offsets[1]}, {"%", offsets[2]}, {_u8L("Usage"), offsets[3]}, {_u8L("Display"), offsets[5]}});
break; break;
} }
case EViewType::Height: { imgui.title(_u8L("Layer Height (mm)")); break; } case EViewType::Height: { imgui.title(_u8L("Layer Height (mm)")); break; }

4
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View file

@ -262,7 +262,7 @@ std::string GLGizmoCut3D::get_tooltip() const
if (tooltip.empty() && (m_hover_id == X || m_hover_id == Y || m_hover_id == CutPlaneZRotation)) { if (tooltip.empty() && (m_hover_id == X || m_hover_id == Y || m_hover_id == CutPlaneZRotation)) {
std::string axis = m_hover_id == X ? "X" : m_hover_id == Y ? "Y" : "Z"; std::string axis = m_hover_id == X ? "X" : m_hover_id == Y ? "Y" : "Z";
return axis + ": " + format(float(rad2deg(m_angle)), 1) + _u8L("°"); return axis + ": " + format(float(rad2deg(m_angle)), 1) + "°";
} }
return tooltip; return tooltip;
@ -2541,7 +2541,7 @@ bool GLGizmoCut3D::render_angle_input(const std::string& label, float& in_val, c
float val = rad2deg(in_val); float val = rad2deg(in_val);
const float old_val = val; const float old_val = val;
const std::string format = "%.0f " + _u8L("°"); const std::string format = "%.0f°";
m_imgui->bbl_slider_float_style("##angle_" + label, &val, min_val, max_val, format.c_str(), 1.f, true, from_u8(label)); m_imgui->bbl_slider_float_style("##angle_" + label, &val, min_val, max_val, format.c_str(), 1.f, true, from_u8(label));
ImGui::SameLine(left_width); ImGui::SameLine(left_width);

2
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View file

@ -2108,7 +2108,7 @@ void GLGizmoMeasure::show_face_face_assembly_senior()
m_buffered_around_center = 0; m_buffered_around_center = 0;
} }
ImGui::SameLine(rotate_around_center_size + m_space_size + m_input_size_max + m_space_size / 2.0f); ImGui::SameLine(rotate_around_center_size + m_space_size + m_input_size_max + m_space_size / 2.0f);
m_imgui->text(_L("°")); m_imgui->text("°");
} }
} }
} }

2
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
View file

@ -343,7 +343,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(10,20)); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(10,20));
if (is_worker_running) { // apply or preview if (is_worker_running) { // apply or preview
// draw progress bar // draw progress bar
std::string progress_text = GUI::format(_L("%1%"), std::to_string(progress)) + "%%"; std::string progress_text = GUI::format("%1%", std::to_string(progress)) + "%%";
ImVec2 progress_size(bottom_left_width - space_size, 0.0f); ImVec2 progress_size(bottom_left_width - space_size, 0.0f);
ImGui::BBLProgressBar2(progress / 100., progress_size); ImGui::BBLProgressBar2(progress / 100., progress_size);
ImGui::SameLine(); ImGui::SameLine();

2
src/slic3r/GUI/Gizmos/GLGizmoText.cpp
View file

@ -972,7 +972,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit)
//ImGui::SameLine(); //ImGui::SameLine();
//ImGui::AlignTextToFramePadding(); //ImGui::AlignTextToFramePadding();
//m_imgui->text(_L("Status:")); //m_imgui->text(_L("Status") + ": ");
//float status_cap = m_imgui->calc_text_size(_L("Status:")).x + space_size + ImGui::GetStyle().WindowPadding.x; //float status_cap = m_imgui->calc_text_size(_L("Status:")).x + space_size + ImGui::GetStyle().WindowPadding.x;
//ImGui::SameLine(); //ImGui::SameLine();
//m_imgui->text(m_is_modify ? _L("Modify") : _L("Add")); //m_imgui->text(m_is_modify ? _L("Modify") : _L("Add"));

6
src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
View file

@ -1034,7 +1034,7 @@ void GizmoObjectManipulation::do_render_rotate_window(ImGuiWrapper *imgui_wrappe
is_relative_input = true; is_relative_input = true;
} }
ImGui::SameLine(caption_max + (++index_unit) * unit_size + (++index) * space_size); ImGui::SameLine(caption_max + (++index_unit) * unit_size + (++index) * space_size);
imgui_wrapper->text(_L("°")); imgui_wrapper->text("°");
m_buffered_rotation = rotation; m_buffered_rotation = rotation;
if (is_relative_input) { if (is_relative_input) {
m_last_rotate_type = RotateType::Relative; m_last_rotate_type = RotateType::Relative;
@ -1091,7 +1091,7 @@ void GizmoObjectManipulation::do_render_rotate_window(ImGuiWrapper *imgui_wrappe
is_absolute_input = true; is_absolute_input = true;
} }
ImGui::SameLine(caption_max + (++index_unit) * unit_size + (++index) * space_size); ImGui::SameLine(caption_max + (++index_unit) * unit_size + (++index) * space_size);
imgui_wrapper->text(_L("°")); imgui_wrapper->text("°");
m_buffered_absolute_rotation = absolute_rotation; m_buffered_absolute_rotation = absolute_rotation;
if (is_absolute_input) { if (is_absolute_input) {
m_last_rotate_type = RotateType::Absolute; m_last_rotate_type = RotateType::Absolute;
@ -1247,7 +1247,7 @@ void GizmoObjectManipulation::do_render_scale_input_window(ImGuiWrapper* imgui_w
ImGui::PushItemWidth(unit_size); ImGui::PushItemWidth(unit_size);
ImGui::BBLInputDouble(label_scale_values[0][2], &scale[2], 0.0f, 0.0f, "%.2f"); ImGui::BBLInputDouble(label_scale_values[0][2], &scale[2], 0.0f, 0.0f, "%.2f");
ImGui::SameLine(caption_max + (++index_unit) *unit_size + (++index) * space_size); ImGui::SameLine(caption_max + (++index_unit) *unit_size + (++index) * space_size);
imgui_wrapper->text(_L("%")); imgui_wrapper->text("%");
if (scale.x() > 0 && scale.y() > 0 && scale.z() > 0) { if (scale.x() > 0 && scale.y() > 0 && scale.z() > 0) {
m_buffered_scale = scale; m_buffered_scale = scale;
} }

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

@ -535,7 +535,7 @@ void PrinterPartsDialog::set_nozzle_type(wxCommandEvent& evt)
nozzle_diameter_checkbox->Clear(); nozzle_diameter_checkbox->Clear();
for (int i = 0; i < diameter_list.size(); i++) for (int i = 0; i < diameter_list.size(); i++)
{ {
nozzle_diameter_checkbox->Append(wxString::Format(_L("%.1f"), diameter_list[i])); nozzle_diameter_checkbox->Append(wxString::Format("%.1f", diameter_list[i]));
} }
nozzle_diameter_checkbox->SetSelection(0); nozzle_diameter_checkbox->SetSelection(0);
@ -621,7 +621,7 @@ bool PrinterPartsDialog::Show(bool show)
for (int i = 0; i < diameter_list.size(); i++) for (int i = 0; i < diameter_list.size(); i++)
{ {
nozzle_diameter_checkbox->Append( wxString::Format(_L("%.1f"), diameter_list[i])); nozzle_diameter_checkbox->Append( wxString::Format("%.1f", diameter_list[i]));
if (diameter_list[i] == diameter) { if (diameter_list[i] == diameter) {
nozzle_diameter_checkbox->SetSelection(i); nozzle_diameter_checkbox->SetSelection(i);
} }

8
src/slic3r/GUI/StatusPanel.cpp
View file

@ -333,12 +333,12 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
sizer_percent_icon->Add(0, 0, 1, wxEXPAND, 0); sizer_percent_icon->Add(0, 0, 1, wxEXPAND, 0);
m_staticText_progress_percent = new wxStaticText(penel_text, wxID_ANY, L("0"), wxDefaultPosition, wxDefaultSize, 0); m_staticText_progress_percent = new wxStaticText(penel_text, wxID_ANY, "0", wxDefaultPosition, wxDefaultSize, 0);
m_staticText_progress_percent->SetFont(::Label::Head_18); m_staticText_progress_percent->SetFont(::Label::Head_18);
m_staticText_progress_percent->SetMaxSize(wxSize(-1, FromDIP(20))); m_staticText_progress_percent->SetMaxSize(wxSize(-1, FromDIP(20)));
m_staticText_progress_percent->SetForegroundColour(wxColour(0, 150, 136)); m_staticText_progress_percent->SetForegroundColour(wxColour(0, 150, 136));
m_staticText_progress_percent_icon = new wxStaticText(penel_text, wxID_ANY, L("%"), wxDefaultPosition, wxDefaultSize, 0); m_staticText_progress_percent_icon = new wxStaticText(penel_text, wxID_ANY, "%", wxDefaultPosition, wxDefaultSize, 0);
m_staticText_progress_percent_icon->SetFont(::Label::Body_11); m_staticText_progress_percent_icon->SetFont(::Label::Body_11);
m_staticText_progress_percent_icon->SetMaxSize(wxSize(-1, FromDIP(13))); m_staticText_progress_percent_icon->SetMaxSize(wxSize(-1, FromDIP(13)));
m_staticText_progress_percent_icon->SetForegroundColour(wxColour(0, 150, 136)); m_staticText_progress_percent_icon->SetForegroundColour(wxColour(0, 150, 136));
@ -1267,7 +1267,7 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent)
/* create speed control */ /* create speed control */
m_switch_speed = new ImageSwitchButton(parent, m_bitmap_speed_active, m_bitmap_speed); m_switch_speed = new ImageSwitchButton(parent, m_bitmap_speed_active, m_bitmap_speed);
m_switch_speed->SetLabels(_L("100%"), _L("100%")); m_switch_speed->SetLabels("100%", "100%");
m_switch_speed->SetMinSize(MISC_BUTTON_2FAN_SIZE); m_switch_speed->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_speed->SetMaxSize(MISC_BUTTON_2FAN_SIZE); m_switch_speed->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
m_switch_speed->SetPadding(FromDIP(3)); m_switch_speed->SetPadding(FromDIP(3));
@ -1400,7 +1400,7 @@ void StatusBasePanel::reset_temp_misc_control()
m_tempCtrl_bed->Enable(true); m_tempCtrl_bed->Enable(true);
// reset misc control // reset misc control
m_switch_speed->SetLabels(_L("100%"), _L("100%")); m_switch_speed->SetLabels("100%", "100%");
m_switch_speed->SetValue(false); m_switch_speed->SetValue(false);
m_switch_lamp->SetLabels(_L("Lamp"), _L("Lamp")); m_switch_lamp->SetLabels(_L("Lamp"), _L("Lamp"));
m_switch_lamp->SetValue(false); m_switch_lamp->SetValue(false);

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

@ -251,7 +251,7 @@ StepMeshDialog::StepMeshDialog(wxWindow* parent, Slic3r::Step& file, double line
wxBoxSizer* mesh_face_number_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* mesh_face_number_sizer = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *mesh_face_number_title = new wxStaticText(this, wxID_ANY, _L("Number of triangular facets") + ": "); wxStaticText *mesh_face_number_title = new wxStaticText(this, wxID_ANY, _L("Number of triangular facets") + ": ");
mesh_face_number_title->SetForegroundColour(StateColor::darkModeColorFor(FONT_COLOR)); mesh_face_number_title->SetForegroundColour(StateColor::darkModeColorFor(FONT_COLOR));
mesh_face_number_text = new wxStaticText(this, wxID_ANY, _L("0")); mesh_face_number_text = new wxStaticText(this, wxID_ANY, "0");
mesh_face_number_text->SetForegroundColour(StateColor::darkModeColorFor(FONT_COLOR)); mesh_face_number_text->SetForegroundColour(StateColor::darkModeColorFor(FONT_COLOR));
mesh_face_number_text->SetMinSize(wxSize(FromDIP(150), -1)); mesh_face_number_text->SetMinSize(wxSize(FromDIP(150), -1));
mesh_face_number_sizer->Add(mesh_face_number_title, 0, wxALIGN_LEFT); mesh_face_number_sizer->Add(mesh_face_number_title, 0, wxALIGN_LEFT);

8
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -786,7 +786,7 @@ void AMSLib::render_extra_text(wxDC& dc)
auto tsize = dc.GetMultiLineTextExtent("?"); auto tsize = dc.GetMultiLineTextExtent("?");
auto pot = wxPoint(0, 0); auto pot = wxPoint(0, 0);
pot = wxPoint((libsize.x - tsize.x) / 2 + FromDIP(2), (libsize.y - tsize.y) / 2 - FromDIP(5)); pot = wxPoint((libsize.x - tsize.x) / 2 + FromDIP(2), (libsize.y - tsize.y) / 2 - FromDIP(5));
dc.DrawText(L("?"), pot); dc.DrawText("?", pot);
} }
else { else {
auto tsize = dc.GetMultiLineTextExtent(m_info.material_name); auto tsize = dc.GetMultiLineTextExtent(m_info.material_name);
@ -830,9 +830,9 @@ void AMSLib::render_extra_text(wxDC& dc)
} }
if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY) { if (m_info.material_state == AMSCanType::AMS_CAN_TYPE_EMPTY) {
auto tsize = dc.GetMultiLineTextExtent(_L("/")); auto tsize = dc.GetMultiLineTextExtent("/");
auto pot = wxPoint((libsize.x - tsize.x) / 2 + FromDIP(2), (libsize.y - tsize.y) / 2 + FromDIP(3)); auto pot = wxPoint((libsize.x - tsize.x) / 2 + FromDIP(2), (libsize.y - tsize.y) / 2 + FromDIP(3));
dc.DrawText(_L("/"), pot); dc.DrawText("/", pot);
} }
} }
@ -885,7 +885,7 @@ void AMSLib::render_generic_text(wxDC &dc)
else { else {
pot = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 + FromDIP(3)); pot = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 + FromDIP(3));
} }
dc.DrawText(L("?"), pot); dc.DrawText("?", pot);
} }
else { else {