Commit 0a6a3ce9 authored by Volker Krause's avatar Volker Krause
Browse files

Use format display string for pkpass field values, not the raw variant

This matters now that KPkPass implements date/time detection and
formatting.
parent 7c751b46
......@@ -61,7 +61,7 @@ Item {
Repeater {
model: pass.headerFields
delegate: QQC2.Label {
text: modelData.value
text: modelData.valueDisplayString
color: pass.foregroundColor
}
}
......@@ -89,7 +89,7 @@ Item {
}
QQC2.Label {
id: primaryValue
text: pass.primaryFields[0].value
text: pass.primaryFields[0].valueDisplayString
color: pass.foregroundColor
font.pointSize: 1.5 * primaryLabel.font.pointSize
}
......@@ -119,7 +119,7 @@ Item {
}
QQC2.Label {
Layout.alignment: Qt.AlignRight
text: pass.primaryFields[1].value
text: pass.primaryFields[1].valueDisplayString
color: pass.foregroundColor
font.pointSize: primaryValue.font.pointSize
}
......@@ -146,7 +146,7 @@ Item {
delegate: QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: modelData.value
text: modelData.valueDisplayString
horizontalAlignment: modelData.textAlignment
}
}
......@@ -173,7 +173,7 @@ Item {
delegate: QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: modelData.value
text: modelData.valueDisplayString
horizontalAlignment: modelData.textAlignment
}
}
......@@ -210,7 +210,7 @@ Item {
QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: Util.textToHtml(modelData.value)
text: Util.textToHtml(modelData.valueDisplayString)
wrapMode: Text.WordWrap
onLinkActivated: Qt.openUrlExternally(link)
}
......
......@@ -87,7 +87,7 @@ Item {
Repeater {
model: pass.headerFields
delegate: QQC2.Label {
text: modelData.value
text: modelData.valueDisplayString
color: pass.foregroundColor
}
}
......@@ -123,7 +123,7 @@ Item {
delegate: QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: modelData.value
text: modelData.valueDisplayString
horizontalAlignment: modelData.textAlignment
}
}
......@@ -150,7 +150,7 @@ Item {
delegate: QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: modelData.value
text: modelData.valueDisplayString
horizontalAlignment: modelData.textAlignment
}
}
......@@ -177,7 +177,7 @@ Item {
delegate: QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: modelData.value
text: modelData.valueDisplayString
horizontalAlignment: modelData.textAlignment
}
}
......@@ -210,7 +210,7 @@ Item {
QQC2.Label {
Layout.fillWidth: true
color: pass.foregroundColor
text: Util.textToHtml(modelData.value)
text: Util.textToHtml(modelData.valueDisplayString)
wrapMode: Text.WordWrap
onLinkActivated: Qt.openUrlExternally(link)
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment