1
=== modified file 'debian/control'
2
--- debian/control	2014-07-28 15:09:00 +0000
3
+++ debian/control	2014-07-30 11:48:25 +0000
4
@@ -26,6 +26,7 @@
5
26
               qtdeclarative5-doc-html,
26
               qtdeclarative5-doc-html,
6
27
               qtwebkit5-doc-html,
27
               qtwebkit5-doc-html,
7
28
               qtsvg5-doc-html,
28
               qtsvg5-doc-html,
8
29
               libqt5svg5,
9
29
               qtscript5-doc-html,
30
               qtscript5-doc-html,
10
30
               qtmultimedia5-doc-html,
31
               qtmultimedia5-doc-html,
11
31
               unity-action-doc,
32
               unity-action-doc,
12
32
33
13
=== modified file 'modules/Ubuntu/Components/Icon.qml'
14
--- modules/Ubuntu/Components/Icon.qml	2014-07-03 13:30:32 +0000
15
+++ modules/Ubuntu/Components/Icon.qml	2014-07-30 11:48:25 +0000
16
@@ -84,17 +84,37 @@
17
84
84
18
85
    Image {
85
    Image {
19
86
        id: image
86
        id: image
20
87
        anchors.fill: parent
21
87
88
22
88
        /* Necessary so that icons are not loaded before a size is set. */
89
        /* Necessary so that icons are not loaded before a size is set. */
28
89
        property bool ready: false
90
        source: ""
24
90
        Component.onCompleted: ready = true
25
91
26
92
        anchors.fill: parent
27
93
        source: ready && width > 0 && height > 0 && icon.name ? "image://theme/%1".arg(icon.name) : ""
29
94
        sourceSize {
91
        sourceSize {
33
95
            width: width
92
            width: 0
34
96
            height: height
93
            height: 0
35
97
        }
94
        }
36
95
37
96
        Component.onCompleted: update()
38
97
        onWidthChanged: update()
39
98
        onHeightChanged: update()
40
99
        Connections {
41
100
            target: icon
42
101
            onNameChanged: image.update()
43
102
        }
44
103
45
104
        function update() {
46
105
            // only set sourceSize.width, sourceSize.height and source when
47
106
            // icon dimensions are valid, see bug #1349769.
48
107
            if (width > 0 && height > 0 && icon.name) {
49
108
                sourceSize.width = width;
50
109
                sourceSize.height = height;
51
110
                source = "image://theme/%1".arg(icon.name);
52
111
            } else {
53
112
                source = "";
54
113
                sourceSize.width = 0;
55
114
                sourceSize.height = 0;
56
115
            }
57
116
        }
58
117
59
98
        cache: true
118
        cache: true
60
99
        visible: !colorizedImage.active
119
        visible: !colorizedImage.active
61
100
    }
120
    }
62
101
121
63
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
64
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2014-07-22 15:11:03 +0000
65
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2014-07-30 11:48:25 +0000
66
@@ -20,8 +20,8 @@
67
20
AbstractButton {
20
AbstractButton {
68
21
    id: button
21
    id: button
69
22
22
72
23
    property int iconWidth: units.gu(2)
23
    property real iconWidth: units.gu(2)
73
24
    property int iconHeight: iconWidth
24
    property real iconHeight: iconWidth
74
25
25
75
26
    width: visible ? units.gu(4) : 0
26
    width: visible ? units.gu(4) : 0
76
27
    height: parent ? parent.height : undefined
27
    height: parent ? parent.height : undefined
77
28
28
78
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
79
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-28 10:38:00 +0000
80
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-30 11:48:25 +0000
81
@@ -134,7 +134,7 @@
82
134
            visible: styledItem.pageStack !== null &&
134
            visible: styledItem.pageStack !== null &&
83
135
                     styledItem.pageStack !== undefined &&
135
                     styledItem.pageStack !== undefined &&
84
136
                     styledItem.pageStack.depth > 1 &&
136
                     styledItem.pageStack.depth > 1 &&
86
137
                     !customBackButton.visible
137
                     !styledItem.config.backAction
87
138
138
88
139
            text: "back"
139
            text: "back"
89
140
140
90
141
141
91
=== added file 'tests/unit_x11/tst_components/tst_headActions.qml'
92
--- tests/unit_x11/tst_components/tst_headActions.qml	1970-01-01 00:00:00 +0000
93
+++ tests/unit_x11/tst_components/tst_headActions.qml	2014-07-30 11:48:25 +0000
94
@@ -0,0 +1,103 @@
95
1
/*
96
2
 * Copyright 2014 Canonical Ltd.
97
3
 *
98
4
 * This program is free software; you can redistribute it and/or modify
99
5
 * it under the terms of the GNU Lesser General Public License as published by
100
6
 * the Free Software Foundation; version 3.
101
7
 *
102
8
 * This program is distributed in the hope that it will be useful,
103
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
104
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
105
11
 * GNU Lesser General Public License for more details.
106
12
 *
107
13
 * You should have received a copy of the GNU Lesser General Public License
108
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
109
15
 */
110
16
111
17
import QtQuick 2.2
112
18
import Ubuntu.Test 1.0
113
19
import Ubuntu.Components 1.1
114
20
115
21
// NOTE: Other parts of the page head API are tested with autopilot in
116
22
// ubuntuuitoolkit.tests.components.test_header
117
23
118
24
Item {
119
25
    width: units.gu(50)
120
26
    height: units.gu(80)
121
27
122
28
    MainView {
123
29
        id: mainView
124
30
        anchors.fill: parent
125
31
        useDeprecatedToolbar: false
126
32
127
33
        PageStack {
128
34
            id: pageStack
129
35
            Page {
130
36
                id: page1
131
37
                title: "First page"
132
38
            }
133
39
            Page {
134
40
                id: page2
135
41
                title: "Second page"
136
42
137
43
                Action {
138
44
                    id: customBackAction
139
45
                    iconName: "search"
140
46
                    text: "Search"
141
47
                }
142
48
                Action {
143
49
                    id: invisibleAction
144
50
                    visible: false
145
51
                }
146
52
            }
147
53
        }
148
54
        Component.onCompleted: {
149
55
            pageStack.push(page1);
150
56
        }
151
57
    }
152
58
153
59
    UbuntuTestCase {
154
60
        name: "HeaderBackButton"
155
61
        when: windowShown
156
62
        id: testCase
157
63
158
64
        property var app_header
159
65
        property var back_button
160
66
        property var custom_back_button
161
67
162
68
        function initTestCase() {
163
69
            testCase.app_header = findChild(mainView, "MainView_Header");
164
70
            testCase.back_button = findChild(app_header, "backButton");
165
71
            testCase.custom_back_button = findChild(app_header, "customBackButton");
166
72
167
73
            compare(page2.head.backAction, null, "Back action set by default.");
168
74
            compare(back_button.visible, false, "Back button visible with only 1 page on the stack.");
169
75
            compare(custom_back_button.visible, false, "Custom back button visible without custom back action.")
170
76
        }
171
77
172
78
        function test_default_back_button() {
173
79
            pageStack.push(page2);
174
80
            compare(back_button.visible, true, "Back button not visible with 2 pages on stack.");
175
81
            compare(custom_back_button.visible, false, "Showing custom back button without custom back action.");
176
82
            pageStack.pop();
177
83
        }
178
84
179
85
        function test_custom_back_button() {
180
86
            page2.head.backAction = customBackAction;
181
87
            pageStack.push(page2);
182
88
            compare(back_button.visible, false, "Default back button visible with custom back action.");
183
89
            compare(custom_back_button.visible, true, "Custom back button invisible with back action.");
184
90
            pageStack.pop();
185
91
            page2.head.backAction = null;
186
92
        }
187
93
188
94
        function test_no_back_button() {
189
95
            page2.head.backAction = invisibleAction;
190
96
            pageStack.push(page2);
191
97
            compare(back_button.visible, false, "Default back button visible with invisible custom back action.");
192
98
            compare(custom_back_button.visible, false, "Custom back button visible with invisible custom back action.");
193
99
            pageStack.pop();
194
100
            page2.head.backAction = null;
195
101
        }
196
102
    }
197
103
}
198
0
104
199
=== added file 'tests/unit_x11/tst_components/tst_icon.qml'
200
--- tests/unit_x11/tst_components/tst_icon.qml	1970-01-01 00:00:00 +0000
201
+++ tests/unit_x11/tst_components/tst_icon.qml	2014-07-30 11:48:25 +0000
202
@@ -0,0 +1,62 @@
203
1
/*
204
2
 * Copyright 2012 Canonical Ltd.
205
3
 *
206
4
 * This program is free software; you can redistribute it and/or modify
207
5
 * it under the terms of the GNU Lesser General Public License as published by
208
6
 * the Free Software Foundation; version 3.
209
7
 *
210
8
 * This program is distributed in the hope that it will be useful,
211
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
212
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
213
11
 * GNU Lesser General Public License for more details.
214
12
 *
215
13
 * You should have received a copy of the GNU Lesser General Public License
216
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
217
15
 */
218
16
219
17
import QtQuick 2.0
220
18
import QtTest 1.0
221
19
import Ubuntu.Components 1.1
222
20
223
21
Item {
224
22
    width: units.gu(50)
225
23
    height: units.gu(50)
226
24
227
25
    Row {
228
26
        anchors.centerIn: parent
229
27
        height: units.gu(10)
230
28
        width: childrenRect.width
231
29
232
30
        Icon {
233
31
            // Fails to load the icon when suru-icon-theme or libqt5svg5 are
234
32
            // not installed. This causes a warning and rejection
235
33
            // by jenkins continuous integration.
236
34
            name: "add"
237
35
            height: parent.height
238
36
            width: height
239
37
        }
240
38
        Icon {
241
39
            // Fails when the icon is becoming invisible when non-atomic updates
242
40
            // cause sourceSize.width or sourceSize.height to be 0 before other
243
41
            // properties are updated.
244
42
            id: icon
245
43
            width: visible ? units.gu(10) : 0
246
44
            height: width
247
45
            name: "search"
248
46
249
47
        }
250
48
    }
251
49
252
50
    TestCase {
253
51
        name: "Icon"
254
52
        when: windowShown
255
53
256
54
        function test_updateIconSize_bug1349769() {
257
55
            icon.visible = false;
258
56
            // causes "QML Image: Failed to get image from provider: image://theme/search"
259
57
            // warning and when sourceSize.width or sourceSize.height becomes 0 while
260
58
            // while still trying to render the icon. Tests will pass with the warning, but
261
59
            // the MR is rejected by jenkins continuous integration.
262
60
        }
263
61
    }
264
62
}
Status:	Superseded
Proposed branch:	lp:~tpeeters/ubuntu-ui-toolkit/noBackButton
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	264 lines (+197/-11) 6 files modified debian/control (+1/-0) modules/Ubuntu/Components/Icon.qml (+28/-8) modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+1/-1) tests/unit_x11/tst_components/tst_headActions.qml (+103/-0) tests/unit_x11/tst_components/tst_icon.qml (+62/-0)
To merge this branch:	bzr merge lp:~tpeeters/ubuntu-ui-toolkit/noBackButton
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-30
Cris Dywan		2014-07-28	Approve on 2014-07-29
Review via email: mp+228557@code.launchpad.net