Browse Source

Merge branch 'CURA-8436_Inform_user_that_the_webcam_is_disabled_for_cloud_printers' of github.com:Ultimaker/Cura

Jaime van Kessel 3 years ago
parent
commit
176077c910

+ 1 - 1
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)

+ 0 - 1
plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml

@@ -40,7 +40,6 @@ Item
                 width: 240 * screenScaleFactor // TODO: Theme!
                 color: UM.Theme.getColor("monitor_tooltip_text")
                 font: UM.Theme.getFont("default")
-                renderType: Text.NativeRendering
             }
         }
     }

+ 5 - 5
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
@@ -282,13 +282,13 @@ Item
             enabled: !cameraButton.enabled
         }
 
-
         MonitorInfoBlurb
         {
             id: cameraDisabledInfo
-            text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.")
+            text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." +
+                " Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam.")
             target: cameraButton
-        }*/
+        }
     }
 
     // Divider