@@ -96,12 +96,9 @@ Item {
9696 id: journal
9797 anchors.fill: parent
9898 model: wrappedFakeModel
99− minimumColumnSpacing: minColumnSpacingSelector.
100− values[minColumnSpacingSelector.selectedIndex]
101− rowSpacing:
102− rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
103− columnWidth: // XXX karni: How do I get that from the delegate?
104− cardSizeSelector.values[cardSizeSelector.selectedIndex]
99+ minimumColumnSpacing: minColumnSpacingSelector.values[minColumnSpacingSelector.selectedIndex]
100+ rowSpacing: rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
101+ columnWidth: cardSizeSelector.values[cardSizeSelector.selectedIndex]
105102
106103 delegate: Rectangle {
107104 id: delegateItem
@@ -137,11 +134,9 @@ Item {
137134 when: windowShown
138135
139136 function test_minimumColumnSpacing_data() {
140− var data = new Array()
141− data.push({minColumnSpacingIndex: 0, expectedColumns: 2})
142− data.push({minColumnSpacingIndex: 1, expectedColumns: 2})
143− data.push({minColumnSpacingIndex: 2, expectedColumns: 1})
144− return data
137+ return [{minColumnSpacingIndex: 0, expectedColumns: 2},
138+ {minColumnSpacingIndex: 1, expectedColumns: 2},
139+ {minColumnSpacingIndex: 2, expectedColumns: 1}]
145140 }
146141
147142 // Test how minimumColumnSpacing affects column count.
@@ -154,13 +149,9 @@ Item {
154149 }
155150
156151 function test_maximumNumberOfColumns_data() {
157− var data = new Array()
158− // Change maxColumns
159− data.push({cardSizeIndex: 0, expectedColumns: 6})
160− // Change card size
161− data.push({cardSizeIndex: 1, expectedColumns: 4})
162− data.push({cardSizeIndex: 2, expectedColumns: 2})
163− return data
152+ return [{cardSizeIndex: 0, expectedColumns: 6},
153+ {cardSizeIndex: 1, expectedColumns: 4},
154+ {cardSizeIndex: 2, expectedColumns: 2}]
164155 }
165156
166157 // Test how maximumNumberOfColumns and columnWidth affect column count.