3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 05:11:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""

Browse source 
This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
This commit is contained in:
Ghostkeeper 2017-10-05 10:58:49 +02:00
parent ff41b043b1
commit d458fcde5c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
12 changed files with 75 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/definitions/fdmprinter.def.json
View file

@ -1405,6 +1405,28 @@
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"infill_offset_x":
{
"label": "Infill X Offset",
"description": "The infill pattern is offset this distance along the X axis.",
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"infill_offset_y":
{
"label": "Infill Y Offset",
"description": "The infill pattern is offset this distance along the Y axis.",
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"sub_div_rad_add":
{
"label": "Cubic Subdivision Shell",
@ -3986,7 +4008,7 @@
"skirt_gap":
{
"label": "Skirt Distance",
"description": "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance, multiple skirt lines will extend outwards from this distance.",
"description": "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance.",
"unit": "mm",
"type": "float",
"default_value": 3,

6
resources/qml/Sidebar.qml
View file

@ -324,7 +324,7 @@ Rectangle
anchors.bottom: timeSpecDescription.top
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text_subtext")
text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label Hours and minutes", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
MouseArea
{
@ -407,12 +407,12 @@ Rectangle
}
if(someCostsKnown)
{
return catalog.i18nc("@label", "%1m / ~ %2g / ~ %4 %3").arg(lengths.join(" + "))
return catalog.i18nc("@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost", "%1m / ~ %2g / ~ %4 %3").arg(lengths.join(" + "))
.arg(weights.join(" + ")).arg(costs.join(" + ")).arg(UM.Preferences.getValue("cura/currency"));
}
else
{
return catalog.i18nc("@label", "%1m / ~ %2g").arg(lengths.join(" + ")).arg(weights.join(" + "));
return catalog.i18nc("@label Print estimates: m for meters, g for grams", "%1m / ~ %2g").arg(lengths.join(" + ")).arg(weights.join(" + "));
}
}
}