From 942d20a8d888c22bb91168416b21034bac40328b Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 13 Sep 2018 16:31:07 +0200 Subject: [PATCH] Monitor Tab - Fix pause button Contributes to CL-1050 --- .../resources/qml/ClusterControlItem.qml | 2 +- .../resources/qml/PrinterVideoStream.qml | 30 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml index 76aff7103a..3362c70bc5 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml @@ -485,7 +485,7 @@ Component } contentItem: Label { - text: sendToTopButton.text + text: pauseButton.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index c193d0ed71..d0213a4571 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml @@ -37,36 +37,6 @@ Item z: 999 } - // Button - // { - // id: backButton - - - // // TODO: Hardcoded sizes - // width: 20 * screenScaleFactor - // height: 20 * screenScaleFactor - - // onClicked: OutputDevice.setActiveCamera(null) - - // style: ButtonStyle - // { - // label: Item - // { - // UM.RecolorImage - // { - // anchors.verticalCenter: parent.verticalCenter - // anchors.horizontalCenter: parent.horizontalCenter - // width: control.width - // height: control.height - // sourceSize.width: width - // sourceSize.height: width - // source: UM.Theme.getIcon("cross1") - // } - // } - // background: Item {} - // } - // } - Image { id: cameraImage