diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml index 7b956a2101..da4499adf6 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml @@ -39,8 +39,8 @@ Item { Popup { id: popup; background: Item { - height: popup.height; - width: popup.width; + height: childrenRect.height; + width: childrenRect.width; DropShadow { anchors.fill: pointedRectangle; diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml index 1dcf5fd3ad..61009a0ec3 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml @@ -77,6 +77,9 @@ Item { UM.RecolorImage { anchors.centerIn: parent; color: { + if (!printer) { + return "black"; + } if (printer.state == "disabled") { return UM.Theme.getColor("monitor_tab_text_inactive"); } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml index 35a9372713..d0aa4bf80a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml @@ -35,7 +35,7 @@ Item { PrinterInfoBlock { printer: root.printer; - printJob: root.printer.activePrintJob; + printJob: root.printer ? root.printer.activePrintJob : null; } HorizontalLine {} @@ -45,7 +45,7 @@ Item { width: parent.width; PrintJobTitle { - job: root.printer.activePrintJob; + job: root.printer ? root.printer.activePrintJob : null; } PrintJobContextMenu { id: contextButton; diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml index 81ad95bea9..d31dd09af3 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml @@ -19,7 +19,7 @@ ProgressBar { } style: ProgressBarStyle { property var remainingTime: { - if (printer.activePrintJob == null) { + if (!printer || printer.activePrintJob == null) { return 0; } /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining @@ -28,7 +28,7 @@ ProgressBar { return Math.max(printer.activePrintJob.timeTotal - printer.activePrintJob.timeElapsed, 0); } property var progressText: { - if (!printer.activePrintJob || !printer.activePrintJob.state ) { + if (printer === null ) { return ""; } switch (printer.activePrintJob.state) { @@ -64,7 +64,7 @@ ProgressBar { progress: Rectangle { id: progressItem; color: { - if (!printer.activePrintJob) { + if (! printer || !printer.activePrintJob) { return "black"; } var state = printer.activePrintJob.state diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml index 1b20593f9a..92a8f1dcb3 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml @@ -24,7 +24,6 @@ Item { anchors { left: parent.left; right: parent.right; - } height: childrenRect.height; spacing: Math.round(0.5 * UM.Theme.getSize("default_margin").width);