Browse Source

Fixed some QML warnings

CL-541
Jaime van Kessel 7 years ago
parent
commit
89004b8df5

+ 14 - 1
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")
+                            }
+                        }
                     }
                 }
             }

+ 0 - 1
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
         }
     }
 }