Added extruder icon

CL-894
This commit is contained in:
Jaime van Kessel 2018-08-16 16:24:14 +02:00
parent 5bee561c9c
commit 01b9ba03d4
3 changed files with 29 additions and 12 deletions

View file

@ -13,6 +13,27 @@ Item
width: Math.round(parent.width / 2) width: Math.round(parent.width / 2)
height: childrenRect.height height: childrenRect.height
Item
{
id: extruderCircle
width: 30
height: 30
Rectangle
{
anchors.fill: parent
radius: Math.round(width / 2)
border.width: 1
border.color: "black"
}
Label
{
anchors.centerIn: parent
font: UM.Theme.getFont("default_bold")
text: printCoreConfiguration.position + 1
}
}
Label Label
{ {
id: materialLabel id: materialLabel
@ -20,6 +41,8 @@ Item
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
anchors.left: extruderCircle.right
anchors.leftMargin: UM.Theme.getSize("default_margin").height
} }
Label Label
@ -29,5 +52,7 @@ Item
anchors.top: materialLabel.bottom anchors.top: materialLabel.bottom
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
anchors.left: extruderCircle.right
anchors.leftMargin: UM.Theme.getSize("default_margin").height
} }
} }

View file

@ -110,7 +110,7 @@ Item
{ {
popup.visible ? popup.close() : popup.open() popup.visible ? popup.close() : popup.open()
} }
Button Button
{ {
id: contextButton id: contextButton
@ -191,22 +191,14 @@ Item
PrintCoreConfiguration PrintCoreConfiguration
{ {
id: leftExtruderInfo id: leftExtruderInfo
width: Math.round((parent.width - extruderSeperator.width) / 2) width: Math.round(parent.width / 2)
printCoreConfiguration: printJob.configuration.extruderConfigurations[0] printCoreConfiguration: printJob.configuration.extruderConfigurations[0]
} }
Rectangle
{
id: extruderSeperator
width: UM.Theme.getSize("default_lining").width
height: parent.height
color: lineColor
}
PrintCoreConfiguration PrintCoreConfiguration
{ {
id: rightExtruderInfo id: rightExtruderInfo
width: Math.round((parent.width - extruderSeperator.width) / 2) width: Math.round(parent.width / 2)
printCoreConfiguration: printJob.configuration.extruderConfigurations[1] printCoreConfiguration: printJob.configuration.extruderConfigurations[1]
} }
} }

View file

@ -274,7 +274,7 @@ Column
elide: Text.ElideRight elide: Text.ElideRight
} }
// Everthing for the extruder icon // Everything for the extruder icon
Item Item
{ {
id: extruderIconItem id: extruderIconItem