1
=== modified file 'components.api'
2
--- components.api	2014-05-28 18:08:33 +0000
3
+++ components.api	2014-06-19 14:03:36 +0000
4
@@ -63,18 +63,8 @@
5
63
    property size sourceSize
63
    property size sourceSize
6
64
    readonly property int status
64
    readonly property int status
7
65
Header 0.1 1.0
65
Header 0.1 1.0
20
66
StyledItem
66
AppHeader
21
67
    property bool animate
67
    property string _for_autopilot
10
68
    function show()
11
69
    function hide()
12
70
    property string title
13
71
    property Item contents
14
72
    property var tabsModel
15
73
    property var pageStack
16
74
    property var actions
17
75
    property var __customBackAction
18
76
    property Flickable flickable
19
77
    property bool useDeprecatedToolbar
22
78
Icon 0.1 1.0
68
Icon 0.1 1.0
23
79
Item
69
Item
24
80
    property string name
70
    property string name
25
81
71
26
=== renamed file 'modules/Ubuntu/Components/Header.qml' => 'modules/Ubuntu/Components/AppHeader.qml'
27
--- modules/Ubuntu/Components/Header.qml	2014-05-06 10:24:56 +0000
28
+++ modules/Ubuntu/Components/AppHeader.qml	2014-06-19 14:03:36 +0000
29
@@ -19,7 +19,7 @@
30
19
19
31
20
/*!
20
/*!
32
21
    \internal
21
    \internal
34
22
    \qmltype Header
22
    \qmltype AppHeader
35
23
    \inqmlmodule Ubuntu.Components 1.1
23
    \inqmlmodule Ubuntu.Components 1.1
36
24
    \ingroup ubuntu
24
    \ingroup ubuntu
37
25
*/
25
*/
38
26
26
39
=== added file 'modules/Ubuntu/Components/Header.qml'
40
--- modules/Ubuntu/Components/Header.qml	1970-01-01 00:00:00 +0000
41
+++ modules/Ubuntu/Components/Header.qml	2014-06-19 14:03:36 +0000
42
@@ -0,0 +1,39 @@
43
1
/*
44
2
 * Copyright 2014 Canonical Ltd.
45
3
 *
46
4
 * This program is free software; you can redistribute it and/or modify
47
5
 * it under the terms of the GNU Lesser General Public License as published by
48
6
 * the Free Software Foundation; version 3.
49
7
 *
50
8
 * This program is distributed in the hope that it will be useful,
51
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
52
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
53
11
 * GNU Lesser General Public License for more details.
54
12
 *
55
13
 * You should have received a copy of the GNU Lesser General Public License
56
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
57
15
 */
58
16
59
17
import QtQuick 2.0
60
18
61
19
/*!
62
20
    \qmltype Header
63
21
    \internal
64
22
    \deprecated
65
23
*/
66
24
AppHeader {
67
25
68
26
    /*!
69
27
      \internal
70
28
      We need this property so QML exposes this class as Header instead of
71
29
      AppHeader. This way autopilot can select the deprecated header.
72
30
    */
73
31
    property string _for_autopilot
74
32
75
33
    Component.onCompleted: {
76
34
        print("WARNING: Header is an internal component of Ubuntu.Components and" +
77
35
              "its API may change or be removed at any moment." +
78
36
              "Please use MainView and Page instead."
79
37
              );
80
38
    }
81
39
}
82
0
40
83
=== modified file 'modules/Ubuntu/Components/MainView.qml'
84
--- modules/Ubuntu/Components/MainView.qml	2014-05-09 23:03:21 +0000
85
+++ modules/Ubuntu/Components/MainView.qml	2014-06-19 14:03:36 +0000
86
@@ -334,7 +334,7 @@
87
334
          The header of the MainView. Can be used to obtain the height of the header
334
          The header of the MainView. Can be used to obtain the height of the header
88
335
          in \l Page to determine the area for the \l Page to fill.
335
          in \l Page to determine the area for the \l Page to fill.
89
336
         */
336
         */
91
337
        Header {
337
        AppHeader {
92
338
            // FIXME We need to set an object name to this header in order to differentiate it from the ListItem.Header on Autopilot tests.
338
            // FIXME We need to set an object name to this header in order to differentiate it from the ListItem.Header on Autopilot tests.
93
339
            // This is a temporary workaround while we find a better solution for https://bugs.launchpad.net/autopilot/+bug/1210265
339
            // This is a temporary workaround while we find a better solution for https://bugs.launchpad.net/autopilot/+bug/1210265
94
340
            // --elopio - 2013-08-08
340
            // --elopio - 2013-08-08
95
@@ -479,7 +479,7 @@
96
479
          The header that will be propagated to the children in the page tree node.
479
          The header that will be propagated to the children in the page tree node.
97
480
          It is used by Tabs to bind header's tabsModel.
480
          It is used by Tabs to bind header's tabsModel.
98
481
         */
481
         */
100
482
        property Header header: headerItem
482
        property AppHeader header: headerItem
101
483
483
102
484
        /*!
484
        /*!
103
485
          \internal
485
          \internal
104
486
486
105
=== modified file 'modules/Ubuntu/Components/Page.qml'
106
--- modules/Ubuntu/Components/Page.qml	2014-05-23 09:27:57 +0000
107
+++ modules/Ubuntu/Components/Page.qml	2014-06-19 14:03:36 +0000
108
@@ -174,7 +174,7 @@
109
174
            actionContext.active = page.active;
174
            actionContext.active = page.active;
110
175
        }
175
        }
111
176
176
113
177
        property Header header: page.__propagated && page.__propagated.header ? page.__propagated.header : null
177
        property AppHeader header: page.__propagated && page.__propagated.header ? page.__propagated.header : null
114
178
        // Used to position the Page when there is no flickable.
178
        // Used to position the Page when there is no flickable.
115
179
        // When there is a flickable, the header will automatically position it.
179
        // When there is a flickable, the header will automatically position it.
116
180
        property real headerHeight: internal.header && internal.header.visible ? internal.header.height : 0
180
        property real headerHeight: internal.header && internal.header.visible ? internal.header.height : 0
117
@@ -189,7 +189,7 @@
118
189
            target: tools
189
            target: tools
119
190
            property: "visible"
190
            property: "visible"
120
191
            value: false
191
            value: false
122
192
            when: header && !header.useDeprecatedToolbar &&
192
            when: internal.header && !internal.header.useDeprecatedToolbar &&
123
193
                  page.tools !== null
193
                  page.tools !== null
124
194
        }
194
        }
125
195
195
126
196
196
127
=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
128
--- modules/Ubuntu/Components/PageTreeNode.qml	2014-05-16 11:33:37 +0000
129
+++ modules/Ubuntu/Components/PageTreeNode.qml	2014-06-19 14:03:36 +0000
130
@@ -43,14 +43,14 @@
131
43
    /*!
43
    /*!
132
44
      \deprecated
44
      \deprecated
133
45
      The header of the node. Propagates down from the root node.
45
      The header of the node. Propagates down from the root node.
135
46
      This property is deprecated.
46
      This property is DEPRECATED.
136
47
     */
47
     */
138
48
    property Header header: node.__propagated ? node.__propagated.header : null
48
    property AppHeader header: node.__propagated ? node.__propagated.header : null
139
49
49
140
50
    /*!
50
    /*!
141
51
      \deprecated
51
      \deprecated
142
52
      The toolbar of the node. Propagates down from the root node.
52
      The toolbar of the node. Propagates down from the root node.
144
53
      This property is deprecated.
53
      This property is DEPRECATED.
145
54
     */
54
     */
146
55
    property Toolbar toolbar: node.__propagated ? node.__propagated.toolbar : null
55
    property Toolbar toolbar: node.__propagated ? node.__propagated.toolbar : null
147
56
56
148
@@ -109,6 +109,7 @@
149
109
109
150
110
    Item {
110
    Item {
151
111
        id: internal
111
        id: internal
152
112
153
112
        function isPageTreeNode(object) {
113
        function isPageTreeNode(object) {
154
113
            // FIXME: Use QuickUtils.className() when it becomes available.
114
            // FIXME: Use QuickUtils.className() when it becomes available.
155
114
            return (object && object.hasOwnProperty("__isPageTreeNode") && object.__isPageTreeNode);
115
            return (object && object.hasOwnProperty("__isPageTreeNode") && object.__isPageTreeNode);
156
115
116
157
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
158
--- modules/Ubuntu/Components/Tabs.qml	2014-05-10 15:54:11 +0000
159
+++ modules/Ubuntu/Components/Tabs.qml	2014-06-19 14:03:36 +0000
160
@@ -303,7 +303,7 @@
161
303
303
162
304
    Object {
304
    Object {
163
305
        id: internal
305
        id: internal
165
306
        property Header header: tabs.__propagated ? tabs.__propagated.header : null
306
        property AppHeader header: tabs.__propagated ? tabs.__propagated.header : null
166
307
307
167
308
        /*
308
        /*
168
309
          List of connected Repeaters to avoid repeater "hammering" of itemAdded() signal.
309
          List of connected Repeaters to avoid repeater "hammering" of itemAdded() signal.
169
310
310
170
=== modified file 'modules/Ubuntu/Components/qmldir'
171
--- modules/Ubuntu/Components/qmldir	2014-05-28 18:08:33 +0000
172
+++ modules/Ubuntu/Components/qmldir	2014-06-19 14:03:36 +0000
173
@@ -29,6 +29,7 @@
174
29
internal PageTreeNode PageTreeNode.qml
29
internal PageTreeNode PageTreeNode.qml
175
30
PageStack 0.1 PageStack.qml
30
PageStack 0.1 PageStack.qml
176
31
internal Toolbar Toolbar.qml
31
internal Toolbar Toolbar.qml
177
32
internal AppHeader AppHeader.qml
178
32
Header 0.1 Header.qml
33
Header 0.1 Header.qml
179
33
internal AnimatedItem AnimatedItem.qml
34
internal AnimatedItem AnimatedItem.qml
180
34
internal PageWrapper PageWrapper.qml
35
internal PageWrapper PageWrapper.qml
181
35
36
182
=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
183
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-05-09 04:12:25 +0000
184
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-06-19 14:03:36 +0000
185
@@ -18,6 +18,7 @@
186
18
18
187
19
19
188
20
__all__ = [
20
__all__ = [
189
21
    'AppHeader',
190
21
    'base',
22
    'base',
191
22
    'check_autopilot_version',
23
    'check_autopilot_version',
192
23
    'CheckBox',
24
    'CheckBox',
193
@@ -52,6 +53,7 @@
194
52
    tests,
53
    tests,
195
53
)
54
)
196
54
from ubuntuuitoolkit._custom_proxy_objects import (
55
from ubuntuuitoolkit._custom_proxy_objects import (
197
56
    AppHeader,
198
55
    check_autopilot_version,
57
    check_autopilot_version,
199
56
    CheckBox,
58
    CheckBox,
200
57
    get_keyboard,
59
    get_keyboard,
201
58
60
202
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
203
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-05-09 04:12:25 +0000
204
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-06-19 14:03:36 +0000
205
@@ -18,6 +18,7 @@
206
18
18
207
19
19
208
20
__all__ = [
20
__all__ = [
209
21
    'AppHeader',
210
21
    'check_autopilot_version',
22
    'check_autopilot_version',
211
22
    'CheckBox',
23
    'CheckBox',
212
23
    'get_keyboard',
24
    'get_keyboard',
213
@@ -47,7 +48,10 @@
214
47
    UbuntuUIToolkitCustomProxyObjectBase,
48
    UbuntuUIToolkitCustomProxyObjectBase,
215
48
)
49
)
216
49
from ubuntuuitoolkit._custom_proxy_objects._flickable import QQuickFlickable
50
from ubuntuuitoolkit._custom_proxy_objects._flickable import QQuickFlickable
218
50
from ubuntuuitoolkit._custom_proxy_objects._header import Header
51
from ubuntuuitoolkit._custom_proxy_objects._header import (
219
52
    AppHeader,
220
53
    Header,
221
54
)
222
51
from ubuntuuitoolkit._custom_proxy_objects import listitems
55
from ubuntuuitoolkit._custom_proxy_objects import listitems
223
52
from ubuntuuitoolkit._custom_proxy_objects._mainview import MainView
56
from ubuntuuitoolkit._custom_proxy_objects._mainview import MainView
224
53
from ubuntuuitoolkit._custom_proxy_objects._optionselector import (
57
from ubuntuuitoolkit._custom_proxy_objects._optionselector import (
225
54
58
226
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
227
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-06-04 07:05:01 +0000
228
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-06-19 14:03:36 +0000
229
@@ -31,8 +31,8 @@
230
31
logger = logging.getLogger(__name__)
31
logger = logging.getLogger(__name__)
231
32
32
232
33
33
235
34
class Header(_common.UbuntuUIToolkitCustomProxyObjectBase):
34
class AppHeader(_common.UbuntuUIToolkitCustomProxyObjectBase):
236
35
    """Header Autopilot emulator."""
35
    """AppHeader Autopilot emulator."""
237
36
36
238
37
    def _show_if_not_visible(self):
37
    def _show_if_not_visible(self):
239
38
        if not self._is_visible():
38
        if not self._is_visible():
240
@@ -132,7 +132,7 @@
241
132
132
242
133
        if self.useDeprecatedToolbar:
133
        if self.useDeprecatedToolbar:
243
134
            raise _common.ToolkitException(
134
            raise _common.ToolkitException(
245
135
                "Header.swtich_to_tab_by_index only works with new header")
135
                "AppHeader.switch_to_tab_by_index only works with new header")
246
136
        else:
136
        else:
247
137
            self._switch_to_tab_in_drawer_by_index(index)
137
            self._switch_to_tab_in_drawer_by_index(index)
248
138
138
249
@@ -204,3 +204,14 @@
250
204
        # to find the requested button
204
        # to find the requested button
251
205
        return self.get_root_instance().select_single(
205
        return self.get_root_instance().select_single(
252
206
            'Standard', objectName=object_name)
206
            'Standard', objectName=object_name)
253
207
254
208
255
209
class Header(AppHeader):
256
210
    """Autopilot helper for the deprecated Header."""
257
211
258
212
    def __init__(self, *args):
259
213
        logger.warning(
260
214
            'Header is an internal QML component of Ubuntu.Components and '
261
215
            'its API may change or be removed at any moment. Please use '
262
216
            'MainView and Page instead.')
263
217
        super(Header, self).__init__(*args)
264
207
218
265
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
266
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-05-19 08:35:01 +0000
267
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-06-19 14:03:36 +0000
268
@@ -39,9 +39,10 @@
269
39
    """MainView Autopilot emulator."""
39
    """MainView Autopilot emulator."""
270
40
40
271
41
    def get_header(self):
41
    def get_header(self):
273
42
        """Return the Header emulator of the MainView."""
42
        """Return the AppHeader emulator of the MainView."""
274
43
        try:
43
        try:
276
44
            return self.select_single('Header', objectName='MainView_Header')
44
            return self.select_single(
277
45
                'AppHeader', objectName='MainView_Header')
278
45
        except dbus.StateNotFoundError:
46
        except dbus.StateNotFoundError:
279
46
            raise _common.ToolkitException('The main view has no header.')
47
            raise _common.ToolkitException('The main view has no header.')
280
47
48
281
48
49
282
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
283
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-06-09 17:20:43 +0000
284
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-06-19 14:03:36 +0000
285
@@ -150,7 +150,7 @@
286
150
150
287
151
    def checkPageHeader(self, pageTitle):
151
    def checkPageHeader(self, pageTitle):
288
152
        orientationHelper = self.getOrientationHelper()
152
        orientationHelper = self.getOrientationHelper()
290
153
        header = orientationHelper.select_many("Header", title=pageTitle)[0]
153
        header = orientationHelper.select_single("AppHeader", title=pageTitle)
291
154
        self.assertThat(header, Not(Is(None)))
154
        self.assertThat(header, Not(Is(None)))
292
155
        self.assertThat(header.visible, Eventually(Equals(True)))
155
        self.assertThat(header.visible, Eventually(Equals(True)))
293
156
        return header
156
        return header
294
157
157
295
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderTestCase.qml'
296
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderTestCase.qml	1970-01-01 00:00:00 +0000
297
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderTestCase.qml	2014-06-19 14:03:36 +0000
298
@@ -0,0 +1,27 @@
299
1
/*
300
2
 * Copyright 2014 Canonical Ltd.
301
3
 *
302
4
 * This program is free software; you can redistribute it and/or modify
303
5
 * it under the terms of the GNU Lesser General Public License as published by
304
6
 * the Free Software Foundation; version 3.
305
7
 *
306
8
 * This program is distributed in the hope that it will be useful,
307
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
308
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
309
11
 * GNU Lesser General Public License for more details.
310
12
 *
311
13
 * You should have received a copy of the GNU Lesser General Public License
312
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
313
15
 */
314
16
315
17
import QtQuick 2.0
316
18
import Ubuntu.Components 1.1
317
19
318
20
Item {
319
21
320
22
    objectName: 'main'
321
23
322
24
    Header {
323
25
        title: 'test'
324
26
    }
325
27
}
326
0
28
327
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
328
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-06-05 21:21:44 +0000
329
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-06-19 14:03:36 +0000
330
@@ -14,8 +14,12 @@
331
14
# You should have received a copy of the GNU Lesser General Public License
14
# You should have received a copy of the GNU Lesser General Public License
332
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
333
16
16
334
17
import logging
335
17
import os
18
import os
336
18
19
337
20
import fixtures
338
21
from testtools.matchers import Contains
339
22
340
19
import ubuntuuitoolkit
23
import ubuntuuitoolkit
341
20
from ubuntuuitoolkit import tests
24
from ubuntuuitoolkit import tests
342
21
from testtools.matchers import Equals
25
from testtools.matchers import Equals
343
@@ -133,7 +137,7 @@
344
133
        self.assertEqual(self.label.text, 'No button clicked.')
137
        self.assertEqual(self.label.text, 'No button clicked.')
345
134
138
346
135
    def test_header_custom_proxy_object(self):
139
    def test_header_custom_proxy_object(self):
348
136
        self.assertIsInstance(self.header, ubuntuuitoolkit.Header)
140
        self.assertIsInstance(self.header, ubuntuuitoolkit.AppHeader)
349
137
        self.assertTrue(self.header.visible)
141
        self.assertTrue(self.header.visible)
350
138
        self.assertEqual(self.header.title, "Test title")
142
        self.assertEqual(self.header.title, "Test title")
351
139
143
352
@@ -212,4 +216,27 @@
353
212
216
354
213
        """
217
        """
355
214
        header = self.main_view.get_header()
218
        header = self.main_view.get_header()
357
215
        self.assertIsInstance(header, ubuntuuitoolkit.Header)
219
        self.assertIsInstance(header, ubuntuuitoolkit.AppHeader)
358
220
359
221
360
222
class DeprecatedHeaderTestCase(tests.QMLFileAppTestCase):
361
223
362
224
    path = os.path.abspath(__file__)
363
225
    dir_path = os.path.dirname(path)
364
226
    test_qml_file_path = os.path.join(
365
227
        dir_path, 'test_header.DeprecatedHeaderTestCase.qml')
366
228
367
229
    @property
368
230
    def main_view(self):
369
231
        return self.app.select_single('QQuickItem', objectName='main')
370
232
371
233
    def test_get_deprecated_header_must_log_deprecation_warning(self):
372
234
        fake_logger = fixtures.FakeLogger(level=logging.WARNING)
373
235
        self.useFixture(fake_logger)
374
236
        self.main_view.select_single(ubuntuuitoolkit.Header)
375
237
        self.assertThat(
376
238
            fake_logger.output,
377
239
            Contains(
378
240
                'Header is an internal QML component of Ubuntu.Components and '
379
241
                'its API may change or be removed at any moment. Please use '
380
242
                'MainView and Page instead.'))
381
216
243
382
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py'
383
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2014-04-25 16:43:00 +0000
384
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2014-06-19 14:03:36 +0000
385
@@ -116,7 +116,8 @@
386
116
116
387
117
    def test_switch_to_opened_tab_is_not_opened_again(self):
117
    def test_switch_to_opened_tab_is_not_opened_again(self):
388
118
        with mock.patch.object(
118
        with mock.patch.object(
390
119
                ubuntuuitoolkit.Header, 'switch_to_next_tab') as mock_switch:
119
                ubuntuuitoolkit.AppHeader,
391
120
                'switch_to_next_tab') as mock_switch:
392
120
            current_tab = self.main_view.switch_to_tab_by_index(0)
121
            current_tab = self.main_view.switch_to_tab_by_index(0)
393
121
122
394
122
        self.assertFalse(mock_switch.called)
123
        self.assertFalse(mock_switch.called)
395
123
124
396
=== modified file 'tests/unit/tst_components/tst_pagestack.qml'
397
--- tests/unit/tst_components/tst_pagestack.qml	2014-05-10 16:32:59 +0000
398
+++ tests/unit/tst_components/tst_pagestack.qml	2014-06-19 14:03:36 +0000
399
@@ -69,11 +69,11 @@
400
69
69
401
70
    function test_title_bug1143345_bug1317902() {
70
    function test_title_bug1143345_bug1317902() {
402
71
        pageStack.push(page1);
71
        pageStack.push(page1);
404
72
        compare(mainView.__propagated.header.title, "Title 1", "Header is correctly set by page");
72
        compare(mainView.__propagated.header.title, "Title 1", "Header title is correctly set by page");
405
73
        page1.title = "New title";
73
        page1.title = "New title";
406
74
        compare(mainView.__propagated.header.title, "New title", "Header title correctly updated by page");
74
        compare(mainView.__propagated.header.title, "New title", "Header title correctly updated by page");
407
75
        pageStack.push(page2);
75
        pageStack.push(page2);
409
76
        compare(mainView.__propagated.header.title, "Title 2", "Header is correctly set by page");
76
        compare(mainView.__propagated.header.title, "Title 2", "Header title is correctly set by page");
410
77
        pageStack.clear();
77
        pageStack.clear();
411
78
        page1.title = "Title 1";
78
        page1.title = "Title 1";
412
79
79
Status:	Superseded
Proposed branch:	lp:~tpeeters/ubuntu-ui-toolkit/98-DeprecateHeader
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~bzoltan/ubuntu-ui-toolkit/landing_28-05
Diff against target:	411 lines (+137/-33) 17 files modified components.api (+2/-12) modules/Ubuntu/Components/AppHeader.qml (+1/-1) modules/Ubuntu/Components/Header.qml (+39/-0) modules/Ubuntu/Components/MainView.qml (+2/-2) modules/Ubuntu/Components/Page.qml (+2/-2) modules/Ubuntu/Components/PageTreeNode.qml (+4/-3) modules/Ubuntu/Components/Tabs.qml (+1/-1) modules/Ubuntu/Components/qmldir (+1/-0) tests/autopilot/ubuntuuitoolkit/__init__.py (+2/-0) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+5/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+14/-3) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py (+3/-2) tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderTestCase.qml (+27/-0) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+29/-2) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+2/-1) tests/unit/tst_components/tst_pagestack.qml (+2/-2)
To merge this branch:	bzr merge lp:~tpeeters/ubuntu-ui-toolkit/98-DeprecateHeader
Related bugs:	Link a bug report
Related blueprints:	New header and bottom edge (Essential)
Reviewer	Review Type	Date Requested	Status
Cris Dywan			Approve on 2014-06-20
PS Jenkins bot	continuous-integration		Approve on 2014-06-19
Zsombor Egri		2014-06-03	Approve on 2014-06-18
Review via email: mp+221935@code.launchpad.net