3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' into container_stack_improvements

Browse source
This commit is contained in:
ChrisTerBeke 2017-11-01 12:32:37 +01:00
commit 743285f426
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1385,7 +1385,7 @@
"default_value": 2,
"minimum_value": "0",
"minimum_value_warning": "infill_line_width",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
}
@ -1401,6 +1401,7 @@
"grid": "Grid",
"lines": "Lines",
"triangles": "Triangles",
"trihexagon": "Tri-Hexagon",
"cubic": "Cubic",
"cubicsubdiv": "Cubic Subdivision",
"tetrahedral": "Octet",

6
resources/qml/AskOpenAsProjectOrModelsDialog.qml
View file

@ -81,6 +81,12 @@ UM.Dialog
id: rememberChoiceCheckBox
text: catalog.i18nc("@text:window", "Remember my choice")
checked: UM.Preferences.getValue("cura/choice_on_open_project") != "always_ask"
style: CheckBoxStyle {
label: Label {
text: control.text
font: UM.Theme.getFont("default")
}
}
}
// Buttons