From de9b1f82b956dc8f232cdf6340b38b93ad9add44 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Tue, 3 Aug 2021 16:55:11 +0200 Subject: [PATCH] Enable the tooltip when the camera button is disabled CURA-8436 --- plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml | 2 +- .../resources/qml/MonitorPrinterCard.qml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml index 8dca61ec38..fde4a5ea3d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml @@ -30,7 +30,7 @@ Button horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - color: UM.Theme.getColor("primary") + color: enabled ? UM.Theme.getColor("primary") : UM.Theme.getColor("main_background") height: width source: iconSource width: Math.round(parent.width / 2) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 7dbb78e8fb..fe86753d5d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -271,8 +271,8 @@ Item } // For cloud printing, add this mouse area over the disabled cameraButton to indicate that it's not available - //Warning message is commented out because it's factually incorrect. Fix CURA-7637 to allow camera connections via cloud. - /* MouseArea + // Fix CURA-7637 to allow camera connections via cloud. + MouseArea { id: cameraDisabledButtonArea anchors.fill: cameraButton @@ -286,9 +286,9 @@ Item MonitorInfoBlurb { id: cameraDisabledInfo - text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.") + text: catalog.i18nc("@info", "The webcam is not available for cloud printers. Please visit the printer page in the Ultimaker Digital Factory to see the webcam snapshots.") target: cameraButton - }*/ + } } // Divider