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

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

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-22 14:58:42 +02:00
commit 07610ea6bb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/Sidebar.qml
View File

@ -16,6 +16,7 @@ Rectangle
property int currentModeIndex; property int currentModeIndex;
property bool hideSettings: PrintInformation.preSliced property bool hideSettings: PrintInformation.preSliced
property bool hideView: Cura.MachineManager.activeMachineName == ""
// 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
@ -123,7 +124,7 @@ Rectangle
width: parent.width * 0.45 width: parent.width * 0.45
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
visible: !monitoringPrint visible: !monitoringPrint && !hideView
} }
Rectangle { Rectangle {
@ -145,7 +146,7 @@ Rectangle
} }
} }
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
visible: !monitoringPrint && !hideSettings visible: !monitoringPrint && !hideSettings && !hideView
Component{ Component{
id: wizardDelegate id: wizardDelegate
Button { Button {

1
resources/qml/SidebarSimple.qml
View File

@ -27,6 +27,7 @@ Item
ScrollView ScrollView
{ {
visible: Cura.MachineManager.activeMachineName != "" // If no printers added then the view is invisible
anchors.fill: parent anchors.fill: parent
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
flickableItem.flickableDirection: Flickable.VerticalFlick flickableItem.flickableDirection: Flickable.VerticalFlick