Ubuntu UI Toolkit

Merge lp:~nicolas-doffay/ubuntu-ui-toolkit/selector-api-break-fix into lp:ubuntu-ui-toolkit

  1. selector-api-break-fix
  2. Merge into trunk
Proposed by Nicolas d'Offay
Status: Merged
Approved by: Tim Peeters
Approved revision: 829
Merged at revision: 825
Proposed branch: lp:~nicolas-doffay/ubuntu-ui-toolkit/selector-api-break-fix
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 492 lines (+60/-61)
10 files modified
CHANGES (+2/-4)
components.api (+4/-4)
examples/ubuntu-ui-toolkit-gallery/ListItems.qml (+4/-4)
examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+4/-4)
modules/Ubuntu/Components/ListItems/ItemSelector.qml (+14/-14)
modules/Ubuntu/Components/OptionSelector.qml (+13/-13)
modules/Ubuntu/Components/OptionSelectorDelegate.qml (+7/-7)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+3/-2)
tests/unit_x11/tst_components/tst_listitems_itemselector.qml (+4/-4)
tests/unit_x11/tst_components/tst_optionselector.qml (+5/-5)
To merge this branch: bzr merge lp:~nicolas-doffay/ubuntu-ui-toolkit/selector-api-break-fix
Reviewer Review Type Date Requested Status
Tim Peeters Approve
Timo Jyrinki Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+194313@code.launchpad.net

Commit message

Reverted API break on the selectors.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1178/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/554
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/542/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/126
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/126/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/542/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/3009/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3191/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1203
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1201

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1178/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

there is still an autopilot fail https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/511/testReport/junit/ubuntuuitoolkit.tests.gallery.test_optionselector/OptionSelectorTests/test_optionselector_collapsed/

review: Needs Fixing
Revision history for this message
Tim Peeters (tpeeters) wrote :

I propose to keep the "alwaysExpanded" property as it is, and make "expanded" an alias of that one (and mark it as deprecated). That way we introduce the "alwaysExpanded", and we don't break apps that use "expanded".

Also the changes below in the code to change "alwaysExpanded" to "expanded" everywhere can be undone, so this MR will make a lot fewer changes with the same results.

review: Needs Fixing
Revision history for this message
Nicolas d'Offay (nicolas-doffay) wrote :

As mentioned on #sdk I believe it's best to keep it as it is currently. Judging from yesterdays reactions there seemed to be a lot of confusion.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:826
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1182/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/572
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/557/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/130
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/130/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/557/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/3020/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3202/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1227
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1222

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1182/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

> As mentioned on #sdk I believe it's best to keep it as it is currently.
> Judging from yesterdays reactions there seemed to be a lot of confusion.

okay

Revision history for this message
Tim Peeters (tpeeters) wrote :

There is still one alwaysExpanded in test_optionselector.py, so one test fails:

https://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/3020/testReport/junit/ubuntuuitoolkit.tests.gallery.test_optionselector/OptionSelectorTests/test_optionselector_collapsed/

Please make sure all tests pass and then ping me so I can approve.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:827
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1185/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/586
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/571/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/133/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/586
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/586/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/571
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/571/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/3033/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3215/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1252
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1246

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1185/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:828
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1187/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/576/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/576/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1187/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/430/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/583/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/583/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/431/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/605/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/590/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/605/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/590/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

The error currently seems to be:

./tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py:51:80: E501 line too long (80 > 79 characters)
        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(False)))
                                                                               ^
./debian/ubuntu-ui-toolkit-autopilot/usr/lib/python2.7/dist-packages/ubuntuuitoolkit/tests/gallery/test_optionselector.py:51:80: E501 line too long (80 > 79 characters)
        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(False)))
                                                                               ^
./debian/tmp/usr/lib/python2.7/dist-packages/ubuntuuitoolkit/tests/gallery/test_optionselector.py:51:80: E501 line too long (80 > 79 characters)
        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(False)))

review: Needs Fixing
lp:~nicolas-doffay/ubuntu-ui-toolkit/selector-api-break-fix updated
829. By Nicolas d'Offay

Split long line

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:829
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/618
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/618/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/603
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3238
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1282

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1193/rebuild

review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Would be good to get in now that jenkins also approves it.

review: Approve
Revision history for this message
Tim Peeters (tpeeters) wrote :

good to go now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGES'
2--- CHANGES 2013-10-23 13:40:23 +0000
3+++ CHANGES 2013-11-08 09:19:22 +0000
4@@ -9,10 +9,8 @@
5
6 API Changes
7 ***********
8-* CHANGED IN: OptionSelector: property bool expanded TO bool alwaysExpanded
9-* CHANGED IN: ItemSelector: property bool expanded TO bool alwaysExpanded
10-* ADDED IN: OptionSelector: readonly property bool expanded
11-* ADDED IN: ItemSelector: readonly property bool expanded
12+* ADDED IN: OptionSelector: readonly property bool currentlyExpanded
13+* ADDED IN: ItemSelector: readonly property bool currentlyExpanded
14 * ADDED IN: Tab: readonly property int index
15 * ADDED IN: ListItem.Empty: property bool confirmRemoval
16 * ADDED IN: OptionSelector: property bool multiSelection
17
18=== modified file 'components.api'
19--- components.api 2013-11-04 20:49:16 +0000
20+++ components.api 2013-11-08 09:19:22 +0000
21@@ -100,12 +100,12 @@
22 modules/Ubuntu/Components/OptionSelector.qml
23 ListItem.Empty
24 property var model
25- property bool alwaysExpanded
26+ property bool expanded
27 property bool multiSelection
28 property bool colourImage
29 property real containerHeight
30 property int selectedIndex
31- readonly property bool expanded
32+ readonly property bool currentlyExpanded
33 readonly property real itemHeight
34 signal delegateClicked(int index)
35 signal expansionCompleted()
36@@ -441,12 +441,12 @@
37 modules/Ubuntu/Components/ListItems/ItemSelector.qml
38 ListItem.Empty
39 property var model
40- property bool alwaysExpanded
41+ property bool expanded
42 property bool multiSelection
43 property bool colourImage
44 property real containerHeight
45 property int selectedIndex
46- readonly property bool expanded
47+ readonly property bool currentlyExpanded
48 readonly property real itemHeight
49 signal delegateClicked(int index)
50 signal expansionCompleted()
51
52=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
53--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml 2013-10-14 15:58:57 +0000
54+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml 2013-11-08 09:19:22 +0000
55@@ -95,7 +95,7 @@
56
57 ListItem.ItemSelector {
58 text: i18n.tr("Expanded")
59- alwaysExpanded: true
60+ expanded: true
61 model: [i18n.tr("Value 1"),
62 i18n.tr("Value 2"),
63 i18n.tr("Value 3"),
64@@ -104,7 +104,7 @@
65
66 ListItem.ItemSelector {
67 text: i18n.tr("Multiple Selection")
68- alwaysExpanded: false
69+ expanded: false
70 multiSelection: true
71 model: [i18n.tr("Value 1"),
72 i18n.tr("Value 2"),
73@@ -115,7 +115,7 @@
74 ListItem.ItemSelector {
75 text: i18n.tr("Custom Model")
76 model: customModel
77- alwaysExpanded: true
78+ expanded: true
79 colourImage: true
80 delegate: selectorDelegate
81 }
82@@ -148,7 +148,7 @@
83
84 ListItem.ItemSelector {
85 text: i18n.tr("Label")
86- alwaysExpanded: true
87+ expanded: true
88 selectedIndex: -1
89 model: [i18n.tr("Value 1"),
90 i18n.tr("Value 2"),
91
92=== modified file 'examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
93--- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml 2013-10-21 07:44:03 +0000
94+++ examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml 2013-11-08 09:19:22 +0000
95@@ -39,7 +39,7 @@
96 OptionSelector {
97 objectName: "optionselector_expanded"
98 text: i18n.tr("Expanded")
99- alwaysExpanded: true
100+ expanded: true
101 model: [i18n.tr("Value 1"),
102 i18n.tr("Value 2"),
103 i18n.tr("Value 3"),
104@@ -49,7 +49,7 @@
105 OptionSelector {
106 objectName: "optionselector_multipleselection"
107 text: i18n.tr("Multiple Selection")
108- alwaysExpanded: false
109+ expanded: false
110 multiSelection: true
111 model: [i18n.tr("Value 1"),
112 i18n.tr("Value 2"),
113@@ -61,7 +61,7 @@
114 objectName: "optionselector_custommodel"
115 text: i18n.tr("Custom Model")
116 model: customModel
117- alwaysExpanded: true
118+ expanded: true
119 colourImage: true
120 delegate: selectorDelegate
121 }
122@@ -94,7 +94,7 @@
123
124 OptionSelector {
125 text: i18n.tr("Label")
126- alwaysExpanded: true
127+ expanded: true
128 selectedIndex: -1
129 model: [i18n.tr("Value 1"),
130 i18n.tr("Value 2"),
131
132=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
133--- modules/Ubuntu/Components/ListItems/ItemSelector.qml 2013-10-14 17:08:13 +0000
134+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml 2013-11-08 09:19:22 +0000
135@@ -45,7 +45,7 @@
136
137 ListItem.ItemSelector {
138 text: i18n.tr("Label")
139- alwaysExpanded: true
140+ expanded: true
141 model: [i18n.tr("Value 1"),
142 i18n.tr("Value 2"),
143 i18n.tr("Value 3"),
144@@ -55,7 +55,7 @@
145 ListItem.ItemSelector {
146 text: i18n.tr("Multiple Selection")
147 alwaysExpanded: false
148- multiSelection: true
149+ expanded: true
150 model: [i18n.tr("Value 1"),
151 i18n.tr("Value 2"),
152 i18n.tr("Value 3"),
153@@ -65,7 +65,7 @@
154 ListItem.ItemSelector {
155 text: i18n.tr("Label")
156 model: customModel
157- alwaysExpanded: true
158+ expanded: true
159 colourImage: true
160 delegate: selectorDelegate
161 }
162@@ -98,7 +98,7 @@
163
164 ListItem.ItemSelector {
165 text: i18n.tr("Label")
166- alwaysExpanded: true
167+ expanded: true
168 model: [i18n.tr("Value 1"),
169 i18n.tr("Value 2"),
170 i18n.tr("Value 3"),
171@@ -127,7 +127,7 @@
172 \preliminary
173 Specifies whether the list is always alwaysExpanded.
174 */
175- property bool alwaysExpanded: false
176+ property bool expanded: false
177
178 /*!
179 \preliminary
180@@ -161,9 +161,9 @@
181
182 /*!
183 \qmlproperty bool expanded
184- Is our list currently alwaysExpanded?
185+ Is our list currently expanded?
186 */
187- readonly property alias expanded: listContainer.expanded
188+ readonly property alias currentlyExpanded: listContainer.currentlyExpanded
189
190 /*!
191 \qmlproperty real itemHeight
192@@ -204,25 +204,25 @@
193 readonly property url tick: __styleInstance.tick
194 readonly property color themeColour: Theme.palette.selected.fieldText
195 readonly property alias colourImage: itemSelector.colourImage
196- property bool expanded: alwaysExpanded || multiSelection
197+ property bool currentlyExpanded: expanded || multiSelection
198
199 anchors {
200 left: parent.left
201 right: parent.right
202 }
203- state: itemSelector.alwaysExpanded ? state = "alwaysExpanded" : state = "collapsed"
204+ state: itemSelector.expanded ? state = "alwaysExpanded" : state = "collapsed"
205 style: Theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
206
207 states: [ State {
208 name: "expanded"
209- when: listContainer.expanded
210+ when: listContainer.currentlyExpanded
211 PropertyChanges {
212 target: listContainer
213 height: list.contentHeight < containerHeight ? list.contentHeight : containerHeight
214 }
215 }, State {
216 name: "collapsed"
217- when: !listContainer.expanded
218+ when: !listContainer.currentlyExpanded
219 PropertyChanges {
220 target: listContainer
221 height: list.itemHeight
222@@ -238,7 +238,7 @@
223 }
224 ScriptAction {
225 script: {
226- if (listContainer.expanded) {
227+ if (listContainer.currentlyExpanded) {
228 expansionCompleted();
229 }
230 }
231@@ -252,14 +252,14 @@
232 objectName: "listView"
233
234 property int previousIndex: list.currentIndex
235- readonly property alias alwaysExpanded: itemSelector.alwaysExpanded
236+ readonly property alias expanded: itemSelector.expanded
237 readonly property alias multiSelection: itemSelector.multiSelection
238 readonly property alias container: listContainer
239 property real itemHeight
240 signal delegateClicked(int index)
241
242 onDelegateClicked: itemSelector.delegateClicked(index);
243- interactive: listContainer.height !== list.contentHeight && listContainer.expanded ? true : false
244+ interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false
245 clip: true
246 currentIndex: 0
247 model: itemSelector.model
248
249=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
250--- modules/Ubuntu/Components/OptionSelector.qml 2013-10-14 15:58:57 +0000
251+++ modules/Ubuntu/Components/OptionSelector.qml 2013-11-08 09:19:22 +0000
252@@ -43,7 +43,7 @@
253
254 OptionSelector {
255 text: i18n.tr("Label")
256- alwaysExpanded: true
257+ expanded: true
258 model: [i18n.tr("Value 1"),
259 i18n.tr("Value 2"),
260 i18n.tr("Value 3"),
261@@ -53,7 +53,7 @@
262 OptionSelector {
263 objectName: "optionselector_multipleselection"
264 text: i18n.tr("Multiple Selection")
265- alwaysExpanded: false
266+ expanded: false
267 multiSelection: true
268 model: [i18n.tr("Value 1"),
269 i18n.tr("Value 2"),
270@@ -64,7 +64,7 @@
271 OptionSelector {
272 text: i18n.tr("Label")
273 model: customModel
274- alwaysExpanded: true
275+ expanded: true
276 colourImage: true
277 delegate: selectorDelegate
278 }
279@@ -97,7 +97,7 @@
280
281 OptionSelector {
282 text: i18n.tr("Label")
283- alwaysExpanded: true
284+ expanded: true
285 model: [i18n.tr("Value 1"),
286 i18n.tr("Value 2"),
287 i18n.tr("Value 3"),
288@@ -126,7 +126,7 @@
289 \preliminary
290 Specifies whether the list is always expanded.
291 */
292- property bool alwaysExpanded: false
293+ property bool expanded: false
294
295 /*!
296 \preliminary
297@@ -162,7 +162,7 @@
298 \qmlproperty bool expanded
299 Is our list currently expanded?
300 */
301- readonly property alias expanded: listContainer.expanded
302+ readonly property alias currentlyExpanded: listContainer.currentlyExpanded
303
304 /*!
305 \qmlproperty real itemHeight
306@@ -215,24 +215,24 @@
307 readonly property url tick: __styleInstance.tick
308 readonly property color themeColour: Theme.palette.selected.fieldText
309 readonly property alias colourImage: optionSelector.colourImage
310- property bool expanded: alwaysExpanded || multiSelection
311+ property bool currentlyExpanded: expanded || multiSelection
312
313 anchors {
314 left: parent.left
315 right: parent.right
316 }
317- state: optionSelector.alwaysExpanded ? state = "expanded" : state = "collapsed"
318+ state: optionSelector.expanded ? state = "expanded" : state = "collapsed"
319 style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
320 states: [ State {
321 name: "expanded"
322- when: listContainer.expanded
323+ when: listContainer.currentlyExpanded
324 PropertyChanges {
325 target: listContainer
326 height: list.contentHeight < containerHeight ? list.contentHeight : containerHeight
327 }
328 }, State {
329 name: "collapsed"
330- when: !listContainer.expanded
331+ when: !listContainer.currentlyExpanded
332 PropertyChanges {
333 target: listContainer
334 height: list.itemHeight
335@@ -248,7 +248,7 @@
336 }
337 ScriptAction {
338 script: {
339- if (listContainer.expanded) {
340+ if (listContainer.currentlyExpanded) {
341 expansionCompleted();
342 }
343 }
344@@ -261,14 +261,14 @@
345 id: list
346
347 property int previousIndex: -1
348- readonly property alias alwaysExpanded: optionSelector.alwaysExpanded
349+ readonly property alias expanded: optionSelector.expanded
350 readonly property alias multiSelection: optionSelector.multiSelection
351 readonly property alias container: listContainer
352 property real itemHeight
353 signal delegateClicked(int index)
354
355 onDelegateClicked: optionSelector.delegateClicked(index);
356- interactive: listContainer.height !== list.contentHeight && listContainer.expanded ? true : false
357+ interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false
358 clip: true
359 currentIndex: 0
360 model: optionSelector.model
361
362=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
363--- modules/Ubuntu/Components/OptionSelectorDelegate.qml 2013-10-14 15:58:57 +0000
364+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml 2013-11-08 09:19:22 +0000
365@@ -115,7 +115,7 @@
366 right: parent.right
367 }
368 onClicked: {
369- if (listView.container.expanded) {
370+ if (listView.container.currentlyExpanded) {
371 listView.delegateClicked(index);
372
373 if (!listView.multiSelection) {
374@@ -126,8 +126,8 @@
375 }
376 }
377
378- if (!listView.alwaysExpanded && !listView.multiSelection) {
379- listView.container.expanded = !listView.container.expanded;
380+ if (!listView.expanded && !listView.multiSelection) {
381+ listView.container.currentlyExpanded = !listView.container.currentlyExpanded;
382 }
383 }
384
385@@ -168,14 +168,14 @@
386 resources: [
387 Connections {
388 target: listView.container
389- onExpandedChanged: {
390+ onCurrentlyExpandedChanged: {
391 optionExpansion.stop();
392 imageExpansion.stop();
393 optionCollapse.stop();
394 selectedImageCollapse.stop();
395 deselectedImageCollapse.stop();
396
397- if (listView.container.expanded === true) {
398+ if (listView.container.currentlyExpanded === true) {
399 if (!option.selected) {
400 optionExpansion.start();
401
402@@ -341,7 +341,7 @@
403
404 width: units.gu(2)
405 height: units.gu(2)
406- source: listView.alwaysExpanded || listView.multiSelection ? listView.container.tick : listView.container.chevron
407+ source: listView.expanded || listView.multiSelection ? listView.container.tick : listView.container.chevron
408 opacity: option.selected ? 1.0 : 0.0
409 anchors {
410 right: parent.right
411@@ -351,7 +351,7 @@
412
413 //Our behaviour is only enabled for our expanded list due to flickering bugs in relation to all this other animations running on the expanding version.
414 Behavior on opacity {
415- enabled: listView.alwaysExpanded
416+ enabled: listView.expanded
417
418 Toolkit.UbuntuNumberAnimation {
419 properties: "opacity"
420
421=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
422--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py 2013-10-21 10:03:23 +0000
423+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py 2013-11-08 09:19:22 +0000
424@@ -35,7 +35,7 @@
425
426 self.assertThat(collapsed.selectedIndex, Equals(0))
427 self.pointing_device.click_object(collapsed)
428- self.assertThat(styleditem.expanded, Eventually(Equals(True)))
429+ self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(True)))
430 #try to search the following list entry few times
431 #as it may not be available immediately.
432 for t in range(0, 9):
433@@ -48,7 +48,8 @@
434
435 self.pointing_device.click_object(selectedValue)
436 self.assertThat(collapsed.selectedIndex, Eventually(Equals(3)))
437- self.assertThat(styleditem.expanded, Eventually(Equals(False)))
438+ self.assertThat(styleditem.currentlyExpanded,
439+ Eventually(Equals(False)))
440
441 def test_optionselector_expanded(self):
442 item = "Option Selector"
443
444=== modified file 'tests/unit_x11/tst_components/tst_listitems_itemselector.qml'
445--- tests/unit_x11/tst_components/tst_listitems_itemselector.qml 2013-10-14 17:08:43 +0000
446+++ tests/unit_x11/tst_components/tst_listitems_itemselector.qml 2013-11-08 09:19:22 +0000
447@@ -73,12 +73,12 @@
448 function test_expanded() {
449 var listContainer = findChild(selector, "listContainer");
450
451- selector.alwaysExpanded = false;
452- compare(listContainer.expanded, false, "expanded should be true if list is an expanded one");
453+ selector.expanded = false;
454+ compare(listContainer.currentlyExpanded, false, "expanded should be true if list is an expanded one");
455 compare(listContainer.state, "collapsed", "state should be collapsed");
456
457- selector.alwaysExpanded = true;
458- compare(listContainer.expanded, true, "expanded should be false if list is an expanded one");
459+ selector.expanded = true;
460+ compare(listContainer.currentlyExpanded, true, "expanded should be false if list is an expanded one");
461 compare(listContainer.state, "expanded", "state should be expanded");
462 }
463
464
465=== modified file 'tests/unit_x11/tst_components/tst_optionselector.qml'
466--- tests/unit_x11/tst_components/tst_optionselector.qml 2013-10-14 17:08:13 +0000
467+++ tests/unit_x11/tst_components/tst_optionselector.qml 2013-11-08 09:19:22 +0000
468@@ -35,7 +35,7 @@
469 text: "TEST"
470 delegate: selectorDelegate
471 model: customModel
472- alwaysExpanded: true
473+ expanded: true
474
475 action: {
476 enabled: true
477@@ -93,12 +93,12 @@
478 function test_expanded() {
479 var listContainer = findChild(selector, "listContainer");
480
481- selector.alwaysExpanded = false;
482- compare(listContainer.expanded, false, "expanded should be true if list is an expanded one");
483+ selector.expanded = false;
484+ compare(listContainer.currentlyExpanded, false, "expanded should be true if list is an expanded one");
485 compare(listContainer.state, "collapsed", "state should be collapsed");
486
487- selector.alwaysExpanded = true;
488- compare(listContainer.expanded, true, "expanded should be false if list is an expanded one");
489+ selector.expanded = true;
490+ compare(listContainer.currentlyExpanded, true, "expanded should be false if list is an expanded one");
491 compare(listContainer.state, "expanded", "state should be expanded");
492 }
493

Subscribers

People subscribed via source and target branches

to status/vote changes: