mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 02:16:01 +08:00
Removed some hardcoded UI values
This commit is contained in:
parent
af0615f985
commit
8913a64fdc
@ -155,7 +155,7 @@ Rectangle
|
|||||||
|
|
||||||
Image
|
Image
|
||||||
{
|
{
|
||||||
width: 40 * screenScaleFactor
|
width: parent.width
|
||||||
height: width
|
height: width
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: parent.rightMargin
|
anchors.rightMargin: parent.rightMargin
|
||||||
@ -171,19 +171,19 @@ Rectangle
|
|||||||
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
|
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
|
|
||||||
spacing: 10 * screenScaleFactor
|
spacing: UM.Theme.getSize("default_margin").width
|
||||||
|
|
||||||
PrintCoreConfiguration
|
PrintCoreConfiguration
|
||||||
{
|
{
|
||||||
id: leftExtruderInfo
|
id: leftExtruderInfo
|
||||||
width: (parent.width-1) / 2
|
width: (parent.width - extruderSeperator.width) / 2
|
||||||
printCoreConfiguration: printer.configuration[0]
|
printCoreConfiguration: printer.configuration[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle
|
Rectangle
|
||||||
{
|
{
|
||||||
id: extruderSeperator
|
id: extruderSeperator
|
||||||
width: 1 * screenScaleFactor
|
width: UM.Theme.getSize("default_lining").width
|
||||||
height: parent.height
|
height: parent.height
|
||||||
color: lineColor
|
color: lineColor
|
||||||
}
|
}
|
||||||
@ -191,7 +191,7 @@ Rectangle
|
|||||||
PrintCoreConfiguration
|
PrintCoreConfiguration
|
||||||
{
|
{
|
||||||
id: rightExtruderInfo
|
id: rightExtruderInfo
|
||||||
width: (parent.width-1) / 2
|
width: (parent.width - extruderSeperator.width) / 2
|
||||||
printCoreConfiguration: printer.configuration[1]
|
printCoreConfiguration: printer.configuration[1]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -395,7 +395,8 @@ Rectangle
|
|||||||
Label // Status 2nd row
|
Label // Status 2nd row
|
||||||
{
|
{
|
||||||
text: {
|
text: {
|
||||||
if(printJob != null) {
|
if(printJob != null)
|
||||||
|
{
|
||||||
if(printJob.status == "printing" || printJob.status == "post_print")
|
if(printJob.status == "printing" || printJob.status == "post_print")
|
||||||
{
|
{
|
||||||
return OutputDevice.getDateCompleted(printJob.time_total - printJob.time_elapsed)
|
return OutputDevice.getDateCompleted(printJob.time_total - printJob.time_elapsed)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user