3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-01 06:41:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura into feature_top_navigation_bar

Browse source
This commit is contained in:
Jaime van Kessel 2017-07-03 16:40:47 +02:00
commit edeb2fa787
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/PluginBrowser/PluginBrowser.qml
View file

@ -33,7 +33,6 @@ UM.Dialog
text: catalog.i18nc("@action:button", "Refresh") text: catalog.i18nc("@action:button", "Refresh")
onClicked: manager.requestPluginList() onClicked: manager.requestPluginList()
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: -3
} }
} }
ScrollView ScrollView
@ -69,8 +68,7 @@ UM.Dialog
anchors.left:parent.left anchors.left:parent.left
anchors.right: closeButton.left anchors.right: closeButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottomMargin: 4 height: 10
height: UM.Theme.getSize("default_margin").height
value: manager.downloadProgress value: manager.downloadProgress
} }
@ -82,7 +80,6 @@ UM.Dialog
onClicked: base.close() onClicked: base.close()
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: -3
} }
} }

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

@ -677,7 +677,7 @@
"minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size", "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4, "default_value": 0.4,
"value": "wall_line_width", "value": "extruderValue(wall_0_extruder_nr, 'wall_line_width')",
"type": "float", "type": "float",
"limit_to_extruder": "wall_0_extruder_nr", "limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true