1
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
2
--- modules/Ubuntu/Components/Tabs.qml	2013-07-10 15:59:20 +0000
3
+++ modules/Ubuntu/Components/Tabs.qml	2013-07-25 08:32:24 +0000
4
@@ -91,6 +91,59 @@
5
91
    It is possible to use a Repeater to generate tabs, but when doing so, ensure that the Repeater
91
    It is possible to use a Repeater to generate tabs, but when doing so, ensure that the Repeater
6
92
    is declared inside the Tabs at the end, because otherwise the shuffling of
92
    is declared inside the Tabs at the end, because otherwise the shuffling of
7
93
    the order of children by the Repeater can cause incorrect ordering of the tabs.
93
    the order of children by the Repeater can cause incorrect ordering of the tabs.
8
94
9
95
    The \l {http://design.ubuntu.com/apps/global-patterns/navigation}{Navigation Patterns} specify that
10
96
    a tabs header should never be combined with the back button of a \l PageStack. The only way to
11
97
    combine Tabs and \l PageStack that avoids this is by pushing the Tabs as the first page on the
12
98
    \l PageStack, and pushing other pages on top of that, as is shown in the following example:
13
99
14
100
    \qml
15
101
        import QtQuick 2.0
16
102
        import Ubuntu.Components 0.1
17
103
18
104
        MainView {
19
105
            id: mainView
20
106
            width: units.gu(38)
21
107
            height: units.gu(50)
22
108
23
109
            PageStack {
24
110
                id: pageStack
25
111
                Component.onCompleted: push(tabs)
26
112
27
113
                Tabs {
28
114
                    id: tabs
29
115
                    Tab {
30
116
                        title: "Tab 1"
31
117
                        page: Page {
32
118
                            Button {
33
119
                                anchors.centerIn: parent
34
120
                                onClicked: pageStack.push(page3)
35
121
                                text: "Press"
36
122
                            }
37
123
                        }
38
124
                    }
39
125
                    Tab {
40
126
                        title: "Tab 2"
41
127
                        page: Page {
42
128
                            Label {
43
129
                                anchors.centerIn: parent
44
130
                                text: "Use header to navigate between tabs"
45
131
                            }
46
132
                        }
47
133
                    }
48
134
                }
49
135
                Page {
50
136
                    id: page3
51
137
                    visible: false
52
138
                    title: "Page on stack"
53
139
                    Label {
54
140
                        anchors.centerIn: parent
55
141
                        text: "Press back to return to the tabs"
56
142
                    }
57
143
                }
58
144
            }
59
145
        }
60
146
    \endqml
61
94
*/
147
*/
62
95
148
63
96
PageTreeNode {
149
PageTreeNode {
64
@@ -202,7 +255,7 @@
65
202
        target: internal.header
255
        target: internal.header
66
203
        property: "contents"
256
        property: "contents"
67
204
        value: tabs.active ? tabs.__headerContents : null
257
        value: tabs.active ? tabs.__headerContents : null
69
205
        when: internal.header
258
        when: internal.header && tabs.active
70
206
    }
259
    }
71
207
260
72
208
    style: Theme.createStyleComponent("TabsStyle.qml", tabs)
261
    style: Theme.createStyleComponent("TabsStyle.qml", tabs)
73
209
262
74
=== modified file 'tests/resources/pagestack/MyCustomPage.qml'
75
--- tests/resources/pagestack/MyCustomPage.qml	2013-05-01 22:26:31 +0000
76
+++ tests/resources/pagestack/MyCustomPage.qml	2013-07-25 08:32:24 +0000
77
@@ -35,14 +35,12 @@
78
35
        }
35
        }
79
36
    }
36
    }
80
37
37
83
38
    tools: ToolbarActions {
38
    tools: ToolbarItems {
84
39
        Action {
39
        ToolbarButton {
85
40
            text: "action 1"
40
            text: "action 1"
86
41
            iconSource: Qt.resolvedUrl("avatar_contacts_list.png")
87
42
        }
41
        }
89
43
        Action {
42
        ToolbarButton {
90
44
            text: "action 2"
43
            text: "action 2"
91
45
            iconSource: Qt.resolvedUrl("call_icon.png")
92
46
        }
44
        }
93
47
        opened: true
45
        opened: true
94
48
        locked: true
46
        locked: true
95
49
47
96
=== modified file 'tests/resources/pagestack/PageStack.qml'
97
--- tests/resources/pagestack/PageStack.qml	2013-05-02 19:18:09 +0000
98
+++ tests/resources/pagestack/PageStack.qml	2013-07-25 08:32:24 +0000
99
@@ -72,8 +72,8 @@
100
72
                }
72
                }
101
73
            }
73
            }
102
74
74
105
75
            tools: ToolbarActions {
75
            tools: ToolbarItems {
106
76
                Action {
76
                ToolbarButton {
107
77
                    text: "oh"
77
                    text: "oh"
108
78
                }
78
                }
109
79
            }
79
            }
110
80
80
111
=== added file 'tests/resources/pagestack/StackWithTabs.qml'
112
--- tests/resources/pagestack/StackWithTabs.qml	1970-01-01 00:00:00 +0000
113
+++ tests/resources/pagestack/StackWithTabs.qml	2013-07-25 08:32:24 +0000
114
@@ -0,0 +1,61 @@
115
1
/*
116
2
 * Copyright 2012 Canonical Ltd.
117
3
 *
118
4
 * This program is free software; you can redistribute it and/or modify
119
5
 * it under the terms of the GNU Lesser General Public License as published by
120
6
 * the Free Software Foundation; version 3.
121
7
 *
122
8
 * This program is distributed in the hope that it will be useful,
123
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
124
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
125
11
 * GNU Lesser General Public License for more details.
126
12
 *
127
13
 * You should have received a copy of the GNU Lesser General Public License
128
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
129
15
 */
130
16
131
17
import QtQuick 2.0
132
18
import Ubuntu.Components 0.1
133
19
134
20
MainView {
135
21
    id: mainView
136
22
    width: units.gu(38)
137
23
    height: units.gu(50)
138
24
139
25
    PageStack {
140
26
        id: pageStack
141
27
        Component.onCompleted: push(tabs)
142
28
143
29
        Tabs {
144
30
            id: tabs
145
31
            Tab {
146
32
                title: "Tab 1"
147
33
                page: Page {
148
34
                    Button {
149
35
                        anchors.centerIn: parent
150
36
                        onClicked: pageStack.push(page3)
151
37
                        text: "Press"
152
38
                    }
153
39
                }
154
40
            }
155
41
            Tab {
156
42
                title: "Tab 2"
157
43
                page: Page {
158
44
                    Label {
159
45
                        anchors.centerIn: parent
160
46
                        text: "Use header to navigate between tabs"
161
47
                    }
162
48
                }
163
49
            }
164
50
        }
165
51
        Page {
166
52
            id: page3
167
53
            visible: false
168
54
            title: "Page on stack"
169
55
            Label {
170
56
                anchors.centerIn: parent
171
57
                text: "Press back to return to the tabs"
172
58
            }
173
59
        }
174
60
    }
175
61
}
176
0
62
177
=== modified file 'tests/unit/tst_components/tst_pagestack.qml'
178
--- tests/unit/tst_components/tst_pagestack.qml	2013-05-22 09:38:09 +0000
179
+++ tests/unit/tst_components/tst_pagestack.qml	2013-07-25 08:32:24 +0000
180
@@ -81,6 +81,21 @@
181
81
        pageStack.clear();
81
        pageStack.clear();
182
82
    }
82
    }
183
83
83
184
84
    function test_tabs_inside_stack_bug1187850() {
185
85
        pageStack.push(tabs);
186
86
        compare(pageStack.currentPage, tabs, "Tabs can be pushed on a PageStack");
187
87
        compare(tabs.active, true, "Tabs on top of a PageStack are active");
188
88
        compare(mainView.__propagated.header.contents, tabs.__headerContents, "Pushing Tabs on PageStack updates the header contents");
189
89
        pageStack.push(page1);
190
90
        compare(pageStack.currentPage, page1, "A page can be pushed on top of a Tabs");
191
91
        compare(tabs.active, false, "Tabs on a PageStack, but not on top, are inactive");
192
92
        compare(mainView.__propagated.header.contents, null, "Contents of inactive Tabs is not applied to header");
193
93
        pageStack.pop();
194
94
        compare(tabs.active, true, "Tabs on top of PageStack is active");
195
95
        compare(mainView.__propagated.header.contents, tabs.__headerContents, "Active Tabs controls header contents");
196
96
        pageStack.clear();
197
97
    }
198
98
199
84
    MainView {
99
    MainView {
200
85
        id: mainView
100
        id: mainView
201
86
        PageStack {
101
        PageStack {
202
@@ -90,15 +105,19 @@
203
90
    Page {
105
    Page {
204
91
        id: page1
106
        id: page1
205
92
        title: "Title 1"
107
        title: "Title 1"
207
93
        tools: ToolbarActions {
108
        tools: ToolbarItems {
208
94
            id: tools1
109
            id: tools1
209
95
        }
110
        }
210
96
    }
111
    }
211
97
    Page {
112
    Page {
212
98
        id: page2
113
        id: page2
213
99
        title: "Title 2"
114
        title: "Title 2"
215
100
        tools: ToolbarActions {
115
        tools: ToolbarItems {
216
101
            id: tools2
116
            id: tools2
217
102
        }
117
        }
218
103
    }
118
    }
219
119
220
120
    Tabs {
221
121
        id: tabs
222
122
    }
223
104
}
123
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-07-25
Cris Dywan		2013-07-22	Approve on 2013-07-22
Review via email: mp+176152@code.launchpad.net