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

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-07-07 13:44:19 +02:00
commit b072b7935f
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/CuraContainerRegistry.py
View file

@ -53,7 +53,7 @@ class CuraContainerRegistry(ContainerRegistry):
def _containerExists(self, container_type, container_name): def _containerExists(self, container_type, container_name):
container_class = ContainerStack if container_type == "machine" else InstanceContainer container_class = ContainerStack if container_type == "machine" else InstanceContainer
return self.findContainers(container_class, id = container_name, type = container_type) or \ return self.findContainers(container_class, id = container_name, type = container_type, ignore_case = True) or \
self.findContainers(container_class, name = container_name, type = container_type) self.findContainers(container_class, name = container_name, type = container_type)
## Exports an profile to a file ## Exports an profile to a file

14
plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml
View file

@ -156,6 +156,7 @@ Cura.MachineAction
{ {
id: nozzleTempLabel id: nozzleTempLabel
width: checkupMachineAction.leftRow width: checkupMachineAction.leftRow
height: nozzleTempButton.height
anchors.left: parent.left anchors.left: parent.left
anchors.top: endstopZLabel.bottom anchors.top: endstopZLabel.bottom
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
@ -174,15 +175,12 @@ Cura.MachineAction
{ {
id: nozzleTempButton id: nozzleTempButton
width: checkupMachineAction.rightRow * 0.3 width: checkupMachineAction.rightRow * 0.3
height: nozzleTemp.height height: childrenRect.height
anchors.top: nozzleTempLabel.top anchors.top: nozzleTempLabel.top
anchors.left: bedTempStatus.right anchors.left: bedTempStatus.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width/2 anchors.leftMargin: UM.Theme.getSize("default_margin").width/2
Button Button
{ {
height: nozzleTemp.height - 2
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@action:button","Start Heating") text: catalog.i18nc("@action:button","Start Heating")
onClicked: onClicked:
{ {
@ -206,10 +204,11 @@ Cura.MachineAction
{ {
id: bedTempLabel id: bedTempLabel
width: checkupMachineAction.leftRow width: checkupMachineAction.leftRow
height: bedTempButton.height
anchors.left: parent.left anchors.left: parent.left
anchors.top: nozzleTempLabel.bottom anchors.top: nozzleTempLabel.bottom
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label","bed temperature check:") text: catalog.i18nc("@label","Bed temperature check:")
} }
Label Label
@ -225,15 +224,12 @@ Cura.MachineAction
{ {
id: bedTempButton id: bedTempButton
width: checkupMachineAction.rightRow * 0.3 width: checkupMachineAction.rightRow * 0.3
height: bedTemp.height height: childrenRect.height
anchors.top: bedTempLabel.top anchors.top: bedTempLabel.top
anchors.left: bedTempStatus.right anchors.left: bedTempStatus.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width/2 anchors.leftMargin: UM.Theme.getSize("default_margin").width/2
Button Button
{ {
height: bedTemp.height - 2
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@action:button","Start Heating") text: catalog.i18nc("@action:button","Start Heating")
onClicked: onClicked:
{ {