GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-10 09:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some QML warnings

Browse Source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-12-19 17:19:04 +01:00
parent 79add4ffd8
commit 89004b8df5
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/qml/PrinterOutput/HeatedBedBox.qml
View File

@ -302,7 +302,20 @@ Item
} }
} }
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("action_button")
text: printerModel.isPreheating ? catalog.i18nc("@button Cancel pre-heating", "Cancel") : catalog.i18nc("@button", "Pre-heat") text:
{
if(printerModel == null)
{
return ""
}
if(printerModel.isPreheating )
{
return catalog.i18nc("@button Cancel pre-heating", "Cancel")
} else
{
return catalog.i18nc("@button", "Pre-heat")
}
}
} }
} }
} }

1
resources/qml/PrinterOutput/OutputDeviceHeader.qml
View File

@ -48,7 +48,6 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.top: outputDevice.bottom
} }
} }
} }