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

Switching to monitor tab now shows the correct sidebar again

Browse Source 
CURA-3964
This commit is contained in:
Jaime van Kessel 2017-07-03 16:12:19 +02:00
parent 7e07482dec
commit 680cceb6f5
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/qml/Cura.qml
View File

@ -19,6 +19,16 @@ UM.MainWindow
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 monitoringPrint: false
Connections
{
target: Printer
onShowPrintMonitor:
{
monitoringPrint = show;
}
}
Component.onCompleted: Component.onCompleted:
{ {
CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size")) CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
@ -391,7 +401,6 @@ UM.MainWindow
right: parent.right; right: parent.right;
} }
z: 1 z: 1
onMonitoringPrintChanged: base.monitoringPrint = monitoringPrint
width: UM.Theme.getSize("sidebar").width; width: UM.Theme.getSize("sidebar").width;
} }

11
resources/qml/Sidebar.qml
View File

@ -15,18 +15,7 @@ Rectangle
id: base; id: base;
property int currentModeIndex; property int currentModeIndex;
property bool monitoringPrint: false; // When adding more "tabs", one want to replace this bool with a ListModel
property bool hideSettings: PrintInformation.preSliced property bool hideSettings: PrintInformation.preSliced
Connections
{
target: Printer
onShowPrintMonitor:
{
base.monitoringPrint = show;
showSettings.checked = !show;
showMonitor.checked = show;
}
}
// Is there an output device for this printer? // Is there an output device for this printer?
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0