GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 03:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2021-08-09 11:00:58 +02:00
commit 176077c910
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
View File

@ -30,7 +30,7 @@ Button
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
color: UM.Theme.getColor("primary") color: enabled ? UM.Theme.getColor("primary") : UM.Theme.getColor("main_background")
height: width height: width
source: iconSource source: iconSource
width: Math.round(parent.width / 2) width: Math.round(parent.width / 2)

1
plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml
View File

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

10
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View File

@ -271,8 +271,8 @@ Item
} }
// For cloud printing, add this mouse area over the disabled cameraButton to indicate that it's not available // 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. // Fix CURA-7637 to allow camera connections via cloud.
/* MouseArea MouseArea
{ {
id: cameraDisabledButtonArea id: cameraDisabledButtonArea
anchors.fill: cameraButton anchors.fill: cameraButton
@ -282,13 +282,13 @@ Item
enabled: !cameraButton.enabled enabled: !cameraButton.enabled
} }
MonitorInfoBlurb MonitorInfoBlurb
{ {
id: cameraDisabledInfo 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 target: cameraButton
}*/ }
} }
// Divider // Divider