1
=== modified file 'qml/Components/PageHeader.qml'
2
--- qml/Components/PageHeader.qml	2014-07-31 16:49:50 +0000
3
+++ qml/Components/PageHeader.qml	2014-08-01 11:23:19 +0000
4
@@ -35,6 +35,8 @@
5
35
    property bool searchInProgress: false
35
    property bool searchInProgress: false
6
36
36
7
37
    property alias bottomItem: bottomContainer.children
37
    property alias bottomItem: bottomContainer.children
8
38
    property int paginationCount: 0
9
39
    property int paginationIndex: -1
10
38
40
11
39
    // TODO We should use foreground for the icons
41
    // TODO We should use foreground for the icons
12
40
    // of the toolbar but unfortunately Action does not have
42
    // of the toolbar but unfortunately Action does not have
13
@@ -294,6 +296,25 @@
14
294
        }
296
        }
15
295
    }
297
    }
16
296
298
17
299
    Row {
18
300
        spacing: units.gu(.5)
19
301
        Repeater {
20
302
            objectName: "paginationRepeater"
21
303
            model: root.paginationCount
22
304
            Image {
23
305
                objectName: "paginationDots_" + index
24
306
                height: units.gu(1)
25
307
                width: height
26
308
                source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
27
309
            }
28
310
        }
29
311
        anchors {
30
312
            top: headerContainer.bottom
31
313
            horizontalCenter: headerContainer.horizontalCenter
32
314
            topMargin: units.gu(.5)
33
315
        }
34
316
    }
35
317
36
297
    Component {
318
    Component {
37
298
        id: popoverComponent
319
        id: popoverComponent
38
299
        Popover {
320
        Popover {
39
300
321
40
=== added file 'qml/Components/graphics/pagination_dot_off@30.png'
41
301
Binary files qml/Components/graphics/pagination_dot_off@30.png	1970-01-01 00:00:00 +0000 and qml/Components/graphics/pagination_dot_off@30.png	2014-08-01 11:23:19 +0000 differ
322
Binary files qml/Components/graphics/pagination_dot_off@30.png	1970-01-01 00:00:00 +0000 and qml/Components/graphics/pagination_dot_off@30.png	2014-08-01 11:23:19 +0000 differ
42
=== added file 'qml/Components/graphics/pagination_dot_on@30.png'
43
302
Binary files qml/Components/graphics/pagination_dot_on@30.png	1970-01-01 00:00:00 +0000 and qml/Components/graphics/pagination_dot_on@30.png	2014-08-01 11:23:19 +0000 differ
323
Binary files qml/Components/graphics/pagination_dot_on@30.png	1970-01-01 00:00:00 +0000 and qml/Components/graphics/pagination_dot_on@30.png	2014-08-01 11:23:19 +0000 differ
44
=== modified file 'qml/Dash/DashContent.qml'
45
--- qml/Dash/DashContent.qml	2014-07-24 23:31:44 +0000
46
+++ qml/Dash/DashContent.qml	2014-08-01 11:23:19 +0000
47
@@ -143,6 +143,8 @@
48
143
                        item.scope = Qt.binding(function() { return scope })
143
                        item.scope = Qt.binding(function() { return scope })
49
144
                        item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
144
                        item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
50
145
                        dashContent.scopeLoaded(item.scope.id)
145
                        dashContent.scopeLoaded(item.scope.id)
51
146
                        item.paginationCount = Qt.binding(function() { return dashContentList.count } )
52
147
                        item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
53
146
                    }
148
                    }
54
147
                    Connections {
149
                    Connections {
55
148
                        target: isCurrent ? scope : null
150
                        target: isCurrent ? scope : null
56
149
151
57
=== modified file 'qml/Dash/GenericScopeView.qml'
58
--- qml/Dash/GenericScopeView.qml	2014-07-25 11:49:28 +0000
59
+++ qml/Dash/GenericScopeView.qml	2014-08-01 11:23:19 +0000
60
@@ -32,6 +32,8 @@
61
32
    property bool hasBackAction: false
32
    property bool hasBackAction: false
62
33
    property bool enableHeightBehaviorOnNextCreation: false
33
    property bool enableHeightBehaviorOnNextCreation: false
63
34
    property var categoryView: categoryView
34
    property var categoryView: categoryView
64
35
    property alias paginationCount: pageHeader.paginationCount
65
36
    property alias paginationIndex: pageHeader.paginationIndex
66
35
37
67
36
    property var scopeStyle: ScopeStyle {
38
    property var scopeStyle: ScopeStyle {
68
37
        style: scope ? scope.customizations : {}
39
        style: scope ? scope.customizations : {}
69
38
40
70
=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
71
--- tests/qmltests/Components/tst_PageHeader.qml	2014-07-28 09:14:23 +0000
72
+++ tests/qmltests/Components/tst_PageHeader.qml	2014-08-01 11:23:19 +0000
73
@@ -192,6 +192,27 @@
74
192
                    ];
192
                    ];
75
193
        }
193
        }
76
194
194
77
195
        function test_pagination() {
78
196
            var paginationRepeater = findChild(pageHeader, "paginationRepeater");
79
197
            tryCompare(paginationRepeater, "count", 0);
80
198
            pageHeader.paginationCount = 5;
81
199
            tryCompare(paginationRepeater, "count", 5);
82
200
            for (var i=0; i<pageHeader.paginationCount; i++) {
83
201
                pageHeader.paginationIndex = i;
84
202
                for (var j=0; j<paginationRepeater.count; j++) {
85
203
                    var paginationDot = findChild(pageHeader, "paginationDots_"+j);
86
204
                    if (i==j) {
87
205
                        compare(paginationDot.source.toString().indexOf("pagination_dot_on") > -1, true);
88
206
                    } else {
89
207
                        compare(paginationDot.source.toString().indexOf("pagination_dot_off") > -1, true);
90
208
                    }
91
209
                }
92
210
            }
93
211
            pageHeader.paginationIndex = -1;
94
212
            pageHeader.paginationCount = 0;
95
213
            tryCompare(paginationRepeater, "count", 0);
96
214
        }
97
215
98
195
        function test_popup_closing(data) {
216
        function test_popup_closing(data) {
99
196
            searchEnabled = true;
217
            searchEnabled = true;
100
197
            pageHeader.searchHistory.clear();
218
            pageHeader.searchHistory.clear();
Status:	Merged
Approved by:	Michał Sawicz on 2014-08-05
Approved revision:	1092
Merged at revision:	1119
Proposed branch:	lp:~paulliu/unity8/divider20140729
Merge into:	lp:unity8
Diff against target:	100 lines (+46/-0) 4 files modified qml/Components/PageHeader.qml (+21/-0) qml/Dash/DashContent.qml (+2/-0) qml/Dash/GenericScopeView.qml (+2/-0) tests/qmltests/Components/tst_PageHeader.qml (+21/-0)
To merge this branch:	bzr merge lp:~paulliu/unity8/divider20140729
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-08-06
Michał Sawicz		2014-07-29	Approve on 2014-08-04
Albert Astals Cid (community)			Abstain on 2014-08-04
Review via email: mp+228708@code.launchpad.net