git.iko.soy/unity8
on xenial help sign in
Add test icons.
commitad20b1a0861078b0361644161829e4aaef785f0f authorYing-Chun Liu <paul.liu@canonical.com> dateTue 22 Jul 2014, 00:22 (12 years ago) parent82c21fa
3 files changed+3−4
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js−1 tests/plugins/Dash/tst_CardAttributesGrid.qml+2−2 tests/qmltests/Dash/tst_Card.qml+1−1
plugins/Dash/CardCreator.js−1
@@ -277,7 +277,6 @@ var kSubtitleLabelCode = 'Label { \n\
277277var kAttributesRowCode = 'CardAttributesGrid { \n\
278278 id: attributesRow; \n\
279279 objectName: "attributesRow"; \n\
280− height: units.gu(1.5); \n\
281280 anchors { %1 } \n\
282281 model: cardData["attributes"] \n\
283282 }\n';
tests/plugins/Dash/tst_CardAttributesGrid.qml+2−2
@@ -23,8 +23,8 @@ Item {
2323 height: units.gu(30)
2424
2525 property var testData: [
26− [{"value":"text1"},{"value":"text2"}],
27− [{"value":"text1"},{"value":"text2"},{"value":"text3"}]
26+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}],
27+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"},{"value":"text3"}]
2828 ]
2929
3030 CardAttributesGrid {
tests/qmltests/Dash/tst_Card.qml+1−1
@@ -34,7 +34,7 @@ Rectangle {
3434 "title": "foo",
3535 "subtitle": "bar",
3636 "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
37− "attributes": [{"value":"text1"},{"value":"text2"}]
37+ "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]
3838 }'
3939
4040 property var cardsModel: [