GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 02:19:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup monitoringPrint stuff by properly passing things as properties

Browse Source 
Instead of relying on the property magically being propagated from the
root object, which causes crashes.

Contributes to CURA-3964
This commit is contained in:
Arjen Hiemstra 2017-07-04 11:37:04 +02:00
parent edeb2fa787
commit ec25164731
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/Cura.qml
View File

@ -18,14 +18,14 @@ UM.MainWindow
//: Cura application window title //: Cura application window title
title: catalog.i18nc("@title:window","Cura"); title: catalog.i18nc("@title:window","Cura");
viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0) viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
property bool monitoringPrint: false property bool showPrintMonitor: false
Connections Connections
{ {
target: Printer target: Printer
onShowPrintMonitor: onShowPrintMonitor:
{ {
monitoringPrint = show; base.showPrintMonitor = show;
} }
} }
@ -388,6 +388,9 @@ UM.MainWindow
anchors.left:parent.left anchors.left:parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
monitoringPrint: base.showPrintMonitor
onStartMonitoringPrint: base.showPrintMonitor = true
onStopMonitoringPrint: base.showPrintMonitor = false
} }
Sidebar Sidebar
@ -402,6 +405,7 @@ UM.MainWindow
} }
z: 1 z: 1
width: UM.Theme.getSize("sidebar").width; width: UM.Theme.getSize("sidebar").width;
monitoringPrint: base.showPrintMonitor
} }
Button Button
@ -451,7 +455,7 @@ UM.MainWindow
Loader Loader
{ {
sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null
visible: base.monitoringPrint visible: base.showPrintMonitor
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2 anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2

2
resources/qml/Sidebar.qml
View File

@ -22,6 +22,8 @@ Rectangle
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property int backendState: UM.Backend.state; property int backendState: UM.Backend.state;
property bool monitoringPrint: false
color: UM.Theme.getColor("sidebar") color: UM.Theme.getColor("sidebar")
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}

13
resources/qml/Topbar.qml
View File

@ -20,6 +20,9 @@ Rectangle
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property bool monitoringPrint: false
signal startMonitoringPrint()
signal stopMonitoringPrint()
Row Row
{ {
@ -32,13 +35,13 @@ Rectangle
{ {
id: showSettings id: showSettings
height: UM.Theme.getSize("sidebar_header").height height: UM.Theme.getSize("sidebar_header").height
onClicked: monitoringPrint = false onClicked: base.stopMonitoringPrint()
iconSource: UM.Theme.getIcon("tab_settings"); iconSource: UM.Theme.getIcon("tab_settings");
property color overlayColor: "transparent" property color overlayColor: "transparent"
property string overlayIconSource: "" property string overlayIconSource: ""
text: "Prepare" text: "Prepare"
checkable: true checkable: true
checked: !monitoringPrint checked: !base.monitoringPrint
exclusiveGroup: sidebarHeaderBarGroup exclusiveGroup: sidebarHeaderBarGroup
style: UM.Theme.styles.topbar_header_tab style: UM.Theme.styles.topbar_header_tab
@ -48,7 +51,7 @@ Rectangle
{ {
id: showMonitor id: showMonitor
height: UM.Theme.getSize("sidebar_header").height height: UM.Theme.getSize("sidebar_header").height
onClicked: monitoringPrint = true onClicked: base.startMonitoringPrint()
text: "Print" text: "Print"
iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor") iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor")
property color overlayColor: property color overlayColor:
@ -122,7 +125,7 @@ Rectangle
} }
checkable: true checkable: true
checked: monitoringPrint checked: base.monitoringPrint
exclusiveGroup: sidebarHeaderBarGroup exclusiveGroup: sidebarHeaderBarGroup
style: UM.Theme.styles.topbar_header_tab style: UM.Theme.styles.topbar_header_tab
@ -205,4 +208,4 @@ Rectangle
menu: PrinterMenu { } menu: PrinterMenu { }
} }
} }