1
=== modified file 'Components/PageHeader.qml'
2
--- Components/PageHeader.qml	2013-11-11 11:29:19 +0000
3
+++ Components/PageHeader.qml	2013-11-19 14:34:01 +0000
4
@@ -30,7 +30,7 @@
5
30
30
6
31
    property bool searchEntryEnabled: false
31
    property bool searchEntryEnabled: false
7
32
    property alias searchQuery: searchField.text
32
    property alias searchQuery: searchField.text
9
33
    property ListModel searchHistory: SearchHistoryModel {}
33
    property ListModel searchHistory
10
34
    property Scope scope
34
    property Scope scope
11
35
35
12
36
    height: units.gu(8.5)
36
    height: units.gu(8.5)
13
37
37
14
=== modified file 'Dash/Dash.qml'
15
--- Dash/Dash.qml	2013-10-25 11:24:50 +0000
16
+++ Dash/Dash.qml	2013-11-19 14:34:01 +0000
17
@@ -26,6 +26,8 @@
18
26
26
19
27
    visible: shown
27
    visible: shown
20
28
28
21
29
    property ListModel searchHistory: SearchHistoryModel {}
22
30
23
29
    property alias contentProgress: dashContent.contentProgress
31
    property alias contentProgress: dashContent.contentProgress
24
30
    property string showScopeOnLoaded: "home.scope"
32
    property string showScopeOnLoaded: "home.scope"
25
31
    property real contentScale: 1.0
33
    property real contentScale: 1.0
26
@@ -63,6 +65,7 @@
27
63
        anchors.fill: parent
65
        anchors.fill: parent
28
64
        model: filteredScopes
66
        model: filteredScopes
29
65
        scopes: scopes
67
        scopes: scopes
30
68
        searchHistory: dash.searchHistory
31
66
        onMovementStarted: dashbar.startNavigation()
69
        onMovementStarted: dashbar.startNavigation()
32
67
        onMovementEnded: dashbar.stopNavigation()
70
        onMovementEnded: dashbar.stopNavigation()
33
68
        onContentFlickStarted: dashbar.finishNavigation()
71
        onContentFlickStarted: dashbar.finishNavigation()
34
69
72
35
=== modified file 'Dash/DashApps.qml'
36
--- Dash/DashApps.qml	2013-10-03 11:48:24 +0000
37
+++ Dash/DashApps.qml	2013-11-19 14:34:01 +0000
38
@@ -30,6 +30,9 @@
39
30
    property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
30
    property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
40
31
    property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
31
    property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
41
32
32
42
33
    //FIXME an alias to itself shouldn't be required. More than likely a Qt bug. Try removing with newer Qt.
43
34
    property alias searchHistory: scopeView.searchHistory
44
35
45
33
    ListModel {
36
    ListModel {
46
34
        id: dummyVisibilityModifier
37
        id: dummyVisibilityModifier
47
35
38
48
36
39
49
=== modified file 'Dash/DashContent.qml'
50
--- Dash/DashContent.qml	2013-10-21 08:15:28 +0000
51
+++ Dash/DashContent.qml	2013-11-19 14:34:01 +0000
52
@@ -27,6 +27,7 @@
53
27
    property alias currentIndex: dashContentList.currentIndex
27
    property alias currentIndex: dashContentList.currentIndex
54
28
28
55
29
    property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
29
    property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
56
30
    property ListModel searchHistory
57
30
31
58
31
    signal movementStarted()
32
    signal movementStarted()
59
32
    signal movementEnded()
33
    signal movementEnded()
60
@@ -127,7 +128,7 @@
61
127
                onLoaded: {
128
                onLoaded: {
62
128
                    item.scope = Qt.binding(function() { return scope })
129
                    item.scope = Qt.binding(function() { return scope })
63
129
                    item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
130
                    item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
65
130
                    item.searchHistory = Qt.binding(function() { return shell.searchHistory })
131
                    item.searchHistory = Qt.binding(function() { return dashContent.searchHistory })
66
131
                    dashContentList.movementStarted.connect(item.movementStarted)
132
                    dashContentList.movementStarted.connect(item.movementStarted)
67
132
                    dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
133
                    dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
68
133
                    dashContent.scopeLoaded(item.scope.id)
134
                    dashContent.scopeLoaded(item.scope.id)
69
134
135
70
=== modified file 'Dash/GenericScopeView.qml'
71
--- Dash/GenericScopeView.qml	2013-11-19 10:44:14 +0000
72
+++ Dash/GenericScopeView.qml	2013-11-19 14:34:01 +0000
73
@@ -293,6 +293,7 @@
74
293
            text: scopeView.scope.name
293
            text: scopeView.scope.name
75
294
            searchEntryEnabled: true
294
            searchEntryEnabled: true
76
295
            scope: scopeView.scope
295
            scope: scopeView.scope
77
296
            searchHistory: scopeView.searchHistory
78
296
        }
297
        }
79
297
    }
298
    }
80
298
299
81
299
300
82
=== modified file 'Shell.qml'
83
--- Shell.qml	2013-11-08 08:48:11 +0000
84
+++ Shell.qml	2013-11-19 14:34:01 +0000
85
@@ -61,8 +61,6 @@
86
61
        }
61
        }
87
62
    }
62
    }
88
63
63
89
64
    property ListModel searchHistory: SearchHistoryModel {}
90
65
91
66
    property var applicationManager: ApplicationManagerWrapper {}
64
    property var applicationManager: ApplicationManagerWrapper {}
92
67
65
93
68
    Binding {
66
    Binding {
94
69
67
95
=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
96
--- tests/qmltests/Components/tst_PageHeader.qml	2013-11-08 16:24:45 +0000
97
+++ tests/qmltests/Components/tst_PageHeader.qml	2013-11-19 14:34:01 +0000
98
@@ -214,6 +214,7 @@
99
214
            scope: scopeMock
214
            scope: scopeMock
100
215
215
101
216
            searchEntryEnabled: true
216
            searchEntryEnabled: true
102
217
            searchHistory: SearchHistoryModel {}
103
217
            text: "%^$%^%^&%^&%^$%GHR%"
218
            text: "%^$%^%^&%^&%^$%GHR%"
104
218
        }
219
        }
105
219
220
106
220
221
107
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
108
--- tests/qmltests/Dash/tst_DashContent.qml	2013-11-14 14:59:16 +0000
109
+++ tests/qmltests/Dash/tst_DashContent.qml	2013-11-19 14:34:01 +0000
110
@@ -26,8 +26,6 @@
111
26
    width: units.gu(40)
26
    width: units.gu(40)
112
27
    height: units.gu(80)
27
    height: units.gu(80)
113
28
28
114
29
    property ListModel searchHistory: ListModel {}
115
30
116
31
    Item {
29
    Item {
117
32
        // Fake. Make a few components less noisy
30
        // Fake. Make a few components less noisy
118
33
        id: greeter
31
        id: greeter
119
@@ -60,6 +58,7 @@
120
60
        scopes : scopesModel
58
        scopes : scopesModel
121
61
59
122
62
        scopeMapper : scopeDelegateMapper
60
        scopeMapper : scopeDelegateMapper
123
61
        searchHistory: ListModel {}
124
63
    }
62
    }
125
64
63
126
65
    ScopeDelegateMapper {
64
    ScopeDelegateMapper {
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-21
Albert Astals Cid (community)			Approve on 2013-11-20
Michał Sawicz		2013-11-05	Pending
Review via email: mp+193935@code.launchpad.net