Sidebar and main view via loader

This commit is contained in:
ChrisTerBeke 2017-12-06 13:33:05 +01:00
parent a57a5aab6b
commit 2d044a37ae
6 changed files with 50 additions and 59 deletions

View file

@ -40,7 +40,7 @@ Column
id: extruderSelectionRow
width: parent.width
height: Math.floor(UM.Theme.getSize("sidebar_tabs").height * 2 / 3)
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
visible: machineExtruderCount.properties.value > 1
anchors
{
@ -229,7 +229,7 @@ Column
{
id: materialRow
height: UM.Theme.getSize("sidebar_setup").height
visible: Cura.MachineManager.hasMaterials && !sidebar.monitoringPrint && !sidebar.hideSettings
visible: Cura.MachineManager.hasMaterials
anchors
{
@ -279,7 +279,7 @@ Column
{
id: variantRow
height: UM.Theme.getSize("sidebar_setup").height
visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings
visible: Cura.MachineManager.hasVariants
anchors
{
@ -319,7 +319,7 @@ Column
{
id: materialInfoRow
height: Math.floor(UM.Theme.getSize("sidebar_setup").height / 2)
visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings
visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials
anchors
{