git.iko.soy/unity8
on xenial help sign in
/s/titleHorizontalAlignment/titleAlignment
a5364c4Michał Karnicki
qml/Dash/Card.qml+1−1
compare with xenial
unifiedsplit
@@ -23,7 +23,7 @@ AbstractButton {
23 property var components
23 property var components
24 property var cardData
24 property var cardData
25
25
26− property alias titleHorizontalAlignment: header.titleHorizontalAlignment
26+ property alias titleAlignment: header.titleAlignment
27
27
28 implicitWidth: childrenRect.width
28 implicitWidth: childrenRect.width
29 implicitHeight: childrenRect.height
29 implicitHeight: childrenRect.height
qml/Dash/CardFilterGrid.qml+1−1
@@ -45,7 +45,7 @@ DashFilterGrid {
45 template: genericFilterGrid.template
45 template: genericFilterGrid.template
46 components: genericFilterGrid.components
46 components: genericFilterGrid.components
47
47
48− titleHorizontalAlignment: cardTool.titleHorizontalAlignment
48+ titleAlignment: cardTool.titleAlignment
49
49
50 onClicked: genericFilterGrid.clicked(index, card.y)
50 onClicked: genericFilterGrid.clicked(index, card.y)
51 onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
51 onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
qml/Dash/CardHeader.qml+1−2
@@ -26,7 +26,7 @@ Item {
26 property alias oldPrice: oldPriceLabel.text
26 property alias oldPrice: oldPriceLabel.text
27 property alias altPrice: altPriceLabel.text
27 property alias altPrice: altPriceLabel.text
28
28
29− property alias titleHorizontalAlignment: titleLabel.horizontalAlignment
29+ property alias titleAlignment: titleLabel.horizontalAlignment
30
30
31 visible: mascotImage.status === Image.Ready || title || price
31 visible: mascotImage.status === Image.Ready || title || price
32 height: row.height > 0 ? row.height + row.margins * 2 : 0
32 height: row.height > 0 ? row.height + row.margins * 2 : 0
@@ -73,7 +73,6 @@ Item {
73 wrapMode: Text.Wrap
73 wrapMode: Text.Wrap
74 maximumLineCount: 2
74 maximumLineCount: 2
75 fontSize: "small"
75 fontSize: "small"
76− verticalAlignment: Text.AlignVCenter
77 }
76 }
78
77
79 Label {
78 Label {
qml/Dash/CardTool.qml+2−2
@@ -102,7 +102,7 @@ Item {
102
102
103 property QtObject priv: card
103 property QtObject priv: card
104
104
105− property var titleHorizontalAlignment: card.titleHorizontalAlignment
105+ property var titleAlignment: card.titleAlignment
106
106
107 Card {
107 Card {
108 id: card
108 id: card
@@ -112,7 +112,7 @@ Item {
112 width: cardTool.cardWidth || implicitWidth
112 width: cardTool.cardWidth || implicitWidth
113 height: cardTool.cardHeight || implicitHeight
113 height: cardTool.cardHeight || implicitHeight
114
114
115− property var titleHorizontalAlignment: {
115+ property var titleAlignment: {
116 var subtitle = components["subtitle"];
116 var subtitle = components["subtitle"];
117 var price = components["price"];
117 var price = components["price"];
118
118