3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 15:21:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'master' into CURA--6683_icons_per_object_settings

Browse source
This commit is contained in:
Diego Prado Gesto 2019-09-17 14:16:51 +02:00
commit 4dd6c5b03a
32 changed files with 273 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/bundled_packages/cura.json
View file

@ -475,6 +475,23 @@
}
}
},
"TrimeshReader": {
"package_info": {
"package_id": "TrimeshReader",
"package_type": "plugin",
"display_name": "Trimesh Reader",
"description": "Provides support for reading model files.",
"package_version": "1.0.0",
"sdk_version": "6.0.0",
"website": "https://ultimaker.com",
"author": {
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
}
}
},
"Toolbox": {
"package_info": {
"package_id": "Toolbox",

1
resources/definitions/Mark2_for_Ultimaker2.def.json
View file

@ -1,5 +1,4 @@
{
"id": "Mark2_for_Ultimaker2",
"version": 2,
"name": "Mark2 for Ultimaker2",
"inherits": "ultimaker2_plus",

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

@ -7563,7 +7563,7 @@
"small_feature_speed_factor":
{
"label": "Small Feature Speed",
"description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.",
"description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.",
"unit": "%",
"type": "float",
"default_value": 50,
@ -7575,7 +7575,7 @@
"small_feature_speed_factor_0":
{
"label": "First Layer Speed",
"description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.",
"description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.",
"unit": "%",
"type": "float",
"default_value": 50,

4
resources/definitions/flsun_qq.def.json
View file

@ -19,13 +19,13 @@
"default_value": true
},
"machine_width": {
"default_value": 240
"default_value": 260
},
"machine_height": {
"default_value": 285
},
"machine_depth": {
"default_value": 240
"default_value": 260
},
"machine_center_is_zero": {
"default_value": true

3
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -107,8 +107,9 @@ Item
Cura.PrinterTypeLabel
{
id: printerTypeLabel
text: Cura.MachineManager.getAbbreviatedMachineName(section)
text: section
anchors.verticalCenter: parent.verticalCenter //One default margin above and one below.
autoFit: true
}
}

16
resources/qml/ObjectItemButton.qml
View file

@ -51,5 +51,21 @@ Button
border.color: objectItemButton.checked ? UM.Theme.getColor("primary") : "transparent"
}
TextMetrics
{
id: buttonTextMetrics
text: buttonText.text
font: buttonText.font
elide: buttonText.elide
elideWidth: buttonText.width
}
Cura.ToolTip
{
id: tooltip
tooltipText: objectItemButton.text
visible: objectItemButton.hovered && buttonTextMetrics.elidedText != buttonText.text
}
onClicked: Cura.SceneController.changeSelection(index)
}

1
resources/qml/PrinterSelector/MachineSelectorButton.qml
View file

@ -72,6 +72,7 @@ Button
verticalCenter: parent.verticalCenter
}
spacing: UM.Theme.getSize("narrow_margin").width
visible: (updatePrinterTypesOnlyWhenChecked && machineSelectorButton.checked) || !updatePrinterTypesOnlyWhenChecked
Repeater
{