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

Fixed alignment of printCoreConfiguration

Browse Source 
CL-896
This commit is contained in:
Jaime van Kessel 2018-08-30 10:32:37 +02:00
parent 14f253017b
commit fd1b0a80e7
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml
View File

@ -18,6 +18,8 @@ Item
id: extruderCircle
width: 30
height: 30
anchors.verticalCenter: printAndMaterialLabel.verticalCenter
opacity:
{
if(printCoreConfiguration == undefined || printCoreConfiguration.activeMaterial == undefined || printCoreConfiguration.hotendID == undefined)
@ -31,7 +33,7 @@ Item
{
anchors.fill: parent
radius: Math.round(width / 2)
border.width: 1
border.width: 2
border.color: "black"
}
@ -43,52 +45,48 @@ Item
}
}
Label
Item
{
id: materialLabel
text:
{
if(printCoreConfiguration != undefined && printCoreConfiguration.activeMaterial != undefined)
{
return printCoreConfiguration.activeMaterial.name
}
return ""
}
font: UM.Theme.getFont("default_bold")
elide: Text.ElideRight
id: printAndMaterialLabel
anchors
{
right: parent.right
left: extruderCircle.right
margins: UM.Theme.getSize("default_margin").width
}
}
height: childrenRect.height
Label
{
id: printCoreLabel
text:
Label
{
if(printCoreConfiguration != undefined && printCoreConfiguration.hotendID != undefined)
id: materialLabel
text:
{
return printCoreConfiguration.hotendID
if(printCoreConfiguration != undefined && printCoreConfiguration.activeMaterial != undefined)
{
return printCoreConfiguration.activeMaterial.name
}
return ""
}
return ""
font: UM.Theme.getFont("default_bold")
elide: Text.ElideRight
}
anchors.top: materialLabel.bottom
elide: Text.ElideRight
opacity: 0.6
font: UM.Theme.getFont("default")
anchors
Label
{
top: materialLabel.bottom
right: parent.right
left: extruderCircle.right
leftMargin: UM.Theme.getSize("default_margin").width
rightMargin: UM.Theme.getSize("default_margin").width
id: printCoreLabel
text:
{
if(printCoreConfiguration != undefined && printCoreConfiguration.hotendID != undefined)
{
return printCoreConfiguration.hotendID
}
return ""
}
anchors.top: materialLabel.bottom
elide: Text.ElideRight
opacity: 0.6
font: UM.Theme.getFont("default")
}
}
}