GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-04 16:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

MaterialInfo: Tweak text-alignment/layout. [CURA-6141]

Browse Source
This commit is contained in:
Remco Burema 2019-01-26 11:43:15 +01:00
parent e7ff70870f
commit 3d413ceb2c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ Column
property var printDuration: PrintInformation.currentPrintTime property var printDuration: PrintInformation.currentPrintTime
property var columnWidthMultipliers: [ 0.4, 0.3, 0.3 ] property var columnWidthMultipliers: [ 0.4, 0.3, 0.3 ]
property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter ]
function getMaterialTable() function getMaterialTable()
{ {
@ -55,7 +56,7 @@ Column
if(!printTime[feature].isTotalDurationZero) if(!printTime[feature].isTotalDurationZero)
{ {
var row = [] var row = []
row.push(feature + ":") row.push(feature + ": ")
row.push("%1".arg(printTime[feature].getDisplayString(UM.DurationFormat.ISO8601).slice(0,-3))) row.push("%1".arg(printTime[feature].getDisplayString(UM.DurationFormat.ISO8601).slice(0,-3)))
row.push("%1%".arg(Math.round(100 * parseInt(printTime[feature].getDisplayString(UM.DurationFormat.Seconds)) / totalSeconds))) row.push("%1%".arg(Math.round(100 * parseInt(printTime[feature].getDisplayString(UM.DurationFormat.Seconds)) / totalSeconds)))
result.push(row) result.push(row)
@ -79,6 +80,7 @@ Column
{ {
width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index]) width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index])
height: contentHeight height: contentHeight
horizontalAlignment: byLineType.columnHorizontalAligns[index]
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
text: modelData text: modelData
@ -122,6 +124,7 @@ Column
property var printMaterialCosts: PrintInformation.materialCosts property var printMaterialCosts: PrintInformation.materialCosts
property var printMaterialNames: PrintInformation.materialNames property var printMaterialNames: PrintInformation.materialNames
property var columnWidthMultipliers: [ 0.4, 0.2, 0.2, 0.2 ] property var columnWidthMultipliers: [ 0.4, 0.2, 0.2, 0.2 ]
property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter, TextInput.AlignHCenter ]
function getMaterialTable() function getMaterialTable()
{ {
@ -155,7 +158,7 @@ Column
for(var index = 0; index < lengths.length; index++) for(var index = 0; index < lengths.length; index++)
{ {
var row = [] var row = []
row.push("%1:".arg(names[index])) row.push("%1: ".arg(names[index]))
row.push(catalog.i18nc("@label m for meter", "%1m").arg(lengths[index])) row.push(catalog.i18nc("@label m for meter", "%1m").arg(lengths[index]))
row.push(catalog.i18nc("@label g for grams", "%1g").arg(weights[index])) row.push(catalog.i18nc("@label g for grams", "%1g").arg(weights[index]))
row.push("%1 %2".arg(UM.Preferences.getValue("cura/currency")).arg(costs[index])) row.push("%1 %2".arg(UM.Preferences.getValue("cura/currency")).arg(costs[index]))
@ -179,6 +182,7 @@ Column
{ {
width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index]) width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
height: contentHeight height: contentHeight
horizontalAlignment: byLineType.columnHorizontalAligns[index]
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
text: modelData text: modelData