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

Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
Jaime van Kessel 2019-02-05 13:38:44 +01:00
commit f2fbb4e989
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/qml/ActionPanel/PrintJobInformation.qml
View File

@ -39,8 +39,8 @@ Column
id: byLineType
property var printDuration: PrintInformation.currentPrintTime
property var columnWidthMultipliers: [ 0.4, 0.3, 0.3 ]
property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter ]
property var columnWidthMultipliers: [ 0.45, 0.3, 0.25 ]
property var columnHorizontalAligns: [ Text.AlignLeft, Text.AlignHCenter, Text.AlignRight ]
function getMaterialTable()
{
@ -81,6 +81,7 @@ Column
width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index])
height: contentHeight
horizontalAlignment: byLineType.columnHorizontalAligns[index]
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere
text: modelData
@ -124,8 +125,8 @@ Column
property var printMaterialWeights: PrintInformation.materialWeights
property var printMaterialCosts: PrintInformation.materialCosts
property var printMaterialNames: PrintInformation.materialNames
property var columnWidthMultipliers: [ 0.4, 0.2, 0.2, 0.2 ]
property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter, TextInput.AlignHCenter ]
property var columnWidthMultipliers: [ 0.46, 0.18, 0.18, 0.18 ]
property var columnHorizontalAligns: [ Text.AlignLeft, Text.AlignHCenter, Text.AlignHCenter, Text.AlignRight ]
function getMaterialTable()
{
@ -183,7 +184,8 @@ Column
{
width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
height: contentHeight
horizontalAlignment: byLineType.columnHorizontalAligns[index]
horizontalAlignment: byMaterialType.columnHorizontalAligns[index]
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere
text: modelData