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

Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-12-17 10:43:53 +01:00
commit ddf3c13b2a
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/MonitorStage/MonitorMain.qml
View File

@ -35,6 +35,6 @@ Item
property real maximumWidth: parent.width property real maximumWidth: parent.width
property real maximumHeight: parent.height property real maximumHeight: parent.height
sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem : null
} }
} }

25
plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
View File

@ -34,16 +34,20 @@ Component
name: "cura" name: "cura"
} }
LinearGradient { LinearGradient
{
anchors.fill: parent anchors.fill: parent
gradient: Gradient { gradient: Gradient
GradientStop { {
GradientStop
{
position: 0.0 position: 0.0
color: "#f6f6f6" color: "#f6f6f6" // TODO: Theme!
} }
GradientStop { GradientStop
{
position: 1.0 position: 1.0
color: "#ffffff" color: "#ffffff" // TODO: Theme!
} }
} }
} }
@ -81,7 +85,8 @@ Component
id: queue id: queue
width: Math.min(834 * screenScaleFactor, maximumWidth) width: Math.min(834 * screenScaleFactor, maximumWidth)
anchors { anchors
{
bottom: parent.bottom bottom: parent.bottom
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
top: printers.bottom top: printers.bottom
@ -210,7 +215,8 @@ Component
ScrollView ScrollView
{ {
id: queuedPrintJobs id: queuedPrintJobs
anchors { anchors
{
bottom: parent.bottom bottom: parent.bottom
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
top: printJobQueueHeadings.bottom top: printJobQueueHeadings.bottom
@ -239,7 +245,8 @@ Component
} }
} }
PrinterVideoStream { PrinterVideoStream
{
anchors.fill: parent anchors.fill: parent
cameraUrl: OutputDevice.activeCameraUrl cameraUrl: OutputDevice.activeCameraUrl
visible: OutputDevice.activeCameraUrl != "" visible: OutputDevice.activeCameraUrl != ""