From 89004b8df5dcf7da7250e4af29a938d9cae417c8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 19 Dec 2017 17:19:04 +0100 Subject: [PATCH] Fixed some QML warnings CL-541 --- resources/qml/PrinterOutput/HeatedBedBox.qml | 15 ++++++++++++++- .../qml/PrinterOutput/OutputDeviceHeader.qml | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/qml/PrinterOutput/HeatedBedBox.qml b/resources/qml/PrinterOutput/HeatedBedBox.qml index 65c2a161bd..bc89da2251 100644 --- a/resources/qml/PrinterOutput/HeatedBedBox.qml +++ b/resources/qml/PrinterOutput/HeatedBedBox.qml @@ -302,7 +302,20 @@ Item } } 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") + } + } } } } diff --git a/resources/qml/PrinterOutput/OutputDeviceHeader.qml b/resources/qml/PrinterOutput/OutputDeviceHeader.qml index 6553655da0..ca64c79f2b 100644 --- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml +++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml @@ -48,7 +48,6 @@ Item anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width - anchors.top: outputDevice.bottom } } } \ No newline at end of file