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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Ghostkeeper 2017-05-31 15:22:19 +02:00
commit d3ebb95734
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
3 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraApplication.py
View file

@ -349,6 +349,8 @@ class CuraApplication(QtApplication):
self.globalContainerStackChanged.connect(self._onGlobalContainerChanged) self.globalContainerStackChanged.connect(self._onGlobalContainerChanged)
self._onGlobalContainerChanged() self._onGlobalContainerChanged()
self._plugin_registry.addSupportedPluginExtension("curaplugin", "Cura Plugin")
def _onEngineCreated(self): def _onEngineCreated(self):
self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider()) self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())

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

@ -838,6 +838,7 @@
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
"settable_globally": true, "settable_globally": true,
"enabled": "machine_extruder_count > 1",
"children": "children":
{ {
"wall_0_extruder_nr": "wall_0_extruder_nr":
@ -850,7 +851,8 @@
"settable_per_mesh": true, "settable_per_mesh": true,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
"settable_globally": true "settable_globally": true,
"enabled": "machine_extruder_count > 1"
}, },
"wall_x_extruder_nr": "wall_x_extruder_nr":
{ {
@ -862,7 +864,8 @@
"settable_per_mesh": true, "settable_per_mesh": true,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
"settable_globally": true "settable_globally": true,
"enabled": "machine_extruder_count > 1"
} }
} }
}, },
@ -918,7 +921,8 @@
"settable_per_mesh": true, "settable_per_mesh": true,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
"settable_globally": true "settable_globally": true,
"enabled": "machine_extruder_count > 1"
}, },
"top_bottom_thickness": "top_bottom_thickness":
{ {
@ -1191,7 +1195,8 @@
"settable_per_mesh": true, "settable_per_mesh": true,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": true, "settable_per_meshgroup": true,
"settable_globally": true "settable_globally": true,
"enabled": "machine_extruder_count > 1"
}, },
"infill_sparse_density": "infill_sparse_density":
{ {

20
resources/qml/SidebarHeader.qml
View file

@ -177,6 +177,14 @@ Column
Text Text
{ {
id: variantLabel id: variantLabel
width: parent.width * 0.30
anchors.verticalCenter: parent.verticalCenter
anchors.left: variantRow.left
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
text: text:
{ {
var label; var label;
@ -194,12 +202,6 @@ Column
} }
return "%1:".arg(label); return "%1:".arg(label);
} }
anchors.verticalCenter: parent.verticalCenter
anchors.left: variantRow.left
width: parent.width * 0.30
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
} }
Button Button
@ -208,8 +210,8 @@ Column
height: parent.height * 0.60 height: parent.height * 0.60
width: height width: height
anchors.left: variantLabel.right anchors.right: materialVariantContainer.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
visible: extrudersList.visible visible: extrudersList.visible
@ -245,6 +247,8 @@ Column
Item Item
{ {
id: materialVariantContainer
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right