1
=== modified file 'CHANGES'
2
--- CHANGES	2013-12-05 14:54:53 +0000
3
+++ CHANGES	2014-01-30 09:32:49 +0000
4
@@ -9,7 +9,10 @@
5
9
9
6
10
API Changes
10
API Changes
7
11
***********
11
***********
8
12
* ADDED IN: OptionSelector: property bool contained
9
12
* ADDED IN: PickerDelegate: readonly property Picker picker
13
* ADDED IN: PickerDelegate: readonly property Picker picker
10
14
* DEPRECATED: ItemSelector
11
15
* DEPRECATED: ValueSelector
12
13
* CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
16
* CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
13
14
* CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
17
* CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
14
15
* ADDED IN: Action: property string iconName
18
* ADDED IN: Action: property string iconName
15
16
19
16
=== modified file 'components.api'
17
--- components.api	2013-12-17 14:05:43 +0000
18
+++ components.api	2014-01-30 09:32:49 +0000
19
@@ -193,6 +193,7 @@
20
193
    property real containerHeight
193
    property real containerHeight
21
194
    property int selectedIndex
194
    property int selectedIndex
22
195
    property bool currentlyExpanded
195
    property bool currentlyExpanded
23
196
    property bool contained
24
196
    readonly property real itemHeight
197
    readonly property real itemHeight
25
197
    signal delegateClicked(int index)
198
    signal delegateClicked(int index)
26
198
    signal expansionCompleted()
199
    signal expansionCompleted()
27
199
200
28
=== modified file 'examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
29
--- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2013-12-02 14:03:16 +0000
30
+++ examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2014-01-30 09:32:49 +0000
31
@@ -28,8 +28,8 @@
32
28
            spacing: units.gu(3)
28
            spacing: units.gu(3)
33
29
29
34
30
            OptionSelector {
30
            OptionSelector {
37
31
               objectName: "optionselector_collapsed"
31
                objectName: "optionselector_collapsed"
38
32
               text: i18n.tr("Collapsed")
32
                text: i18n.tr("Collapsed")
39
33
               model: [i18n.tr("Value 1"),
33
               model: [i18n.tr("Value 1"),
40
34
                       i18n.tr("Value 2"),
34
                       i18n.tr("Value 2"),
41
35
                       i18n.tr("Value 3"),
35
                       i18n.tr("Value 3"),
42
@@ -41,9 +41,9 @@
43
41
                text: i18n.tr("Expanded")
41
                text: i18n.tr("Expanded")
44
42
                expanded: true
42
                expanded: true
45
43
                model: [i18n.tr("Value 1"),
43
                model: [i18n.tr("Value 1"),
49
44
                        i18n.tr("Value 2"),
44
                    i18n.tr("Value 2"),
50
45
                        i18n.tr("Value 3"),
45
                    i18n.tr("Value 3"),
51
46
                        i18n.tr("Value 4")]
46
                    i18n.tr("Value 4")]
52
47
            }
47
            }
53
48
48
54
49
            OptionSelector {
49
            OptionSelector {
55
@@ -52,16 +52,17 @@
56
52
                expanded: false
52
                expanded: false
57
53
                multiSelection: true
53
                multiSelection: true
58
54
                model: [i18n.tr("Value 1"),
54
                model: [i18n.tr("Value 1"),
62
55
                        i18n.tr("Value 2"),
55
                    i18n.tr("Value 2"),
63
56
                        i18n.tr("Value 3"),
56
                    i18n.tr("Value 3"),
64
57
                        i18n.tr("Value 4")]
57
                    i18n.tr("Value 4")]
65
58
            }
58
            }
66
59
59
67
60
            OptionSelector {
60
            OptionSelector {
70
61
               objectName: "optionselector_custommodel"
61
                objectName: "optionselector_custommodel"
71
62
               text: i18n.tr("Custom Model")
62
                text: i18n.tr("Custom Model")
72
63
                model: customModel
63
                model: customModel
73
64
                expanded: true
64
                expanded: true
74
65
                contained: false
75
65
                colourImage: true
66
                colourImage: true
76
66
                delegate: selectorDelegate
67
                delegate: selectorDelegate
77
67
            }
68
            }
78
@@ -82,14 +83,15 @@
79
82
            OptionSelector {
83
            OptionSelector {
80
83
                text: i18n.tr("Custom container height")
84
                text: i18n.tr("Custom container height")
81
84
                model: [i18n.tr("Value 1"),
85
                model: [i18n.tr("Value 1"),
89
85
                        i18n.tr("Value 2"),
86
                    i18n.tr("Value 2"),
90
86
                        i18n.tr("Value 3"),
87
                    i18n.tr("Value 3"),
91
87
                        i18n.tr("Value 4"),
88
                    i18n.tr("Value 4"),
92
88
                        i18n.tr("Value 5"),
89
                    i18n.tr("Value 5"),
93
89
                        i18n.tr("Value 6"),
90
                    i18n.tr("Value 6"),
94
90
                        i18n.tr("Value 7"),
91
                    i18n.tr("Value 7"),
95
91
                        i18n.tr("Value 8")]
92
                    i18n.tr("Value 8")]
96
92
                containerHeight: itemHeight * 4
93
                containerHeight: itemHeight * 4
97
94
                contained: false
98
93
            }
95
            }
99
94
96
100
95
            OptionSelector {
97
            OptionSelector {
101
@@ -97,14 +99,15 @@
102
97
                expanded: true
99
                expanded: true
103
98
                selectedIndex: -1
100
                selectedIndex: -1
104
99
                model: [i18n.tr("Value 1"),
101
                model: [i18n.tr("Value 1"),
112
100
                        i18n.tr("Value 2"),
102
                    i18n.tr("Value 2"),
113
101
                        i18n.tr("Value 3"),
103
                    i18n.tr("Value 3"),
114
102
                        i18n.tr("Value 4"),
104
                    i18n.tr("Value 4"),
115
103
                        i18n.tr("Value 5"),
105
                    i18n.tr("Value 5"),
116
104
                        i18n.tr("Value 6"),
106
                    i18n.tr("Value 6"),
117
105
                        i18n.tr("Value 7"),
107
                    i18n.tr("Value 7"),
118
106
                        i18n.tr("Value 8")]
108
                    i18n.tr("Value 8")]
119
107
                containerHeight: itemHeight * 4
109
                containerHeight: itemHeight * 4
120
110
                contained: false
121
108
            }
111
            }
122
109
        }
112
        }
123
110
    }
113
    }
124
111
114
125
=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
126
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2013-12-05 17:00:33 +0000
127
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-01-30 09:32:49 +0000
128
@@ -19,6 +19,7 @@
129
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
130
20
20
131
21
/*!
21
/*!
132
22
  ****DEPRECATED! PLEASE THE OPTION SELECTOR WITH CONTAINED PROPERTY TRUE.****
133
22
    \qmltype ItemSelector
23
    \qmltype ItemSelector
134
23
    \inqmlmodule Ubuntu.Components.ListItems 0.1
24
    \inqmlmodule Ubuntu.Components.ListItems 0.1
135
24
    \ingroup ubuntu-listitems
25
    \ingroup ubuntu-listitems
136
@@ -194,6 +195,8 @@
137
194
    __height: column.height
195
    __height: column.height
138
195
    showDivider: false
196
    showDivider: false
139
196
197
140
198
    Component.onCompleted: console.debug("ITEMSELECTOR IS DEPRECATED. PLEASE USE OPTIONSELECTOR WITH contained: true");
141
199
142
197
    Column {
200
    Column {
143
198
        id: column
201
        id: column
144
199
202
145
200
203
146
=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
147
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2013-11-06 22:52:15 +0000
148
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-01-30 09:32:49 +0000
149
@@ -18,7 +18,7 @@
150
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
151
19
19
152
20
/*!
20
/*!
154
21
    ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
21
    ****DEPRECATED! PLEASE USE THE OPTION SELECTOR.****
155
22
22
156
23
    \qmltype ValueSelector
23
    \qmltype ValueSelector
157
24
    \inqmlmodule Ubuntu.Components.ListItems 0.1
24
    \inqmlmodule Ubuntu.Components.ListItems 0.1
158
@@ -184,6 +184,8 @@
159
184
184
160
185
    showDivider: false
185
    showDivider: false
161
186
186
162
187
    Component.onCompleted: console.debug("VALUESELECTOR IS DEPRECATED. PLEASE USE OPTIONSELECTOR WITH contained: false");
163
188
164
187
    Column {
189
    Column {
165
188
        id: column
190
        id: column
166
189
        anchors {
191
        anchors {
167
190
192
168
=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
169
--- modules/Ubuntu/Components/OptionSelector.qml	2013-12-13 15:50:35 +0000
170
+++ modules/Ubuntu/Components/OptionSelector.qml	2014-01-30 09:32:49 +0000
171
@@ -175,6 +175,12 @@
172
175
    property alias currentlyExpanded: listContainer.currentlyExpanded
175
    property alias currentlyExpanded: listContainer.currentlyExpanded
173
176
176
174
177
    /*!
177
    /*!
175
178
      \preliminary
176
179
      Is full width activated or is this a contained selector? The contained selector has an UbuntuShape background.
177
180
     */
178
181
    property bool contained: true
179
182
180
183
    /*!
181
178
      \qmlproperty real itemHeight
184
      \qmlproperty real itemHeight
182
179
      Height of an individual list item.
185
      Height of an individual list item.
183
180
     */
186
     */
184
@@ -190,7 +196,7 @@
185
190
     */
196
     */
186
191
    signal expansionCompleted()
197
    signal expansionCompleted()
187
192
198
189
193
     /*!
199
    /*!
190
194
      \internal
200
      \internal
191
195
      Trigger the action, passing the current index.
201
      Trigger the action, passing the current index.
192
196
     */
202
     */
193
@@ -204,20 +210,20 @@
194
204
    Column {
210
    Column {
195
205
        id: column
211
        id: column
196
206
212
197
207
        spacing: units.gu(2)
198
208
        anchors {
213
        anchors {
199
209
            left: parent.left
214
            left: parent.left
200
210
            right: parent.right
215
            right: parent.right
201
211
        }
216
        }
202
212
217
204
213
        Label {
218
        ListItem.Standard {
205
214
            id : label
219
            id : label
206
215
220
207
216
            text: optionSelector.text
221
            text: optionSelector.text
208
217
            visible: optionSelector.text !== "" ? true : false
222
            visible: optionSelector.text !== "" ? true : false
209
223
            showDivider: !contained
210
218
        }
224
        }
211
219
225
213
220
        StyledItem {
226
        ListItem.Standard {
214
221
            id: listContainer
227
            id: listContainer
215
222
            objectName: "listContainer"
228
            objectName: "listContainer"
216
223
229
217
@@ -225,6 +231,7 @@
218
225
            readonly property url tick: __styleInstance.tick
231
            readonly property url tick: __styleInstance.tick
219
226
            readonly property color themeColour: Theme.palette.selected.fieldText
232
            readonly property color themeColour: Theme.palette.selected.fieldText
220
227
            readonly property alias colourImage: optionSelector.colourImage
233
            readonly property alias colourImage: optionSelector.colourImage
221
234
            property alias contained: optionSelector.contained
222
228
            property bool currentlyExpanded: expanded || multiSelection
235
            property bool currentlyExpanded: expanded || multiSelection
223
229
236
224
230
            anchors {
237
            anchors {
225
@@ -233,6 +240,7 @@
226
233
            }
240
            }
227
234
            state: optionSelector.expanded ? "expanded" : "collapsed"
241
            state: optionSelector.expanded ? "expanded" : "collapsed"
228
235
            style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
242
            style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
229
243
            showDivider: !currentlyExpanded && !contained
230
236
            states: [ State {
244
            states: [ State {
231
237
                    name: "expanded"
245
                    name: "expanded"
232
238
                    when: listContainer.currentlyExpanded
246
                    when: listContainer.currentlyExpanded
233
239
247
234
=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
235
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2013-12-04 15:51:58 +0000
236
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-01-30 09:32:49 +0000
237
@@ -72,7 +72,7 @@
238
72
    property url icon: iconSource
72
    property url icon: iconSource
239
73
    onIconChanged: if (icon != iconSource) {
73
    onIconChanged: if (icon != iconSource) {
240
74
                       console.warn("WARNING: OptionSelectorDelegate.icon is DEPRECATED. " +
74
                       console.warn("WARNING: OptionSelectorDelegate.icon is DEPRECATED. " +
242
75
                                     "Use iconName and iconSource instead.")
75
                                    "Use iconName and iconSource instead.")
243
76
                   }
76
                   }
244
77
77
245
78
    /*!
78
    /*!
246
@@ -140,7 +140,7 @@
247
140
            gl_FragColor = colour * sourceColour.a * qt_Opacity;
140
            gl_FragColor = colour * sourceColour.a * qt_Opacity;
248
141
        }"
141
        }"
249
142
142
251
143
    showDivider: index !== listView.count - 1 ? 1 : 0
143
    showDivider: index === listView.count - 1 && listView.container.contained ? 0 : 1
252
144
    highlightWhenPressed: false
144
    highlightWhenPressed: false
253
145
    selected: ListView.isCurrentItem
145
    selected: ListView.isCurrentItem
254
146
    anchors {
146
    anchors {
255
@@ -314,12 +314,12 @@
256
314
                duration: Toolkit.UbuntuAnimation.FastDuration
314
                duration: Toolkit.UbuntuAnimation.FastDuration
257
315
            }
315
            }
258
316
        }, PropertyAnimation {
316
        }, PropertyAnimation {
265
317
                id: optionCollapse
317
            id: optionCollapse
266
318
                target: option
318
            target: option
267
319
                properties: "opacity"
319
            properties: "opacity"
268
320
                from : 1.0
320
            from : 1.0
269
321
                to: 0.0
321
            to: 0.0
270
322
                duration: Toolkit.UbuntuAnimation.SlowDuration
322
            duration: Toolkit.UbuntuAnimation.SlowDuration
271
323
        }
323
        }
272
324
    ]
324
    ]
273
325
325
274
@@ -349,7 +349,7 @@
275
349
                visible: colourImage
349
                visible: colourImage
276
350
350
277
351
                fragmentShader: fragColourShader
351
                fragmentShader: fragColourShader
279
352
             }
352
            }
280
353
        }
353
        }
281
354
354
282
355
        Column {
355
        Column {
283
@@ -398,6 +398,6 @@
284
398
            height: source.height
398
            height: source.height
285
399
399
286
400
            fragmentShader: fragColourShader
400
            fragmentShader: fragColourShader
288
401
         }
401
        }
289
402
    }
402
    }
290
403
}
403
}
291
404
404
292
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml'
293
--- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2013-08-28 10:43:46 +0000
294
+++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-01-30 09:32:49 +0000
295
@@ -31,5 +31,6 @@
296
31
        width: styledItem.width
31
        width: styledItem.width
297
32
        height: styledItem.height
32
        height: styledItem.height
298
33
        radius: "medium"
33
        radius: "medium"
299
34
        visible: styledItem.contained
300
34
    }
35
    }
301
35
}
36
}
302
36
37
303
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
304
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2013-11-08 09:19:02 +0000
305
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-01-30 09:32:49 +0000
306
@@ -30,11 +30,11 @@
307
30
        self.loadItem(item)
30
        self.loadItem(item)
308
31
        self.checkPageHeader(item)
31
        self.checkPageHeader(item)
309
32
        collapsed = self.getObject("optionselector_collapsed")
32
        collapsed = self.getObject("optionselector_collapsed")
311
33
        styleditem = collapsed.select_single('StyledItem',
33
        styleditem = collapsed.select_single('Standard',
312
34
                                             objectName='listContainer')
34
                                             objectName='listContainer')
313
35
35
314
36
        self.assertThat(collapsed.selectedIndex, Equals(0))
36
        self.assertThat(collapsed.selectedIndex, Equals(0))
316
37
        self.pointing_device.click_object(collapsed)
37
        self.pointing_device.click_object(styleditem)
317
38
        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(True)))
38
        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(True)))
318
39
        #try to search the following list entry few times
39
        #try to search the following list entry few times
319
40
        #as it may not be available immediately.
40
        #as it may not be available immediately.
Status:	Rejected
Rejected by:	Tim Peeters on 2014-07-15
Proposed branch:	lp:~unity-team/ubuntu-ui-toolkit/fix-1240019
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	319 lines (+62/-41) 9 files modified CHANGES (+3/-0) components.api (+1/-0) examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+27/-24) modules/Ubuntu/Components/ListItems/ItemSelector.qml (+3/-0) modules/Ubuntu/Components/ListItems/ValueSelector.qml (+3/-1) modules/Ubuntu/Components/OptionSelector.qml (+12/-4) modules/Ubuntu/Components/OptionSelectorDelegate.qml (+10/-10) modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml (+1/-0) tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+2/-2)
To merge this branch:	bzr merge lp:~unity-team/ubuntu-ui-toolkit/fix-1240019
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tim Peeters			Needs Resubmitting on 2014-07-15
PS Jenkins bot	continuous-integration	2014-01-30	Needs Fixing on 2014-01-30
Zsombor Egri		2014-01-30	Pending
Review via email: mp+203899@code.launchpad.net