1
=== added file 'Components/IconUtil.js'
2
--- Components/IconUtil.js	1970-01-01 00:00:00 +0000
3
+++ Components/IconUtil.js	2013-06-19 20:05:35 +0000
4
@@ -0,0 +1,42 @@
5
1
/*
6
2
 * Copyright (C) 2013 Canonical, Ltd.
7
3
 *
8
4
 * This program is free software; you can redistribute it and/or modify
9
5
 * it under the terms of the GNU General Public License as published by
10
6
 * the Free Software Foundation; version 3.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 */
20
16
21
17
.pragma library
22
18
23
19
// FIXME: a quick hack to get icons out of gicons and fallback to
24
20
// base icon for annotated icons. Doesn't correctly handle all icons.
25
21
// Proper global solution needed.
26
22
function from_gicon(name) {
27
23
    var icon_name = name;
28
24
    var annotated_re = /^. UnityProtocolAnnotatedIcon/;
29
25
    if (annotated_re.test(name)) {
30
26
        var base_icon_re = /'base-icon':.+?'(.+?)'/;
31
27
        var base_icon = name.toString().match(base_icon_re);
32
28
        icon_name = base_icon[1];
33
29
    }
34
30
    else {
35
31
        var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;
36
32
        var themed = name.match(themed_re);
37
33
        if (themed) {
38
34
            return "image://gicon/" + themed[1];
39
35
        }
40
36
    }
41
37
    var remote_re = /^http/;
42
38
    if (remote_re.test(icon_name)) {
43
39
        return icon_name;
44
40
    }
45
41
    return "image://gicon/" + icon_name;
46
42
}
47
0
43
48
=== modified file 'Dash/Apps/ApplicationsFilterGrid.qml'
49
--- Dash/Apps/ApplicationsFilterGrid.qml	2013-06-05 22:03:08 +0000
50
+++ Dash/Apps/ApplicationsFilterGrid.qml	2013-06-19 20:05:35 +0000
51
@@ -35,7 +35,7 @@
52
35
        objectName: "delegate" + index
35
        objectName: "delegate" + index
53
36
        Application {
36
        Application {
54
37
            id: application
37
            id: application
56
38
            desktopFile: model.column_6 ? stripProtocol(model.column_6) : model.desktopFile // FIXME: this is temporary
38
            desktopFile: model.column_7 ? stripProtocol(model.column_7) : model.desktopFile // FIXME: this is temporary
57
39
39
58
40
            function stripProtocol(uri) {
40
            function stripProtocol(uri) {
59
41
                var chunks = uri.split('file://')
41
                var chunks = uri.split('file://')
60
@@ -47,7 +47,7 @@
61
47
47
62
48
        width: filterGrid.cellWidth
48
        width: filterGrid.cellWidth
63
49
        height: filterGrid.cellHeight
49
        height: filterGrid.cellHeight
65
50
        text: model.column_4 ? model.column_4 : application.name // FIXME: this is temporary
50
        text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
66
51
        imageWidth: units.gu(8)
51
        imageWidth: units.gu(8)
67
52
        imageHeight: units.gu(7.5)
52
        imageHeight: units.gu(7.5)
68
53
        source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
53
        source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
69
54
54
70
=== modified file 'Dash/Dash.qml'
71
--- Dash/Dash.qml	2013-06-07 09:22:34 +0000
72
+++ Dash/Dash.qml	2013-06-19 20:05:35 +0000
73
@@ -24,36 +24,36 @@
74
24
    id: dash
24
    id: dash
75
25
25
76
26
    property alias contentProgress: dashContent.contentProgress
26
    property alias contentProgress: dashContent.contentProgress
78
27
    property string showLensOnLoaded: "home.lens"
27
    property string showScopeOnLoaded: "home.scope"
79
28
    property real contentScale: 1.0
28
    property real contentScale: 1.0
80
29
29
81
30
    width: units.gu(40)
30
    width: units.gu(40)
82
31
    height: units.gu(71)
31
    height: units.gu(71)
83
32
32
98
33
    function setCurrentLens(lensId, animate, reset) {
33
    function setCurrentScope(scopeId, animate, reset) {
99
34
        var lensIndex = filteredLenses.findFirst(Lenses.RoleId, lensId)
34
        var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)
100
35
35
101
36
        if (lensIndex == -1) {
36
        if (scopeIndex == -1) {
102
37
            console.warn("No match for lens with id: %1".arg(lensId))
37
            console.warn("No match for scope with id: %1".arg(scopeId))
103
38
            return
38
            return
104
39
        }
39
        }
105
40
40
106
41
        if (lensIndex == dashContent.currentIndex && !reset) {
41
        if (scopeIndex == dashContent.currentIndex && !reset) {
107
42
            // the lens is already the current one
42
            // the scope is already the current one
108
43
            return
43
            return
109
44
        }
44
        }
110
45
45
111
46
        dashContent.setCurrentLensAtIndex(lensIndex, animate, reset)
46
        dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
112
47
    }
47
    }
113
48
48
114
49
    SortFilterProxyModel {
49
    SortFilterProxyModel {
118
50
        id: filteredLenses
50
        id: filteredScopes
119
51
        model: Lenses {
51
        model: Scopes {
120
52
            id: lenses
52
            id: scopes
121
53
        }
53
        }
122
54
        dynamicSortFilter: true
54
        dynamicSortFilter: true
123
55
55
125
56
        filterRole: Lenses.RoleVisible
56
        filterRole: Scopes.RoleVisible
126
57
        filterRegExp: RegExp("^true$")
57
        filterRegExp: RegExp("^true$")
127
58
    }
58
    }
128
59
59
129
@@ -61,17 +61,17 @@
130
61
        id: dashContent
61
        id: dashContent
131
62
        objectName: "dashContent"
62
        objectName: "dashContent"
132
63
        anchors.fill: parent
63
        anchors.fill: parent
135
64
        model: filteredLenses
64
        model: filteredScopes
136
65
        lenses: lenses
65
        scopes: scopes
137
66
        onMovementStarted: dashbar.startNavigation()
66
        onMovementStarted: dashbar.startNavigation()
138
67
        onMovementEnded: dashbar.stopNavigation()
67
        onMovementEnded: dashbar.stopNavigation()
139
68
        onContentFlickStarted: dashbar.finishNavigation()
68
        onContentFlickStarted: dashbar.finishNavigation()
140
69
        onContentEndReached: dashbar.finishNavigation()
69
        onContentEndReached: dashbar.finishNavigation()
141
70
        onPreviewShown: dashbar.finishNavigation()
70
        onPreviewShown: dashbar.finishNavigation()
146
71
        onLensLoaded: {
71
        onScopeLoaded: {
147
72
            if (lensId == dash.showLensOnLoaded) {
72
            if (scopeId == dash.showScopeOnLoaded) {
148
73
                dash.setCurrentLens(lensId, false, false)
73
                dash.setCurrentScope(scopeId, false, false)
149
74
                dash.showLensOnLoaded = ""
74
                dash.showScopeOnLoaded = ""
150
75
            }
75
            }
151
76
        }
76
        }
152
77
        scale: dash.contentScale
77
        scale: dash.contentScale
153
@@ -84,9 +84,9 @@
154
84
        anchors.bottom: parent.bottom
84
        anchors.bottom: parent.bottom
155
85
        anchors.left: parent.left
85
        anchors.left: parent.left
156
86
        anchors.right: parent.right
86
        anchors.right: parent.right
158
87
        model: filteredLenses
87
        model: filteredScopes
159
88
        currentIndex: dashContent.currentIndex
88
        currentIndex: dashContent.currentIndex
161
89
        onItemSelected: dashContent.setCurrentLensAtIndex(index, true, false)
89
        onItemSelected: dashContent.setCurrentScopeAtIndex(index, true, false)
162
90
        opacity: dash.contentScale == 1.0 ? 1.0 : 0.0
90
        opacity: dash.contentScale == 1.0 ? 1.0 : 0.0
163
91
        Behavior on opacity { NumberAnimation { easing.type: Easing.OutQuad; duration: 150 } }
91
        Behavior on opacity { NumberAnimation { easing.type: Easing.OutQuad; duration: 150 } }
164
92
    }
92
    }
165
93
93
166
=== modified file 'Dash/DashApps.qml'
167
--- Dash/DashApps.qml	2013-06-05 22:03:08 +0000
168
+++ Dash/DashApps.qml	2013-06-19 20:05:35 +0000
169
@@ -21,8 +21,8 @@
170
21
import "../Components/ListItems"
21
import "../Components/ListItems"
171
22
import "Apps"
22
import "Apps"
172
23
23
175
24
LensView {
24
ScopeView {
176
25
    id: lensView
25
    id: scopeView
177
26
26
178
27
    // FIXME: a way to aggregate these models would be ideal
27
    // FIXME: a way to aggregate these models would be ideal
179
28
    property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
28
    property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
180
@@ -40,7 +40,7 @@
181
40
    }
40
    }
182
41
41
183
42
    Binding {
42
    Binding {
185
43
        target: lensView.lens
43
        target: scopeView.scope
186
44
        property: "searchQuery"
44
        property: "searchQuery"
187
45
        value: pageHeader.searchQuery
45
        value: pageHeader.searchQuery
188
46
    }
46
    }
189
@@ -86,7 +86,7 @@
190
86
        dynamicSortFilter: true
86
        dynamicSortFilter: true
191
87
        filterRole: 2 // this is the category id for each result
87
        filterRole: 2 // this is the category id for each result
192
88
        filterRegExp: /^3$/ // only proxy items that are category 3 - Installed
88
        filterRegExp: /^3$/ // only proxy items that are category 3 - Installed
194
89
        model: dashContent.lenses.get("applications.lens").results
89
        model: dashContent.scopes.get("applications.scope").results
195
90
    }
90
    }
196
91
91
197
92
    property var categoryModels: {
92
    property var categoryModels: {
198
@@ -177,7 +177,7 @@
199
177
            width: categoryView.width
177
            width: categoryView.width
200
178
            text: i18n.tr("Apps")
178
            text: i18n.tr("Apps")
201
179
            searchEntryEnabled: true
179
            searchEntryEnabled: true
203
180
            searchHistory: lensView.searchHistory
180
            searchHistory: scopeView.searchHistory
204
181
        }
181
        }
205
182
    }
182
    }
206
183
}
183
}
207
184
184
208
=== modified file 'Dash/DashBar.qml'
209
--- Dash/DashBar.qml	2013-06-05 22:03:08 +0000
210
+++ Dash/DashBar.qml	2013-06-19 20:05:35 +0000
211
@@ -26,7 +26,7 @@
212
26
26
213
27
    property int lineHeight: units.dp(2)
27
    property int lineHeight: units.dp(2)
214
28
    property int itemSize: units.gu(7)
28
    property int itemSize: units.gu(7)
216
29
    property int iconSize: units.gu(2.5)
29
    property int iconSize: units.gu(3.5)
217
30
30
218
31
    signal itemSelected(int index)
31
    signal itemSelected(int index)
219
32
32
220
@@ -97,14 +97,9 @@
221
97
97
222
98
                        Image {
98
                        Image {
223
99
                            anchors.centerIn: parent
99
                            anchors.centerIn: parent
230
100
                            /* FIXME: should be 'source: lens.iconHint' but the
100
                            source: scope.iconHint
231
101
                               lenses do not contain the right icons yet
101
                            sourceSize { width: iconSize; height: iconSize }
226
102
                            */
227
103
                            source: "graphics/lensIcons/%1.png".arg(lens.name)
228
104
                            height: iconSize
229
105
                            width: iconSize
232
106
                            // opacity: index == currentIndex ? 1 : 1 // same opacity for now
102
                            // opacity: index == currentIndex ? 1 : 1 // same opacity for now
233
107
                            smooth: true
234
108
                        }
103
                        }
235
109
                    }
104
                    }
236
110
            }
105
            }
237
111
106
238
=== modified file 'Dash/DashContent.qml'
239
--- Dash/DashContent.qml	2013-06-11 10:36:55 +0000
240
+++ Dash/DashContent.qml	2013-06-19 20:05:35 +0000
241
@@ -24,34 +24,34 @@
242
24
    height: units.gu(71)
24
    height: units.gu(71)
243
25
25
244
26
    property var model: null
26
    property var model: null
246
27
    property var lenses: null
27
    property var scopes: null
247
28
    property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
28
    property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
248
29
    property alias currentIndex: dashContentList.currentIndex
29
    property alias currentIndex: dashContentList.currentIndex
249
30
30
251
31
    property LensDelegateMapper lensMapper : LensDelegateMapper {}
31
    property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
252
32
32
253
33
    signal movementStarted()
33
    signal movementStarted()
254
34
    signal movementEnded()
34
    signal movementEnded()
255
35
    signal contentFlickStarted()
35
    signal contentFlickStarted()
256
36
    signal contentEndReached()
36
    signal contentEndReached()
257
37
    signal previewShown()
37
    signal previewShown()
259
38
    signal lensLoaded(string lensId)
38
    signal scopeLoaded(string scopeId)
260
39
    signal positionedAtBeginning()
39
    signal positionedAtBeginning()
261
40
40
264
41
    // If we set the current lens index before the lenses have been added,
41
    // If we set the current scope index before the scopes have been added,
265
42
    // then we need to wait until the loaded signals gets emitted from the lenses
42
    // then we need to wait until the loaded signals gets emitted from the scopes
266
43
    property var set_current_index: undefined
43
    property var set_current_index: undefined
267
44
    Connections {
44
    Connections {
269
45
        target: lenses
45
        target: scopes
270
46
        onLoadedChanged: {
46
        onLoadedChanged: {
273
47
            if (lenses.loaded && set_current_index != undefined) {
47
            if (scopes.loaded && set_current_index != undefined) {
274
48
                setCurrentLensAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);
48
                setCurrentScopeAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);
275
49
                set_current_index = undefined;
49
                set_current_index = undefined;
276
50
            }
50
            }
277
51
        }
51
        }
278
52
    }
52
    }
279
53
53
281
54
    function setCurrentLensAtIndex(index, animate, reset) {
54
    function setCurrentScopeAtIndex(index, animate, reset) {
282
55
        var storedMoveDuration = dashContentList.highlightMoveDuration
55
        var storedMoveDuration = dashContentList.highlightMoveDuration
283
56
        var storedMoveSpeed = dashContentList.highlightMoveVelocity
56
        var storedMoveSpeed = dashContentList.highlightMoveVelocity
284
57
        if (!animate) {
57
        if (!animate) {
285
@@ -59,8 +59,8 @@
286
59
            dashContentList.highlightMoveDuration = 0
59
            dashContentList.highlightMoveDuration = 0
287
60
        }
60
        }
288
61
61
291
62
        // if the lenses haven't loaded yet, then wait until they are.
62
        // if the scopes haven't loaded yet, then wait until they are.
292
63
        if (!lenses.loaded) {
63
        if (!scopes.loaded) {
293
64
            set_current_index = [ index, animate, reset ]
64
            set_current_index = [ index, animate, reset ]
294
65
            return;
65
            return;
295
66
        }
66
        }
296
@@ -85,7 +85,7 @@
297
85
        id: dashContentList
85
        id: dashContentList
298
86
        objectName: "dashContentList"
86
        objectName: "dashContentList"
299
87
87
301
88
        interactive: dashContent.lenses.loaded
88
        interactive: dashContent.scopes.loaded
302
89
89
303
90
        anchors.fill: parent
90
        anchors.fill: parent
304
91
        model: dashContent.model
91
        model: dashContent.model
305
@@ -97,7 +97,7 @@
306
97
        highlightMoveDuration: 250
97
        highlightMoveDuration: 250
307
98
        highlightRangeMode: ListView.StrictlyEnforceRange
98
        highlightRangeMode: ListView.StrictlyEnforceRange
308
99
        /* FIXME: workaround rendering issue due to use of ShaderEffectSource in
99
        /* FIXME: workaround rendering issue due to use of ShaderEffectSource in
310
100
           UbuntuShape. While switching from the home lens to the People lens the
100
           UbuntuShape. While switching from the home scope to the People scope the
311
101
           rendering would block midway.
101
           rendering would block midway.
312
102
        */
102
        */
313
103
        cacheBuffer: 2147483647
103
        cacheBuffer: 2147483647
314
@@ -107,7 +107,7 @@
315
107
        // If the number of items is less than the current index, then need to reset to another item.
107
        // If the number of items is less than the current index, then need to reset to another item.
316
108
        onCountChanged: {
108
        onCountChanged: {
317
109
            if (currentIndex >= count)
109
            if (currentIndex >= count)
319
110
                dashContent.setCurrentLensAtIndex(count-1, true, true)
110
                dashContent.setCurrentScopeAtIndex(count-1, true, true)
320
111
        }
111
        }
321
112
112
322
113
        delegate:
113
        delegate:
323
@@ -115,14 +115,15 @@
324
115
                width: ListView.view.width
115
                width: ListView.view.width
325
116
                height: ListView.view.height
116
                height: ListView.view.height
326
117
                asynchronous: true
117
                asynchronous: true
328
118
                source: lensMapper.map(lens.id)
118
                source: scopeMapper.map(scope.id)
329
119
330
119
                onLoaded: {
120
                onLoaded: {
332
120
                    item.lens = Qt.binding(function() { return lens })
121
                    item.scope = Qt.binding(function() { return scope })
333
121
                    item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
122
                    item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
334
122
                    item.searchHistory = Qt.binding(function() { return shell.searchHistory })
123
                    item.searchHistory = Qt.binding(function() { return shell.searchHistory })
335
123
                    dashContentList.movementStarted.connect(item.movementStarted)
124
                    dashContentList.movementStarted.connect(item.movementStarted)
336
124
                    dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
125
                    dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
338
125
                    dashContent.lensLoaded(item.lens.id)
126
                    dashContent.scopeLoaded(item.scope.id)
339
126
                }
127
                }
340
127
                Connections {
128
                Connections {
341
128
                    target: item
129
                    target: item
342
129
130
343
=== modified file 'Dash/DashHome.qml'
344
--- Dash/DashHome.qml	2013-06-05 22:03:08 +0000
345
+++ Dash/DashHome.qml	2013-06-19 20:05:35 +0000
346
@@ -23,9 +23,8 @@
347
23
import "Apps"
23
import "Apps"
348
24
import "Video"
24
import "Video"
349
25
import "Music"
25
import "Music"
350
26
import "People"
351
27
26
353
28
LensView {
27
ScopeView {
354
29
    id: root
28
    id: root
355
30
29
356
31
    onMovementStarted: listView.showHeader()
30
    onMovementStarted: listView.showHeader()
357
@@ -34,20 +33,12 @@
358
34
        id: categoryListModel
33
        id: categoryListModel
359
35
        // specifies page's content categories, type of delegate and model used in each category
34
        // specifies page's content categories, type of delegate and model used in each category
360
36
        ListElement { category: "Frequent Apps";         component: "AppsGrid";       modelName: "AppsModel" }
35
        ListElement { category: "Frequent Apps";         component: "AppsGrid";       modelName: "AppsModel" }
361
37
        ListElement { category: "Favourite People";      component: "PeopleCarousel"; modelName: "FavouriteModel" }
362
38
        ListElement { category: "People Recently in Touch"; component: "PeopleGrid";  modelName: "RecentModel" }
363
39
        ListElement { category: "Recent Music";          component: "MusicGrid";      modelName: "MusicModel" }
36
        ListElement { category: "Recent Music";          component: "MusicGrid";      modelName: "MusicModel" }
364
40
        ListElement { category: "Videos Popular Online"; component: "VideosGrid";     modelName: "VideosModel" }
37
        ListElement { category: "Videos Popular Online"; component: "VideosGrid";     modelName: "VideosModel" }
365
41
        function getCategory(category1) {
38
        function getCategory(category1) {
366
42
            if (category1 === "Frequent Apps") {
39
            if (category1 === "Frequent Apps") {
367
43
                return i18n.tr("Frequent Apps");
40
                return i18n.tr("Frequent Apps");
368
44
            }
41
            }
369
45
            if (category1 === "Favourite People") {
370
46
                return i18n.tr("Favourite People");
371
47
            }
372
48
            if (category1 === "People Recently in Touch") {
373
49
                return i18n.tr("People Recently in Touch");
374
50
            }
375
51
            if (category1 === "Recent Music") {
42
            if (category1 === "Recent Music") {
376
52
                return i18n.tr("Recent Music");
43
                return i18n.tr("Recent Music");
377
53
            }
44
            }
378
@@ -90,33 +81,24 @@
379
90
    }
81
    }
380
91
82
381
92
    Component.onCompleted: {
83
    Component.onCompleted: {
394
93
        var lens = dashContent.lenses.get("people.lens")
84
        var scope = dashContent.scopes.get("mockmusicmaster.scope")
395
94
        if (lens) {
85
        if (scope) {
396
95
            favouritesFilter.model = dashContent.lenses.get("people.lens").results
86
            musicFilter.model = dashContent.scopes.get("mockmusicmaster.scope").results
397
96
            recentFilter.model = dashContent.lenses.get("people.lens").results
87
        }
398
97
        }
88
        scope = dashContent.scopes.get("mockvideosmaster.scope")
399
98
        lens = dashContent.lenses.get("mockmusic.lens")
89
        if (scope) {
400
99
        if (lens) {
90
            videosFilter.model = dashContent.scopes.get("mockvideosmaster.scope").results
389
100
            musicFilter.model = dashContent.lenses.get("mockmusic.lens").results
390
101
        }
391
102
        lens = dashContent.lenses.get("mockvideos.lens")
392
103
        if (lens) {
393
104
            videosFilter.model = dashContent.lenses.get("mockvideos.lens").results
401
105
        }
91
        }
402
106
    }
92
    }
403
107
93
404
108
    Connections {
94
    Connections {
405
109
        target: dashContent
95
        target: dashContent
416
110
        onLensLoaded: switch (lensId) {
96
        onScopeLoaded: switch (scopeId) {
417
111
            case "people.lens":
97
            case "mockmusicmaster.scope":
418
112
                favouritesFilter.model = dashContent.lenses.get("people.lens").results
98
                musicFilter.model = dashContent.scopes.get("mockmusicmaster.scope").results
419
113
                recentFilter.model = dashContent.lenses.get("people.lens").results
99
                break;
420
114
                break;
100
            case "mockvideosmaster.scope":
421
115
            case "mockmusic.lens":
101
                videosFilter.model = dashContent.scopes.get("mockvideosmaster.scope").results
412
116
                musicFilter.model = dashContent.lenses.get("mockmusic.lens").results
413
117
                break;
414
118
            case "mockvideos.lens":
415
119
                videosFilter.model = dashContent.lenses.get("mockvideos.lens").results
422
120
                break;
102
                break;
423
121
        }
103
        }
424
122
    }
104
    }
425
@@ -140,14 +122,10 @@
426
140
        }
122
        }
427
141
    }
123
    }
428
142
124
429
143
    Component { id: peopleCarousel; PeopleCarousel {}   }
430
144
    Component { id: peopleGrid;     PeopleFilterGrid {} }
431
145
    Component { id: musicGrid;      MusicFilterGrid {}  }
125
    Component { id: musicGrid;      MusicFilterGrid {}  }
432
146
    Component { id: videosGrid;     VideosFilterGrid {} }
126
    Component { id: videosGrid;     VideosFilterGrid {} }
433
147
    property var componentModels: {
127
    property var componentModels: {
434
148
                "AppsGrid": applicationsFilterGrid,
128
                "AppsGrid": applicationsFilterGrid,
435
149
                "PeopleCarousel": peopleCarousel,
436
150
                "PeopleGrid": peopleGrid,
437
151
                "MusicGrid": musicGrid,
129
                "MusicGrid": musicGrid,
438
152
                "VideosGrid": videosGrid,
130
                "VideosGrid": videosGrid,
439
153
    }
131
    }
440
@@ -171,7 +149,7 @@
441
171
                onLoaded: {
149
                onLoaded: {
442
172
                    item.model = categoryModels[modelName]
150
                    item.model = categoryModels[modelName]
443
173
151
445
174
                    //FIXME: workaround for lack of previews for videos in Home lens.
152
                    //FIXME: workaround for lack of previews for videos in Home scope.
446
175
                    //Need to connect to the clicked() signal here and act upon it here instead.
153
                    //Need to connect to the clicked() signal here and act upon it here instead.
447
176
                    if (component === "VideosGrid") {
154
                    if (component === "VideosGrid") {
448
177
                        function playVideo(index, data) {
155
                        function playVideo(index, data) {
449
178
156
450
=== modified file 'Dash/DashMusic.qml'
451
--- Dash/DashMusic.qml	2013-06-08 13:44:29 +0000
452
+++ Dash/DashMusic.qml	2013-06-19 20:05:35 +0000
453
@@ -20,8 +20,8 @@
454
20
import "../Components/ListItems" as ListItems
20
import "../Components/ListItems" as ListItems
455
21
import "Music"
21
import "Music"
456
22
22
459
23
LensView {
23
ScopeView {
460
24
    id: lensView
24
    id: scopeView
461
25
25
462
26
    property var categoryNames: [
26
    property var categoryNames: [
463
27
        i18n.tr("Featured"),
27
        i18n.tr("Featured"),
464
@@ -37,7 +37,7 @@
465
37
    onMovementStarted: categoryView.showHeader()
37
    onMovementStarted: categoryView.showHeader()
466
38
38
467
39
    Binding {
39
    Binding {
469
40
        target: lensView.lens
40
        target: scopeView.scope
470
41
        property: "searchQuery"
41
        property: "searchQuery"
471
42
        value: pageHeader.searchQuery
42
        value: pageHeader.searchQuery
472
43
    }
43
    }
473
@@ -59,7 +59,7 @@
474
59
59
475
60
    function getRenderer(categoryId) {
60
    function getRenderer(categoryId) {
476
61
        switch (categoryId) {
61
        switch (categoryId) {
478
62
            case 0: return musicCarousel
62
            case 1: return musicCarousel
479
63
            default: return musicFilterGrid
63
            default: return musicFilterGrid
480
64
        }
64
        }
481
65
    }
65
    }
482
@@ -67,7 +67,7 @@
483
67
    ListViewWithPageHeader {
67
    ListViewWithPageHeader {
484
68
        id: categoryView
68
        id: categoryView
485
69
        anchors.fill: parent
69
        anchors.fill: parent
487
70
        model: lensView.categories
70
        model: scopeView.categories
488
71
71
489
72
        onAtYEndChanged: if (atYEnd) endReached()
72
        onAtYEndChanged: if (atYEnd) endReached()
490
73
        onMovingChanged: if (moving && atYEnd) endReached()
73
        onMovingChanged: if (moving && atYEnd) endReached()
491
@@ -80,7 +80,7 @@
492
80
80
493
81
            Loader {
81
            Loader {
494
82
                anchors { top: parent.top; left: parent.left; right: parent.right }
82
                anchors { top: parent.top; left: parent.left; right: parent.right }
496
83
                sourceComponent: lensView.getRenderer(base.categoryId)
83
                sourceComponent: scopeView.getRenderer(base.categoryId)
497
84
                onLoaded: {
84
                onLoaded: {
498
85
                    item.model = results
85
                    item.model = results
499
86
                }
86
                }
500
@@ -98,7 +98,7 @@
501
98
            width: categoryView.width
98
            width: categoryView.width
502
99
            text: i18n.tr("Music")
99
            text: i18n.tr("Music")
503
100
            searchEntryEnabled: true
100
            searchEntryEnabled: true
505
101
            searchHistory: lensView.searchHistory
101
            searchHistory: scopeView.searchHistory
506
102
        }
102
        }
507
103
    }
103
    }
508
104
}
104
}
509
105
105
510
=== removed file 'Dash/DashPeople.qml'
511
--- Dash/DashPeople.qml	2013-06-08 13:44:29 +0000
512
+++ Dash/DashPeople.qml	1970-01-01 00:00:00 +0000
513
@@ -1,235 +0,0 @@
514
1
/*
515
2
 * Copyright (C) 2013 Canonical, Ltd.
516
3
 *
517
4
 * This program is free software; you can redistribute it and/or modify
518
5
 * it under the terms of the GNU General Public License as published by
519
6
 * the Free Software Foundation; version 3.
520
7
 *
521
8
 * This program is distributed in the hope that it will be useful,
522
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
523
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
524
11
 * GNU General Public License for more details.
525
12
 *
526
13
 * You should have received a copy of the GNU General Public License
527
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
528
15
 */
529
16
530
17
import QtQuick 2.0
531
18
import Ubuntu.Components 0.1
532
19
import Dee 3.0
533
20
import Unity 0.1
534
21
import Utils 0.1
535
22
import "../Components"
536
23
import "../Components/ListItems" as ListItems
537
24
import "People"
538
25
539
26
LensView {
540
27
    id: lensView
541
28
    property alias previewShown: previewLoader.onScreen
542
29
543
30
    property var categoryNames: [
544
31
        i18n.tr("Favourites"),
545
32
        i18n.tr("Recently in touch"),
546
33
        i18n.tr("New Contacts"),
547
34
        i18n.tr("A-Z")
548
35
    ]
549
36
550
37
    onIsCurrentChanged: {
551
38
        pageHeader.resetSearch();
552
39
    }
553
40
554
41
    onMovementStarted: categoryView.showHeader()
555
42
556
43
    Binding {
557
44
        target: lensView.lens
558
45
        property: "searchQuery"
559
46
        value: pageHeader.searchQuery
560
47
    }
561
48
562
49
    Connections {
563
50
        target: panel
564
51
        onSearchClicked: if (isCurrent) {
565
52
            pageHeader.triggerSearch()
566
53
            categoryView.showHeader()
567
54
        }
568
55
    }
569
56
570
57
    OpenEffect {
571
58
        id: effect
572
59
        anchors {
573
60
            fill: parent
574
61
            bottomMargin: -bottomOverflow
575
62
        }
576
63
        sourceItem: categoryView
577
64
578
65
        enabled: gap > 0.0
579
66
580
67
        topGapPx: (1 - gap) * positionPx
581
68
        topOpacity: (1 - gap * 1.2)
582
69
        bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
583
70
        bottomOverflow: units.gu(20)
584
71
        bottomOpacity: 1 - (gap * 0.8)
585
72
586
73
        property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
587
74
        property real gap: previewLoader.open ? 1.0 : 0.0
588
75
589
76
        Behavior on gap {
590
77
            NumberAnimation {
591
78
                duration: 200
592
79
                easing.type: Easing.InOutQuad
593
80
                onRunningChanged: {
594
81
                    if (!previewLoader.open && !running) {
595
82
                        previewLoader.onScreen = false;
596
83
                    }
597
84
                }
598
85
            }
599
86
        }
600
87
    }
601
88
602
89
    ListViewWithPageHeader {
603
90
        id: categoryView
604
91
        anchors.fill: parent
605
92
        model: lensView.categories
606
93
        onAtYEndChanged: if (atYEnd) endReached()
607
94
        onMovingChanged: if (moving && atYEnd) endReached()
608
95
        clipListView: !previewLoader.onScreen
609
96
610
97
        delegate: ListItems.Base {
611
98
            id: base
612
99
            property int categoryIndex: index
613
100
            property int categoryId: id
614
101
            highlightWhenPressed: false
615
102
616
103
            Loader {
617
104
                width: categoryView.width
618
105
                sourceComponent: base.categoryId == 0 ? peopleCarouselComponent : peopleGridComponent
619
106
620
107
                onLoaded: {
621
108
                    item.categoryId = Qt.binding(function() { return base.categoryId; })
622
109
                    item.categoryIndex = Qt.binding(function() { return base.categoryIndex; })
623
110
                    item.model = results;
624
111
                }
625
112
            }
626
113
        }
627
114
628
115
        sectionProperty: "name"
629
116
        sectionDelegate: ListItems.Header {
630
117
            width: categoryView.width
631
118
            text: i18n.tr(section)
632
119
        }
633
120
        pageHeader: PageHeader {
634
121
            id: pageHeader
635
122
            width: categoryView.width
636
123
            text: i18n.tr("People")
637
124
            searchEntryEnabled: true
638
125
            searchHistory: lensView.searchHistory
639
126
        }
640
127
    }
641
128
642
129
    Component {
643
130
        id: peopleCarouselComponent
644
131
        PeopleCarousel {
645
132
            id: peopleCarousel
646
133
647
134
            property int categoryId
648
135
            property int categoryIndex
649
136
650
137
            onClicked: {
651
138
                effect.positionPx = mapToItem(categoryView, 0, itemY).y;
652
139
                previewData.model = delegateItem.dataModel;
653
140
                previewData.uri = delegateItem.dataModel.uri;
654
141
                previewLoader.open = true;
655
142
            }
656
143
        }
657
144
    }
658
145
659
146
    Component {
660
147
        id: peopleGridComponent
661
148
        PeopleFilterGrid {
662
149
            id: peopleGrid
663
150
664
151
            property int categoryIndex
665
152
666
153
            onClicked: {
667
154
                if (peopleGrid.columnCount == 1) {
668
155
                    if (categoryIndex >= categoryView.model.count -1 && index >= peopleGrid.model.count - 1) {
669
156
                        effect.positionPx = mapToItem(categoryView, 0, itemY).y;
670
157
                    } else {
671
158
                        effect.positionPx = mapToItem(categoryView, 0, itemY + peopleGrid.cellHeight).y
672
159
                    }
673
160
                } else {
674
161
                    effect.positionPx = mapToItem(categoryView, 0, itemY).y
675
162
                }
676
163
                previewData.model = data;
677
164
                previewData.uri = data.uri
678
165
                previewLoader.open = true;
679
166
            }
680
167
        }
681
168
    }
682
169
683
170
    Loader {
684
171
        id: previewLoader
685
172
        height: effect.bottomGapPx - effect.topGapPx
686
173
        anchors {
687
174
            top: parent.top
688
175
            topMargin: effect.topGapPx
689
176
            left: parent.left
690
177
            right: parent.right
691
178
        }
692
179
        sourceComponent: onScreen ? previewComponent : undefined
693
180
694
181
        property bool open: false
695
182
        property bool onScreen: false
696
183
        property QtObject videoItem
697
184
698
185
        onOpenChanged: {
699
186
            if (open) {
700
187
                onScreen = true
701
188
            }
702
189
        }
703
190
704
191
        onLoaded: {
705
192
            if (previewData.ready) {
706
193
                item.model = previewData;
707
194
            }
708
195
        }
709
196
    }
710
197
711
198
    Component {
712
199
        id: previewComponent
713
200
714
201
        PeoplePreview {
715
202
            id: preview
716
203
            anchors.fill: parent
717
204
            forceSquare: true
718
205
            onClose: {
719
206
                open = false;
720
207
            }
721
208
        }
722
209
    }
723
210
724
211
    PeoplePreviewData {
725
212
        id: previewData
726
213
        lens: lensView.lens
727
214
        property Data model
728
215
729
216
        onError: previewLoader.open = false
730
217
        onReadyChanged: {
731
218
            if (previewLoader.item) {
732
219
                previewLoader.item.model = ready ? previewData : undefined
733
220
            }
734
221
        }
735
222
    }
736
223
737
224
    // TODO: Move as InverseMouseArea to DashPreview
738
225
    MouseArea {
739
226
        enabled: previewLoader.onScreen
740
227
        anchors {
741
228
            fill: parent
742
229
            topMargin: effect.bottomGapPx
743
230
        }
744
231
        onClicked: {
745
232
            previewLoader.open = false;
746
233
        }
747
234
    }
748
235
}
749
236
0
750
=== modified file 'Dash/DashVideos.qml'
751
--- Dash/DashVideos.qml	2013-06-08 13:44:29 +0000
752
+++ Dash/DashVideos.qml	2013-06-19 20:05:35 +0000
753
@@ -20,8 +20,8 @@
754
20
import "../Components/ListItems" as ListItems
20
import "../Components/ListItems" as ListItems
755
21
import "Video"
21
import "Video"
756
22
22
759
23
LensView {
23
ScopeView {
760
24
    id: lensView
24
    id: scopeView
761
25
    property alias previewShown: previewLoader.onScreen
25
    property alias previewShown: previewLoader.onScreen
762
26
26
763
27
    property var categoryNames: [
27
    property var categoryNames: [
764
@@ -38,7 +38,7 @@
765
38
    onMovementStarted: categoryView.showHeader()
38
    onMovementStarted: categoryView.showHeader()
766
39
39
767
40
    Binding {
40
    Binding {
769
41
        target: lensView.lens
41
        target: scopeView.scope
770
42
        property: "searchQuery"
42
        property: "searchQuery"
771
43
        value: pageHeader.searchQuery
43
        value: pageHeader.searchQuery
772
44
    }
44
    }
773
@@ -60,7 +60,7 @@
774
60
60
775
61
    function getRenderer(categoryId) {
61
    function getRenderer(categoryId) {
776
62
        switch (categoryId) {
62
        switch (categoryId) {
778
63
            case 0: return videosCarousel
63
            case 1: return videosCarousel
779
64
            default: return videosFilterGrid
64
            default: return videosFilterGrid
780
65
        }
65
        }
781
66
    }
66
    }
782
@@ -100,7 +100,7 @@
783
100
    ListViewWithPageHeader {
100
    ListViewWithPageHeader {
784
101
        id: categoryView
101
        id: categoryView
785
102
        anchors.fill: parent
102
        anchors.fill: parent
787
103
        model: lensView.categories
103
        model: scopeView.categories
788
104
        clipListView: !previewLoader.onScreen
104
        clipListView: !previewLoader.onScreen
789
105
105
790
106
        onAtYEndChanged: if (atYEnd) endReached()
106
        onAtYEndChanged: if (atYEnd) endReached()
791
@@ -115,7 +115,7 @@
792
115
            Loader {
115
            Loader {
793
116
                id: loader
116
                id: loader
794
117
                anchors { top: parent.top; left: parent.left; right: parent.right }
117
                anchors { top: parent.top; left: parent.left; right: parent.right }
796
118
                sourceComponent: lensView.getRenderer(base.categoryId)
118
                sourceComponent: scopeView.getRenderer(base.categoryId)
797
119
                onLoaded: {
119
                onLoaded: {
798
120
                    item.model = results
120
                    item.model = results
799
121
                }
121
                }
800
@@ -127,9 +127,9 @@
801
127
                        var dataItem;
127
                        var dataItem;
802
128
                        // VideosCarousel and VideosFilterGrid have different
128
                        // VideosCarousel and VideosFilterGrid have different
803
129
                        // clicked signals, accomodate for that
129
                        // clicked signals, accomodate for that
805
130
                        if (categoryId == 0) {
130
                        if (categoryId == 1) {
806
131
                            var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
131
                            var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
808
132
                            dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_5}
132
                            dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_6}
809
133
                        } else {
133
                        } else {
810
134
                            dataItem = data;
134
                            dataItem = data;
811
135
                        }
135
                        }
812
@@ -154,7 +154,7 @@
813
154
            width: categoryView.width
154
            width: categoryView.width
814
155
            text: i18n.tr("Videos")
155
            text: i18n.tr("Videos")
815
156
            searchEntryEnabled: true
156
            searchEntryEnabled: true
817
157
            searchHistory: lensView.searchHistory
157
            searchHistory: scopeView.searchHistory
818
158
        }
158
        }
819
159
    }
159
    }
820
160
160
821
161
161
822
=== renamed file 'Dash/GenericLensView.qml' => 'Dash/GenericScopeView.qml'
823
--- Dash/GenericLensView.qml	2013-06-05 22:03:08 +0000
824
+++ Dash/GenericScopeView.qml	2013-06-19 20:05:35 +0000
825
@@ -18,9 +18,10 @@
826
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
827
19
import "../Components"
19
import "../Components"
828
20
import "../Components/ListItems" as ListItems
20
import "../Components/ListItems" as ListItems
829
21
import "../Components/IconUtil.js" as IconUtil
830
21
22
833
22
LensView {
23
ScopeView {
834
23
    id: lensView
24
    id: scopeView
835
24
25
836
25
    onIsCurrentChanged: {
26
    onIsCurrentChanged: {
837
26
        pageHeader.resetSearch();
27
        pageHeader.resetSearch();
838
@@ -29,7 +30,7 @@
839
29
    onMovementStarted: categoryView.showHeader()
30
    onMovementStarted: categoryView.showHeader()
840
30
31
841
31
    Binding {
32
    Binding {
843
32
        target: lensView.lens
33
        target: scopeView.scope
844
33
        property: "searchQuery"
34
        property: "searchQuery"
845
34
        value: pageHeader.searchQuery
35
        value: pageHeader.searchQuery
846
35
    }
36
    }
847
@@ -45,7 +46,7 @@
848
45
    ListViewWithPageHeader {
46
    ListViewWithPageHeader {
849
46
        id: categoryView
47
        id: categoryView
850
47
        anchors.fill: parent
48
        anchors.fill: parent
852
48
        model: lensView.categories
49
        model: scopeView.categories
853
49
        onAtYEndChanged: if (atYEnd) endReached()
50
        onAtYEndChanged: if (atYEnd) endReached()
854
50
        onMovingChanged: if (moving && atYEnd) endReached()
51
        onMovingChanged: if (moving && atYEnd) endReached()
855
51
52
856
@@ -71,10 +72,10 @@
857
71
                delegate: Tile {
72
                delegate: Tile {
858
72
                    width: filtergrid.cellWidth
73
                    width: filtergrid.cellWidth
859
73
                    height: filtergrid.cellHeight
74
                    height: filtergrid.cellHeight
861
74
                    text: column_4 ? column_4 : "" // FIXME: this shouldn't be necessary
75
                    text: column_5 ? column_5 : "" // FIXME: this shouldn't be necessary
862
75
                    imageWidth: units.gu(11)
76
                    imageWidth: units.gu(11)
863
76
                    imageHeight: units.gu(16)
77
                    imageHeight: units.gu(16)
865
77
                    source: column_1 ? column_1 : "" // FIXME: ditto
78
                    source: column_1 ? IconUtil.from_gicon(column_1) : "" // FIXME: ditto
866
78
                }
79
                }
867
79
            }
80
            }
868
80
        }
81
        }
869
@@ -88,7 +89,7 @@
870
88
            id: pageHeader
89
            id: pageHeader
871
89
            objectName: "pageHeader"
90
            objectName: "pageHeader"
872
90
            width: categoryView.width
91
            width: categoryView.width
874
91
            text: lensView.lens.name
92
            text: scopeView.scope.name
875
92
            searchEntryEnabled: true
93
            searchEntryEnabled: true
876
93
        }
94
        }
877
94
    }
95
    }
878
95
96
879
=== modified file 'Dash/Music/MusicFilterGrid.qml'
880
--- Dash/Music/MusicFilterGrid.qml	2013-06-05 22:03:08 +0000
881
+++ Dash/Music/MusicFilterGrid.qml	2013-06-19 20:05:35 +0000
882
@@ -38,8 +38,8 @@
883
38
        height: filterGrid.cellHeight
38
        height: filterGrid.cellHeight
884
39
        iconWidth: filterGrid.iconWidth
39
        iconWidth: filterGrid.iconWidth
885
40
        iconHeight: filterGrid.iconHeight
40
        iconHeight: filterGrid.iconHeight
888
41
        artist: model.column_4
41
        artist: model.column_5
889
42
        album: model.column_5
42
        album: model.column_6
890
43
        source: model.column_1
43
        source: model.column_1
891
44
        onClicked: {
44
        onClicked: {
892
45
            filterGrid.clicked(index);
45
            filterGrid.clicked(index);
893
46
46
894
=== removed directory 'Dash/People'
895
=== removed file 'Dash/People/CarouselDelegatePeople.qml'
896
--- Dash/People/CarouselDelegatePeople.qml	2013-06-05 22:03:08 +0000
897
+++ Dash/People/CarouselDelegatePeople.qml	1970-01-01 00:00:00 +0000
898
@@ -1,166 +0,0 @@
899
1
/*
900
2
 * Copyright (C) 2013 Canonical, Ltd.
901
3
 *
902
4
 * This program is free software; you can redistribute it and/or modify
903
5
 * it under the terms of the GNU General Public License as published by
904
6
 * the Free Software Foundation; version 3.
905
7
 *
906
8
 * This program is distributed in the hope that it will be useful,
907
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
908
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
909
11
 * GNU General Public License for more details.
910
12
 *
911
13
 * You should have received a copy of the GNU General Public License
912
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
913
15
 */
914
16
915
17
import QtQuick 2.0
916
18
import Ubuntu.Components 0.1
917
19
import "../../Components"
918
20
919
21
BaseCarouselDelegate {
920
22
    id: item
921
23
922
24
    property var dataModel
923
25
    readonly property real frameHeight: Math.max(height / 3.6, units.gu(5.5))
924
26
925
27
    UbuntuShape {
926
28
        anchors.fill: parent
927
29
        radius: "medium"
928
30
        borderSource: ""
929
31
        image: Image {
930
32
            asynchronous: true
931
33
            sourceSize { width: item.width; height: item.height }
932
34
            source: dataModel.avatar ? dataModel.avatar : ""
933
35
            fillMode: Image.PreserveAspectCrop
934
36
        }
935
37
    }
936
38
937
39
    Component {
938
40
        id: component_frame
939
41
        Item {
940
42
            id: frame
941
43
942
44
            BorderImage {
943
45
                // TODO This will go away once we have 'clip: true' in UbuntuShape
944
46
                anchors.centerIn: parent
945
47
                width: parent.width + units.gu(1.5)
946
48
                height: parent.height + units.gu(1.5)
947
49
                visible: labelRemotePost.visible
948
50
                opacity: 0.9
949
51
                source: "graphics/bottomshape.sci"
950
52
            }
951
53
952
54
            property bool showRemoteDetails: true
953
55
            // To decide if the remote icon and time should be shown, its once layed out to do so.
954
56
            // Then it's checked if everything fits in the frame size. If not, showRemoteDetails is set false
955
57
            // Using bindings to do so cause a binding loop
956
58
            function checkSizeForRemoteDetails() {
957
59
                showRemoteDetails = true
958
60
                showRemoteDetails = (frame.height - column.minimumHeight) >= labelRemotePostTime.height
959
61
            }
960
62
961
63
            Item {
962
64
                id: remoteSourceIconContainer
963
65
964
66
                // TODO use proper asset and get rid of these dimensions
965
67
                width: units.gu(3)
966
68
                height: units.gu(4)
967
69
                visible: showRemoteDetails
968
70
969
71
                Image {
970
72
                    anchors.centerIn: parent
971
73
                    anchors.horizontalCenterOffset: units.gu(1)
972
74
                    source: dataModel.remoteSourceIcon ? dataModel.remoteSourceIcon : ""
973
75
                    fillMode: Image.PreserveAspectFit
974
76
                }
975
77
            }
976
78
977
79
            Column {
978
80
                id: column
979
81
980
82
                property real minimumHeight: labelName.height + labelRemotePost.height + anchors.topMargin + anchors.bottomMargin
981
83
982
84
                anchors {
983
85
                    left: remoteSourceIconContainer.visible ? remoteSourceIconContainer.right : parent.left
984
86
                    right: parent.right
985
87
                    top: remoteSourceIconContainer.visible ? parent.top : undefined
986
88
                    verticalCenter: remoteSourceIconContainer.visible ? undefined : parent.verticalCenter
987
89
                    margins: units.gu(1)
988
90
                }
989
91
990
92
                Label {
991
93
                    id: labelName
992
94
993
95
                    width: parent.width
994
96
                    text: dataModel.name ? dataModel.name : ""
995
97
                    color: "white"
996
98
                    fontSize: "x-small"
997
99
                    elide: Text.ElideRight
998
100
                    font.weight: Font.Bold
999
101
                    onTextChanged: checkSizeForRemoteDetails()
1000
102
                }
1001
103
1002
104
                Label {
1003
105
                    id: labelRemotePost
1004
106
1005
107
                    width: parent.width
1006
108
                    text: dataModel.remotePost ? dataModel.remotePost : ""
1007
109
                    color: "white"
1008
110
                    opacity: 0.8
1009
111
                    fontSize: "xx-small"
1010
112
                    elide: Text.ElideRight
1011
113
                    maximumLineCount: 2
1012
114
                    wrapMode: Text.WordWrap
1013
115
                    onTextChanged: checkSizeForRemoteDetails()
1014
116
                }
1015
117
1016
118
                Label {
1017
119
                    id: labelRemotePostTime
1018
120
1019
121
                    width: parent.width
1020
122
                    text: model.remotePostTime ? model.remotePostTime : ""
1021
123
                    color: "white"
1022
124
                    opacity: 0.5
1023
125
                    fontSize: "xx-small"
1024
126
                    elide: Text.ElideRight
1025
127
                    visible: showRemoteDetails
1026
128
                    onTextChanged: checkSizeForRemoteDetails()
1027
129
                }
1028
130
            }
1029
131
1030
132
            onHeightChanged: checkSizeForRemoteDetails()
1031
133
            onWidthChanged: checkSizeForRemoteDetails()
1032
134
            Component.onCompleted: checkSizeForRemoteDetails()
1033
135
        }
1034
136
    }
1035
137
1036
138
    Loader {
1037
139
        id: loader_frame
1038
140
1039
141
        anchors {
1040
142
            left: parent.left
1041
143
            right: parent.right
1042
144
            bottom: parent.bottom
1043
145
        }
1044
146
        height: item.frameHeight
1045
147
        opacity: item.explicitlyScaled ? 1.0 : 0
1046
148
1047
149
        Behavior on opacity {
1048
150
            NumberAnimation {
1049
151
                duration: 250
1050
152
                easing.type: Easing.InOutQuad
1051
153
            }
1052
154
        }
1053
155
1054
156
        sourceComponent: opacity > 0 ? component_frame : undefined
1055
157
    }
1056
158
1057
159
    BorderImage {
1058
160
        anchors.centerIn: parent
1059
161
        opacity: 0.6
1060
162
        source: "../../Components/graphics/non-selected.sci"
1061
163
        width: parent.width + units.gu(1.5)
1062
164
        height: parent.height + units.gu(1.5)
1063
165
    }
1064
166
}
1065
167
0
1066
=== removed file 'Dash/People/Data.qml'
1067
--- Dash/People/Data.qml	2013-06-05 22:03:08 +0000
1068
+++ Dash/People/Data.qml	1970-01-01 00:00:00 +0000
1069
@@ -1,71 +0,0 @@
1070
1
/*
1071
2
 * Copyright (C) 2013 Canonical, Ltd.
1072
3
 *
1073
4
 * This program is free software; you can redistribute it and/or modify
1074
5
 * it under the terms of the GNU General Public License as published by
1075
6
 * the Free Software Foundation; version 3.
1076
7
 *
1077
8
 * This program is distributed in the hope that it will be useful,
1078
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1079
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1080
11
 * GNU General Public License for more details.
1081
12
 *
1082
13
 * You should have received a copy of the GNU General Public License
1083
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1084
15
 */
1085
16
1086
17
import QtQuick 2.0
1087
18
import Dee 3.0
1088
19
1089
20
DeeVariantText {
1090
21
    property string uri
1091
22
    property string name
1092
23
    property url avatar
1093
24
    property var emails: ListModel {}
1094
25
    property var phones: ListModel {}
1095
26
    property string presenceStatus
1096
27
    property string presenceMessage
1097
28
    property url remoteSourceIcon
1098
29
    property string remotePost
1099
30
    property bool favorite
1100
31
    property bool recent
1101
32
    property url statusIcon
1102
33
    property string status: remotePost ? remotePost : presenceMessage
1103
34
    property url recentIcon
1104
35
    property string recentTime
1105
36
1106
37
    statusIcon: switch(presenceStatus) {
1107
38
        case "offline": "graphics/icon_offline.png"; break
1108
39
        // FIXME random for now, as we don't get actual presence data on the phone
1109
40
        case "":
1110
41
            var r = Math.random();
1111
42
            if (r >= 0.7) "graphics/icon_online.png"
1112
43
            else if (r >= 0.4) "graphics/icon_offline.png"
1113
44
            else "graphics/icon_unknown.png"
1114
45
            break;
1115
46
        default: "graphics/icon_online.png"
1116
47
    }
1117
48
1118
49
    onValueChanged: {
1119
50
        for (var i in value) switch (value[i][0]) {
1120
51
            case "presence-message": presenceMessage = value[i][1]; break
1121
52
            case "presence-status": presenceStatus = value[i][1]; break
1122
53
            case "remote-source-icon": remoteSourceIcon = value[i][1]; break
1123
54
            case "remote-post": remotePost = value[i][1]; break
1124
55
            case "recent-icon": recentIcon = value[i][1]; break
1125
56
            case "recent-time": recentTime = value[i][1]; break
1126
57
            case "phone": phones.append({"type": generateType(), "number": value[i][1]}); break
1127
58
            case "email": emails.append({"type": generateType(), "address": value[i][1]}); break
1128
59
        }
1129
60
    }
1130
61
1131
62
    // FIXME: random for now, as we don't have multiple phone numbers in the backend yet
1132
63
    function generateType() {
1133
64
        var phoneType = "";
1134
65
        var r = Math.random();
1135
66
        if (r >= 0.7) phoneType = "Private";
1136
67
        else if (r >= 0.4) phoneType = "Mobile";
1137
68
        else phoneType = "Work";
1138
69
        return phoneType;
1139
70
    }
1140
71
}
1141
72
0
1142
=== removed file 'Dash/People/Delegate.qml'
1143
--- Dash/People/Delegate.qml	2013-06-05 22:03:08 +0000
1144
+++ Dash/People/Delegate.qml	1970-01-01 00:00:00 +0000
1145
@@ -1,167 +0,0 @@
1146
1
/*
1147
2
 * Copyright (C) 2013 Canonical, Ltd.
1148
3
 *
1149
4
 * This program is free software; you can redistribute it and/or modify
1150
5
 * it under the terms of the GNU General Public License as published by
1151
6
 * the Free Software Foundation; version 3.
1152
7
 *
1153
8
 * This program is distributed in the hope that it will be useful,
1154
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1155
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1156
11
 * GNU General Public License for more details.
1157
12
 *
1158
13
 * You should have received a copy of the GNU General Public License
1159
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1160
15
 */
1161
16
1162
17
import QtQuick 2.0
1163
18
import Ubuntu.Components 0.1
1164
19
import "../../Components"
1165
20
import "../../Components/Time.js" as Time
1166
21
1167
22
Item {
1168
23
    id: peopleView
1169
24
1170
25
    property var dataModel
1171
26
1172
27
    property int __spacing: units.gu(1)
1173
28
1174
29
    /* Select what is shown in the subtitle
1175
30
       data: phone number or email address
1176
31
       status: social media presence status
1177
32
    */
1178
33
    property string subtitleType: "data"
1179
34
    height: subtitleType == "data" && detailsLabel.lineCount < 2 ? units.gu(10) : units.gu(11.5)
1180
35
1181
36
    Row {
1182
37
        id: row
1183
38
        anchors {
1184
39
            left: parent.left
1185
40
            right: parent.right
1186
41
            leftMargin: units.gu(2)
1187
42
            rightMargin: units.gu(4)
1188
43
            top: parent.top
1189
44
            topMargin: units.gu(2)
1190
45
        }
1191
46
        spacing: __spacing
1192
47
1193
48
        UbuntuShape {
1194
49
            id: avatar
1195
50
            anchors { top: parent.top }
1196
51
            width: units.gu(6)
1197
52
            height: units.gu(6)
1198
53
            image: Image {
1199
54
                width: units.gu(6)
1200
55
                source: peopleView.dataModel.avatar
1201
56
                sourceSize { width: avatar.width; height: avatar.height }
1202
57
                fillMode: Image.PreserveAspectCrop
1203
58
                smooth: true
1204
59
                asynchronous: true
1205
60
                cache: false
1206
61
            }
1207
62
        }
1208
63
1209
64
        Grid {
1210
65
            spacing: units.gu(0.5)
1211
66
            width: parent.width - x
1212
67
            columns: 2
1213
68
1214
69
            Item {
1215
70
                height: units.gu(2)
1216
71
                width: units.gu(2)
1217
72
1218
73
                Image {
1219
74
                    id: statusImage
1220
75
                    source: peopleView.dataModel.statusIcon
1221
76
                    width: units.gu(1.5)
1222
77
                    height: units.gu(1.5)
1223
78
                    fillMode: Image.PreserveAspectFit
1224
79
                    smooth: true
1225
80
                    anchors.verticalCenter: parent.verticalCenter
1226
81
                }
1227
82
            }
1228
83
1229
84
            Label {
1230
85
                id: nameLabel
1231
86
                elide: Text.ElideRight
1232
87
                text: peopleView.dataModel.name
1233
88
                color: "#f3f3e7"
1234
89
                style: Text.Raised
1235
90
                styleColor: "black"
1236
91
                font.weight: Font.DemiBold;
1237
92
                opacity: 0.9;
1238
93
            }
1239
94
1240
95
            Image {
1241
96
                source: switch(peopleView.subtitleType) {
1242
97
                        case "data":
1243
98
                            return peopleView.dataModel.remoteSourceIcon;
1244
99
                        case "status":
1245
100
                            return peopleView.dataModel.recent ? peopleView.dataModel.recentIcon : "";
1246
101
                        }
1247
102
1248
103
                width: units.gu(1.5)
1249
104
                height: units.gu(1.5)
1250
105
                fillMode: Image.PreserveAspectFit
1251
106
                smooth: true
1252
107
            }
1253
108
1254
109
            Label {
1255
110
                id: detailsLabel
1256
111
                width: parent.width - x
1257
112
                elide: Text.ElideRight
1258
113
                text: switch (peopleView.subtitleType) {
1259
114
                    case "data":
1260
115
                        if (peopleView.dataModel.phones && peopleView.dataModel.phones.count > 0) {
1261
116
                            return peopleView.dataModel.phones.get(0).number;
1262
117
                        } else if (peopleView.dataModel.emails && peopleView.dataModel.emails.count > 0) {
1263
118
                            return peopleView.dataModel.emails.get(0).address;
1264
119
                        }
1265
120
                        return "";
1266
121
                    case "status":
1267
122
                        return peopleView.dataModel.status;
1268
123
                     }
1269
124
                color: "#f3f3e7"
1270
125
                style: Text.Raised
1271
126
                styleColor: "black"
1272
127
                opacity: 0.7;
1273
128
                fontSize: "small";
1274
129
                wrapMode: Text.WordWrap;
1275
130
                maximumLineCount: 2;
1276
131
            }
1277
132
1278
133
            Item {
1279
134
                height: units.gu(2)
1280
135
                width: units.gu(1.5)
1281
136
1282
137
                // Placeholder
1283
138
            }
1284
139
1285
140
            Label {
1286
141
                width: parent.width - x
1287
142
                elide: Text.ElideRight
1288
143
                text: switch (peopleView.subtitleType) {
1289
144
                      case "data":
1290
145
                          if (peopleView.dataModel.phones && peopleView.dataModel.phones.count > 0) {
1291
146
                              return peopleView.dataModel.phones.get(0).type;
1292
147
                          } else if (peopleView.dataModel.emails && peopleView.dataModel.emails.count > 0) {
1293
148
                              return peopleView.dataModel.emails.get(0).type;
1294
149
                          }
1295
150
                          return "";
1296
151
                      case "status":
1297
152
                          if (peopleView.dataModel.recent) {
1298
153
                              var time = Time.readableFromNow(peopleView.dataModel.recentTime);
1299
154
                              return time ? time : peopleView.dataModel.recentTime;
1300
155
                          } else {
1301
156
                              return peopleView.dataModel.status
1302
157
                          }
1303
158
                      }
1304
159
                color: "#8f8f88"
1305
160
                style: Text.Raised
1306
161
                styleColor: "black"
1307
162
                opacity: 0.7;
1308
163
                fontSize: "x-small";
1309
164
            }
1310
165
        }
1311
166
    }
1312
167
}
1313
168
0
1314
=== removed file 'Dash/People/PeopleCarousel.qml'
1315
--- Dash/People/PeopleCarousel.qml	2013-06-05 22:03:08 +0000
1316
+++ Dash/People/PeopleCarousel.qml	1970-01-01 00:00:00 +0000
1317
@@ -1,43 +0,0 @@
1318
1
/*
1319
2
 * Copyright (C) 2013 Canonical, Ltd.
1320
3
 *
1321
4
 * This program is free software; you can redistribute it and/or modify
1322
5
 * it under the terms of the GNU General Public License as published by
1323
6
 * the Free Software Foundation; version 3.
1324
7
 *
1325
8
 * This program is distributed in the hope that it will be useful,
1326
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1327
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1328
11
 * GNU General Public License for more details.
1329
12
 *
1330
13
 * You should have received a copy of the GNU General Public License
1331
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1332
15
 */
1333
16
1334
17
import QtQuick 2.0
1335
18
import "../../Components"
1336
19
1337
20
Carousel {
1338
21
    id: peopleCarousel
1339
22
    tileAspectRatio: 1
1340
23
    minimumTileWidth: units.gu(13)
1341
24
    itemComponent: carouselDelegatePeople
1342
25
    selectedItemScaleFactor: 1.2
1343
26
    cacheBuffer: 1404 // 18px * 13gu * 6
1344
27
    height: implicitHeight + units.gu(6)
1345
28
1346
29
    Component {
1347
30
        id: carouselDelegatePeople
1348
31
        CarouselDelegatePeople {
1349
32
            dataModel: data
1350
33
1351
34
            Data {
1352
35
                id: data
1353
36
                uri: model.column_0
1354
37
                text: model.column_5
1355
38
                name: model.column_4
1356
39
                avatar: model.column_1
1357
40
            }
1358
41
        }
1359
42
    }
1360
43
}
1361
44
0
1362
=== removed file 'Dash/People/PeopleFilterGrid.qml'
1363
--- Dash/People/PeopleFilterGrid.qml	2013-06-05 22:03:08 +0000
1364
+++ Dash/People/PeopleFilterGrid.qml	1970-01-01 00:00:00 +0000
1365
@@ -1,74 +0,0 @@
1366
1
/*
1367
2
 * Copyright (C) 2013 Canonical, Ltd.
1368
3
 *
1369
4
 * This program is free software; you can redistribute it and/or modify
1370
5
 * it under the terms of the GNU General Public License as published by
1371
6
 * the Free Software Foundation; version 3.
1372
7
 *
1373
8
 * This program is distributed in the hope that it will be useful,
1374
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1375
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1376
11
 * GNU General Public License for more details.
1377
12
 *
1378
13
 * You should have received a copy of the GNU General Public License
1379
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1380
15
 */
1381
16
1382
17
import QtQuick 2.0
1383
18
import "../../Components"
1384
19
import "../../Components/ListItems" as ListItems
1385
20
1386
21
FilterGrid {
1387
22
    id: filterGrid
1388
23
1389
24
    filter: true
1390
25
    minimumHorizontalSpacing: 0
1391
26
    delegateWidth: units.gu(40)
1392
27
    delegateHeight: showStatusMessage ? units.gu(11.5) : units.gu(10)
1393
28
    verticalSpacing: 0
1394
29
    collapsedRowCount: 50 / columns
1395
30
    expandable: false
1396
31
1397
32
    property int categoryId
1398
33
    property bool showStatusMessage: categoryId == 1 || categoryId == 2
1399
34
1400
35
    readonly property int columnCount: width / cellWidth
1401
36
1402
37
    signal clicked(int index, variant data, real itemY)
1403
38
1404
39
    delegate: ListItems.Base {
1405
40
        id: tile
1406
41
        objectName: "delegate" + index
1407
42
        width: filterGrid.cellWidth
1408
43
        showDivider: index < Math.floor((filterGrid.model.count-1) / filterGrid.columnCount) * filterGrid.columnCount
1409
44
1410
45
        onClicked: {
1411
46
            filterGrid.clicked(index, data, tile.y);
1412
47
        }
1413
48
1414
49
        Delegate {
1415
50
            width: filterGrid.cellWidth
1416
51
            height: filterGrid.cellHeight
1417
52
            // This caches the Delegate into FBO because:
1418
53
            // - People data Delegates are slow because of their item count
1419
54
            // - FilterGrid is "height: childrenRect.height" so all delegates are always loaded
1420
55
            // TODO: Optimize this by:
1421
56
            // - not loading all delegates all the time and remove layer.enabled and/or
1422
57
            // - destroy whole lens when not visible/needed to free the GPU memory
1423
58
            layer.enabled: true
1424
59
1425
60
            dataModel: data
1426
61
            subtitleType: filterGrid.showStatusMessage ? "status" : "data"
1427
62
1428
63
            Data {
1429
64
                id: data
1430
65
                uri: column_0
1431
66
                text: column_5
1432
67
                name: column_4
1433
68
                avatar: column_1
1434
69
                favorite: filterGrid.categoryId == 0
1435
70
                recent: filterGrid.showStatusMessage
1436
71
            }
1437
72
        }
1438
73
    }
1439
74
}
1440
75
0
1441
=== removed file 'Dash/People/PeoplePreview.qml'
1442
--- Dash/People/PeoplePreview.qml	2013-06-05 22:03:08 +0000
1443
+++ Dash/People/PeoplePreview.qml	1970-01-01 00:00:00 +0000
1444
@@ -1,124 +0,0 @@
1445
1
/*
1446
2
 * Copyright (C) 2013 Canonical, Ltd.
1447
3
 *
1448
4
 * This program is free software; you can redistribute it and/or modify
1449
5
 * it under the terms of the GNU General Public License as published by
1450
6
 * the Free Software Foundation; version 3.
1451
7
 *
1452
8
 * This program is distributed in the hope that it will be useful,
1453
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1454
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1455
11
 * GNU General Public License for more details.
1456
12
 *
1457
13
 * You should have received a copy of the GNU General Public License
1458
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1459
15
 */
1460
16
1461
17
import QtQuick 2.0
1462
18
import Ubuntu.Components 0.1
1463
19
import "../../Components"
1464
20
import "../../Components/ListItems" as ListItems
1465
21
import ".."
1466
22
import "Preview"
1467
23
1468
24
DashPreview {
1469
25
    id: preview
1470
26
1471
27
    property var model: undefined
1472
28
1473
29
    title: (model && model.displayName) ? model.displayName : ""
1474
30
    url: (model && model.avatar) ? model.avatar : ""
1475
31
    previewWidthRatio: 0.34
1476
32
1477
33
1478
34
    description: Grid {
1479
35
        spacing: columns > 1 ? units.gu(2) : 0
1480
36
        columns: preview.narrowMode || width < units.gu(60) ? 1 : 2
1481
37
        property int columnWidth: columns > 1 ? (width - spacing * (columns - 1)) / columns : width
1482
38
        anchors {
1483
39
            left: parent.left
1484
40
            right: parent.right
1485
41
        }
1486
42
1487
43
        Status {
1488
44
            id: status
1489
45
            objectName: "statusField"
1490
46
            width: parent.columnWidth
1491
47
            visible: preview.model != undefined && preview.model.status != undefined
1492
48
            model: preview.model
1493
49
            property int index: 1
1494
50
            // FIXME that should trigger the action on the lens/scope, when there's support
1495
51
            onClicked: shell.activateApplication("/usr/share/applications/%1-webapp.desktop".arg(model.statusService), "--homepage=%1".arg(model.statusPostUri))
1496
52
        }
1497
53
1498
54
1499
55
        Column {
1500
56
            id: descriptionColumn
1501
57
            width: parent.columnWidth
1502
58
1503
59
1504
60
            Column {
1505
61
                anchors {
1506
62
                    left: parent.left
1507
63
                    right: parent.right
1508
64
                }
1509
65
1510
66
                Repeater {
1511
67
                    model: preview.model ? preview.model.phoneNumbers : undefined
1512
68
1513
69
                    delegate: Phone {
1514
70
                        objectName: "phoneField" + index
1515
71
                        model: preview.model
1516
72
                        // FIXME these should trigger actions on the lens/scope, when there's support
1517
73
                        onPhoneClicked: shell.activateApplication("/usr/share/applications/phone-app.desktop", "call://%1".arg(number.replace(/[^\d\+]/g, "")))
1518
74
                        onTextClicked: shell.activateApplication("/usr/share/applications/phone-app.desktop", "message://%1".arg(number.replace(/[^\d\+]/g, "")))
1519
75
                    }
1520
76
                }
1521
77
            }
1522
78
1523
79
            Column {
1524
80
                anchors {
1525
81
                    left: parent.left
1526
82
                    right: parent.right
1527
83
                }
1528
84
1529
85
                Repeater {
1530
86
                    model: preview.model ? preview.model.emailAddresses : undefined
1531
87
                    delegate: Generic {
1532
88
                        objectName: "emailField" + index
1533
89
                        type: "email"
1534
90
                    }
1535
91
                }
1536
92
            }
1537
93
1538
94
            Column {
1539
95
                anchors {
1540
96
                    left: parent.left
1541
97
                    right: parent.right
1542
98
                }
1543
99
1544
100
                Repeater {
1545
101
                    model: preview.model ? preview.model.imAccounts : undefined
1546
102
                    delegate: Generic {
1547
103
                        objectName: "imField" + index
1548
104
                        type: "imAccount"
1549
105
                    }
1550
106
                }
1551
107
            }
1552
108
1553
109
            Column {
1554
110
                anchors {
1555
111
                    left: parent.left
1556
112
                    right: parent.right
1557
113
                }
1558
114
1559
115
                Repeater {
1560
116
                    model: preview.model ? preview.model.addresses : undefined
1561
117
                    delegate: Address {
1562
118
                        objectName: "addressField" + index
1563
119
                    }
1564
120
                }
1565
121
            }
1566
122
        }
1567
123
    }
1568
124
}
1569
125
0
1570
=== removed directory 'Dash/People/Preview'
1571
=== removed file 'Dash/People/Preview/Address.qml'
1572
--- Dash/People/Preview/Address.qml	2013-06-05 22:03:08 +0000
1573
+++ Dash/People/Preview/Address.qml	1970-01-01 00:00:00 +0000
1574
@@ -1,74 +0,0 @@
1575
1
/*
1576
2
 * Copyright (C) 2013 Canonical, Ltd.
1577
3
 *
1578
4
 * This program is free software; you can redistribute it and/or modify
1579
5
 * it under the terms of the GNU General Public License as published by
1580
6
 * the Free Software Foundation; version 3.
1581
7
 *
1582
8
 * This program is distributed in the hope that it will be useful,
1583
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1584
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1585
11
 * GNU General Public License for more details.
1586
12
 *
1587
13
 * You should have received a copy of the GNU General Public License
1588
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1589
15
 */
1590
16
1591
17
import QtQuick 2.0
1592
18
import Ubuntu.Components 0.1
1593
19
1594
20
Base {
1595
21
    id: root
1596
22
1597
23
    Item {
1598
24
        anchors {
1599
25
            left: parent.left
1600
26
            right: parent.right
1601
27
            leftMargin: units.gu(2)
1602
28
            rightMargin: units.gu(4)
1603
29
        }
1604
30
        height: childrenRect.height + units.gu(2.5)
1605
31
1606
32
        Label {
1607
33
            id: typeLabel
1608
34
            anchors {
1609
35
                top: parent.top
1610
36
                topMargin: units.gu(1)
1611
37
            }
1612
38
            text: type
1613
39
            elide: Text.ElideRight
1614
40
            color: "#f3f3e7"
1615
41
            style: Text.Raised
1616
42
            styleColor: "black"
1617
43
            font.capitalization: Font.Capitalize
1618
44
            opacity: 0.7;
1619
45
            fontSize: "small"
1620
46
        }
1621
47
1622
48
        Label {
1623
49
            id: contentLabel
1624
50
            anchors {
1625
51
                left: parent.left
1626
52
                right: parent.right
1627
53
                top: typeLabel.bottom
1628
54
                topMargin: units.gu(0.5)
1629
55
            }
1630
56
            text: {
1631
57
                var fields = [street, poBox, extension, locality, region, postalCode, country, addressFormat]
1632
58
                var parts = []
1633
59
                for (var k in fields) {
1634
60
                    if (fields[k]) parts.push(fields[k])
1635
61
                }
1636
62
                return parts.join("\n")
1637
63
            }
1638
64
            elide: Text.ElideRight
1639
65
            color: "#f3f3e7"
1640
66
            style: Text.Raised
1641
67
            styleColor: "black"
1642
68
            opacity: 0.9;
1643
69
            fontSize: "large"
1644
70
            wrapMode: Text.WordWrap
1645
71
            font.weight: Font.Light
1646
72
        }
1647
73
    }
1648
74
}
1649
75
0
1650
=== removed file 'Dash/People/Preview/Base.qml'
1651
--- Dash/People/Preview/Base.qml	2013-06-05 22:03:08 +0000
1652
+++ Dash/People/Preview/Base.qml	1970-01-01 00:00:00 +0000
1653
@@ -1,22 +0,0 @@
1654
1
/*
1655
2
 * Copyright (C) 2013 Canonical, Ltd.
1656
3
 *
1657
4
 * This program is free software; you can redistribute it and/or modify
1658
5
 * it under the terms of the GNU General Public License as published by
1659
6
 * the Free Software Foundation; version 3.
1660
7
 *
1661
8
 * This program is distributed in the hope that it will be useful,
1662
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1663
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1664
11
 * GNU General Public License for more details.
1665
12
 *
1666
13
 * You should have received a copy of the GNU General Public License
1667
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1668
15
 */
1669
16
1670
17
import QtQuick 2.0
1671
18
import "../../../Components/ListItems"
1672
19
1673
20
Base {
1674
21
    property var model
1675
22
}
1676
23
0
1677
=== removed file 'Dash/People/Preview/Generic.qml'
1678
--- Dash/People/Preview/Generic.qml	2013-06-05 22:03:08 +0000
1679
+++ Dash/People/Preview/Generic.qml	1970-01-01 00:00:00 +0000
1680
@@ -1,80 +0,0 @@
1681
1
/*
1682
2
 * Copyright (C) 2013 Canonical, Ltd.
1683
3
 *
1684
4
 * This program is free software; you can redistribute it and/or modify
1685
5
 * it under the terms of the GNU General Public License as published by
1686
6
 * the Free Software Foundation; version 3.
1687
7
 *
1688
8
 * This program is distributed in the hope that it will be useful,
1689
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1690
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1691
11
 * GNU General Public License for more details.
1692
12
 *
1693
13
 * You should have received a copy of the GNU General Public License
1694
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1695
15
 */
1696
16
1697
17
import QtQuick 2.0
1698
18
import Ubuntu.Components 0.1
1699
19
1700
20
Base {
1701
21
    id: root
1702
22
1703
23
    property string type
1704
24
1705
25
    Item {
1706
26
        anchors {
1707
27
            left: parent.left
1708
28
            right: parent.right
1709
29
            leftMargin: units.gu(2)
1710
30
            rightMargin: units.gu(4)
1711
31
        }
1712
32
        height: childrenRect.height + units.gu(2.5)
1713
33
1714
34
        Label {
1715
35
            id: typeLabel
1716
36
            anchors {
1717
37
                top: parent.top
1718
38
                topMargin: units.gu(1)
1719
39
            }
1720
40
            text: switch (root.type) {
1721
41
                case "email":
1722
42
                case "address": type; break
1723
43
                case "imAccount": protocol; break
1724
44
                default: type
1725
45
            }
1726
46
            elide: Text.ElideRight
1727
47
            color: "#f3f3e7"
1728
48
            style: Text.Raised
1729
49
            styleColor: "black"
1730
50
            font.capitalization: Font.Capitalize
1731
51
            opacity: 0.7;
1732
52
            fontSize: "small"
1733
53
        }
1734
54
1735
55
        Label {
1736
56
            id: contentLabel
1737
57
            anchors {
1738
58
                left: parent.left
1739
59
                right: parent.right
1740
60
                top: typeLabel.bottom
1741
61
                topMargin: units.gu(0.5)
1742
62
            }
1743
63
            text: switch (root.type) {
1744
64
                case "email":
1745
65
                case "address":
1746
66
                case "imAccount": address; break
1747
67
                default: text
1748
68
            }
1749
69
            elide: Text.ElideRight
1750
70
            color: "#f3f3e7"
1751
71
            style: Text.Raised
1752
72
            styleColor: "black"
1753
73
            opacity: 0.9;
1754
74
            fontSize: "large"
1755
75
            wrapMode: Text.WordWrap
1756
76
            maximumLineCount: 2
1757
77
            font.weight: Font.Light
1758
78
        }
1759
79
    }
1760
80
}
1761
81
0
1762
=== removed file 'Dash/People/Preview/Phone.qml'
1763
--- Dash/People/Preview/Phone.qml	2013-06-05 22:03:08 +0000
1764
+++ Dash/People/Preview/Phone.qml	1970-01-01 00:00:00 +0000
1765
@@ -1,108 +0,0 @@
1766
1
/*
1767
2
 * Copyright (C) 2013 Canonical, Ltd.
1768
3
 *
1769
4
 * This program is free software; you can redistribute it and/or modify
1770
5
 * it under the terms of the GNU General Public License as published by
1771
6
 * the Free Software Foundation; version 3.
1772
7
 *
1773
8
 * This program is distributed in the hope that it will be useful,
1774
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1775
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1776
11
 * GNU General Public License for more details.
1777
12
 *
1778
13
 * You should have received a copy of the GNU General Public License
1779
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1780
15
 */
1781
16
1782
17
import QtQuick 2.0
1783
18
import Ubuntu.Components 0.1
1784
19
import "../../../Components/ListItems" as ListItems
1785
20
1786
21
Base {
1787
22
    id: root
1788
23
    highlightWhenPressed: false
1789
24
1790
25
    signal phoneClicked
1791
26
    signal textClicked
1792
27
1793
28
    Row {
1794
29
        height: phoneButton.height
1795
30
        anchors {
1796
31
            left: parent.left
1797
32
            right: parent.right
1798
33
        }
1799
34
        AbstractButton {
1800
35
            id: phoneButton
1801
36
            width: parent.width - units.gu(7)
1802
37
            height: Math.max(units.gu(8), phoneColumn.height + units.gu(2))
1803
38
            Column {
1804
39
                id: phoneColumn
1805
40
                spacing: units.gu(0.5)
1806
41
                anchors {
1807
42
                    top: parent.top
1808
43
                    topMargin: units.gu(1)
1809
44
                    left: parent.left
1810
45
                    leftMargin: units.gu(2)
1811
46
                    right: parent.right
1812
47
                }
1813
48
                Label {
1814
49
                    text: {
1815
50
                    var parts = []
1816
51
                        if (location) parts.push(location)
1817
52
                        if (type && type != "voice") parts.push(type)
1818
53
                        if (parts.length == 0) return "other"
1819
54
                        return parts.join(" ")
1820
55
                    }
1821
56
                    elide: Text.ElideRight
1822
57
                    color: "#f3f3e7"
1823
58
                    style: Text.Raised
1824
59
                    styleColor: "black"
1825
60
                    font.capitalization: Font.Capitalize
1826
61
                    opacity: 0.7;
1827
62
                    fontSize: "small"
1828
63
                }
1829
64
                Label {
1830
65
                    width: parent.width
1831
66
                    text: number
1832
67
                    elide: Text.ElideRight
1833
68
                    color: "#f3f3e7"
1834
69
                    style: Text.Raised
1835
70
                    styleColor: "black"
1836
71
                    opacity: 0.9;
1837
72
                    fontSize: "large"
1838
73
                    wrapMode: Text.WordWrap
1839
74
                    maximumLineCount: 2
1840
75
                    font.weight: Font.Light
1841
76
                }
1842
77
            }
1843
78
1844
79
            ListItems.Highlight {
1845
80
                anchors.fill: parent
1846
81
                pressed: phoneButton.pressed
1847
82
            }
1848
83
1849
84
            onClicked: phoneClicked()
1850
85
        }
1851
86
1852
87
        AbstractButton {
1853
88
            id: textButton
1854
89
            width: units.gu(7)
1855
90
            height: parent.height
1856
91
1857
92
            Image {
1858
93
                anchors.centerIn: parent
1859
94
                width: units.gu(4)
1860
95
                height: units.gu(4)
1861
96
                source: "../graphics/icon_write_text.png"
1862
97
                fillMode: Image.PreserveAspectFit
1863
98
            }
1864
99
1865
100
            ListItems.Highlight {
1866
101
                anchors.fill: parent
1867
102
                pressed: textButton.pressed
1868
103
            }
1869
104
1870
105
            onClicked: textClicked()
1871
106
        }
1872
107
    }
1873
108
}
1874
109
0
1875
=== removed file 'Dash/People/Preview/Status.qml'
1876
--- Dash/People/Preview/Status.qml	2013-06-05 22:03:08 +0000
1877
+++ Dash/People/Preview/Status.qml	1970-01-01 00:00:00 +0000
1878
@@ -1,97 +0,0 @@
1879
1
/*
1880
2
 * Copyright (C) 2013 Canonical, Ltd.
1881
3
 *
1882
4
 * This program is free software; you can redistribute it and/or modify
1883
5
 * it under the terms of the GNU General Public License as published by
1884
6
 * the Free Software Foundation; version 3.
1885
7
 *
1886
8
 * This program is distributed in the hope that it will be useful,
1887
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1888
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1889
11
 * GNU General Public License for more details.
1890
12
 *
1891
13
 * You should have received a copy of the GNU General Public License
1892
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1893
15
 */
1894
16
1895
17
import QtQuick 2.0
1896
18
import Ubuntu.Components 0.1
1897
19
import "../../../Components/Time.js" as Time
1898
20
1899
21
Base {
1900
22
    id: root
1901
23
1902
24
    Item {
1903
25
        anchors {
1904
26
            left: parent.left
1905
27
            right: parent.right
1906
28
            leftMargin: units.gu(2)
1907
29
            rightMargin: units.gu(4)
1908
30
        }
1909
31
        height: childrenRect.height
1910
32
1911
33
        Label {
1912
34
            id: typeLabel
1913
35
            anchors {
1914
36
                top: parent.top
1915
37
                topMargin: units.gu(1)
1916
38
            }
1917
39
            text: "Status"
1918
40
            elide: Text.ElideRight
1919
41
            color: "#f3f3e7"
1920
42
            style: Text.Raised
1921
43
            styleColor: "black"
1922
44
            font.capitalization: Font.Capitalize
1923
45
            opacity: 0.7;
1924
46
            fontSize: "small"
1925
47
        }
1926
48
1927
49
        Label {
1928
50
            id: contentLabel
1929
51
            anchors {
1930
52
                left: parent.left
1931
53
                right: parent.right
1932
54
                top: typeLabel.bottom
1933
55
                topMargin: units.gu(0.5)
1934
56
            }
1935
57
            text: root.model ? root.model.status : ""
1936
58
            elide: Text.ElideRight
1937
59
            color: "#f3f3e7"
1938
60
            style: Text.Raised
1939
61
            styleColor: "black"
1940
62
            opacity: 0.9;
1941
63
            fontSize: "large"
1942
64
            wrapMode: Text.WordWrap
1943
65
            maximumLineCount: 6
1944
66
            font.weight: Font.Light
1945
67
        }
1946
68
1947
69
        Row {
1948
70
            anchors {
1949
71
                top: contentLabel.bottom
1950
72
                topMargin: units.gu(1)
1951
73
            }
1952
74
            height: statusText.height + units.gu(2.5)
1953
75
            spacing: units.gu(1)
1954
76
            Image {
1955
77
                width: units.gu(2)
1956
78
                height: units.gu(2)
1957
79
                fillMode: Image.PreserveAspectFit
1958
80
                source: root.model ? root.model.statusServiceIcon : ""
1959
81
            }
1960
82
            Label {
1961
83
                id: statusText
1962
84
                text: if (root.model) {
1963
85
                    var time = Time.readableFromNow(root.model.statusTime);
1964
86
                    return time ? time : root.model.statusTime;
1965
87
                } else return "";
1966
88
                elide: Text.ElideRight
1967
89
                color: "#f3f3e7"
1968
90
                style: Text.Raised
1969
91
                styleColor: "black"
1970
92
                opacity: 0.7;
1971
93
                fontSize: "small"
1972
94
            }
1973
95
        }
1974
96
    }
1975
97
}
1976
98
0
1977
=== removed directory 'Dash/People/graphics'
1978
=== removed file 'Dash/People/graphics/bottomshape@18.png'
1979
99
Binary files Dash/People/graphics/bottomshape@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/bottomshape@18.png	1970-01-01 00:00:00 +0000 differ
1
Binary files Dash/People/graphics/bottomshape@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/bottomshape@18.png	1970-01-01 00:00:00 +0000 differ
1980
=== removed file 'Dash/People/graphics/bottomshape@18.sci'
1981
--- Dash/People/graphics/bottomshape@18.sci	2013-06-05 22:03:08 +0000
1982
+++ Dash/People/graphics/bottomshape@18.sci	1970-01-01 00:00:00 +0000
1983
@@ -1,5 +0,0 @@
1984
1
border.left: 54
1985
2
border.top: 60
1986
3
border.bottom: 60
1987
4
border.right: 54
1988
5
source: bottomshape@18.png
1989
6
0
1990
=== removed file 'Dash/People/graphics/icon_facebook@18.png'
1991
7
Binary files Dash/People/graphics/icon_facebook@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_facebook@18.png	1970-01-01 00:00:00 +0000 differ
1
Binary files Dash/People/graphics/icon_facebook@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_facebook@18.png	1970-01-01 00:00:00 +0000 differ
1992
=== removed file 'Dash/People/graphics/icon_offline@18.png'
1993
8
Binary files Dash/People/graphics/icon_offline@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_offline@18.png	1970-01-01 00:00:00 +0000 differ
2
Binary files Dash/People/graphics/icon_offline@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_offline@18.png	1970-01-01 00:00:00 +0000 differ
1994
=== removed file 'Dash/People/graphics/icon_online@18.png'
1995
9
Binary files Dash/People/graphics/icon_online@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_online@18.png	1970-01-01 00:00:00 +0000 differ
3
Binary files Dash/People/graphics/icon_online@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_online@18.png	1970-01-01 00:00:00 +0000 differ
1996
=== removed file 'Dash/People/graphics/icon_twitter@18.png'
1997
10
Binary files Dash/People/graphics/icon_twitter@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_twitter@18.png	1970-01-01 00:00:00 +0000 differ
4
Binary files Dash/People/graphics/icon_twitter@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_twitter@18.png	1970-01-01 00:00:00 +0000 differ
1998
=== removed file 'Dash/People/graphics/icon_unknown@18.png'
1999
11
Binary files Dash/People/graphics/icon_unknown@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_unknown@18.png	1970-01-01 00:00:00 +0000 differ
5
Binary files Dash/People/graphics/icon_unknown@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_unknown@18.png	1970-01-01 00:00:00 +0000 differ
2000
=== removed file 'Dash/People/graphics/icon_write_text@18.png'
2001
12
Binary files Dash/People/graphics/icon_write_text@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_write_text@18.png	1970-01-01 00:00:00 +0000 differ
6
Binary files Dash/People/graphics/icon_write_text@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/icon_write_text@18.png	1970-01-01 00:00:00 +0000 differ
2002
=== removed file 'Dash/People/graphics/star_favourite@18.png'
2003
13
Binary files Dash/People/graphics/star_favourite@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/star_favourite@18.png	1970-01-01 00:00:00 +0000 differ
7
Binary files Dash/People/graphics/star_favourite@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/star_favourite@18.png	1970-01-01 00:00:00 +0000 differ
2004
=== removed file 'Dash/People/graphics/star_not_favourite@18.png'
2005
14
Binary files Dash/People/graphics/star_not_favourite@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/star_not_favourite@18.png	1970-01-01 00:00:00 +0000 differ
8
Binary files Dash/People/graphics/star_not_favourite@18.png	2013-06-05 22:03:08 +0000 and Dash/People/graphics/star_not_favourite@18.png	1970-01-01 00:00:00 +0000 differ
2006
=== renamed file 'Dash/LensDelegateMapper.qml' => 'Dash/ScopeDelegateMapper.qml'
2007
--- Dash/LensDelegateMapper.qml	2013-06-07 09:22:34 +0000
2008
+++ Dash/ScopeDelegateMapper.qml	2013-06-19 20:05:35 +0000
2009
@@ -17,19 +17,18 @@
2010
17
import QtQuick 2.0
17
import QtQuick 2.0
2011
18
18
2012
19
QtObject {
19
QtObject {
2018
20
    property var lensDelegateMapping: {"mockmusic.lens": "DashMusic.qml",
20
    property var scopeDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",
2019
21
                                       "applications.lens": "DashApps.qml",
21
                                       "applications.scope": "DashApps.qml",
2020
22
                                       "home.lens": "DashHome.qml",
22
                                       "home.scope": "DashHome.qml",
2021
23
                                       "mockvideos.lens": "DashVideos.qml",
23
                                       "mockvideosmaster.scope": "DashVideos.qml"
2017
24
                                       "people.lens": "DashPeople.qml",
2022
25
                                      }
24
                                      }
2024
26
    property string genericLens: "GenericLensView.qml"
25
    property string genericScope: "GenericScopeView.qml"
2025
27
26
2030
28
    function map(lensId) {
27
    function map(scopeId) {
2031
29
        var customLens = lensDelegateMapping[lensId]
28
        var customScope = scopeDelegateMapping[scopeId]
2032
30
        if (customLens != undefined) {
29
        if (customScope != undefined) {
2033
31
            return customLens
30
            return customScope
2034
32
        }
31
        }
2036
33
        return genericLens
32
        return genericScope
2037
34
    }
33
    }
2038
35
}
34
}
2039
36
35
2040
=== renamed file 'Dash/LensView.qml' => 'Dash/ScopeView.qml'
2041
--- Dash/LensView.qml	2013-06-05 22:03:08 +0000
2042
+++ Dash/ScopeView.qml	2013-06-19 20:05:35 +0000
2043
@@ -19,7 +19,7 @@
2044
19
import Unity 0.1
19
import Unity 0.1
2045
20
20
2046
21
FocusScope {
21
FocusScope {
2048
22
    property Lens lens
22
    property Scope scope
2049
23
    property SortFilterProxyModel categories: categoryFilter
23
    property SortFilterProxyModel categories: categoryFilter
2050
24
    property bool isCurrent
24
    property bool isCurrent
2051
25
    property ListModel searchHistory
25
    property ListModel searchHistory
2052
@@ -29,17 +29,17 @@
2053
29
    signal positionedAtBeginning
29
    signal positionedAtBeginning
2054
30
30
2055
31
    // FIXME delay the search so that daemons have time to settle
31
    // FIXME delay the search so that daemons have time to settle
2057
32
    onLensChanged: timer.restart()
32
    onScopeChanged: timer.restart()
2058
33
33
2059
34
    Timer {
34
    Timer {
2060
35
        id: timer
35
        id: timer
2061
36
        interval: 2000
36
        interval: 2000
2063
37
        onTriggered: lens.searchQuery = ""
37
        onTriggered: scope.searchQuery = ""
2064
38
    }
38
    }
2065
39
39
2066
40
    SortFilterProxyModel {
40
    SortFilterProxyModel {
2067
41
        id: categoryFilter
41
        id: categoryFilter
2069
42
        model: lens.categories
42
        model: scope.categories
2070
43
        dynamicSortFilter: true
43
        dynamicSortFilter: true
2071
44
        filterRole: Categories.RoleCount
44
        filterRole: Categories.RoleCount
2072
45
        filterRegExp: /^0$/
45
        filterRegExp: /^0$/
2073
46
46
2074
=== modified file 'Dash/Video/VideosFilterGrid.qml'
2075
--- Dash/Video/VideosFilterGrid.qml	2013-06-05 22:03:08 +0000
2076
+++ Dash/Video/VideosFilterGrid.qml	2013-06-19 20:05:35 +0000
2077
@@ -37,14 +37,14 @@
2078
37
        objectName: "delegate" + index
37
        objectName: "delegate" + index
2079
38
        width: filtergrid.cellWidth
38
        width: filtergrid.cellWidth
2080
39
        height: filtergrid.cellHeight
39
        height: filtergrid.cellHeight
2082
40
        text: model.column_4
40
        text: model.column_5
2083
41
        imageWidth: filtergrid.iconWidth
41
        imageWidth: filtergrid.iconWidth
2084
42
        imageHeight: filtergrid.iconHeight
42
        imageHeight: filtergrid.iconHeight
2085
43
        source: model.column_1
43
        source: model.column_1
2086
44
        fillMode: Image.PreserveAspectCrop
44
        fillMode: Image.PreserveAspectCrop
2087
45
        onClicked: {
45
        onClicked: {
2088
46
            var fileUri = model.column_0.replace(/^[^:]+:/, "")
46
            var fileUri = model.column_0.replace(/^[^:]+:/, "")
2090
47
            var data = {fileUri: fileUri, nfoUri: model.column_5}
47
            var data = {fileUri: fileUri, nfoUri: model.column_6}
2091
48
            filtergrid.clicked(index, data, tile.y);
48
            filtergrid.clicked(index, data, tile.y);
2092
49
        }
49
        }
2093
50
    }
50
    }
2094
51
51
2095
=== removed directory 'Dash/graphics/lensIcons'
2096
=== removed file 'Dash/graphics/lensIcons/Applications@18.png'
2097
52
Binary files Dash/graphics/lensIcons/Applications@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Applications@18.png	1970-01-01 00:00:00 +0000 differ
52
Binary files Dash/graphics/lensIcons/Applications@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Applications@18.png	1970-01-01 00:00:00 +0000 differ
2098
=== removed file 'Dash/graphics/lensIcons/Home@18.png'
2099
53
Binary files Dash/graphics/lensIcons/Home@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Home@18.png	1970-01-01 00:00:00 +0000 differ
53
Binary files Dash/graphics/lensIcons/Home@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Home@18.png	1970-01-01 00:00:00 +0000 differ
2100
=== removed file 'Dash/graphics/lensIcons/Music@18.png'
2101
54
Binary files Dash/graphics/lensIcons/Music@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Music@18.png	1970-01-01 00:00:00 +0000 differ
54
Binary files Dash/graphics/lensIcons/Music@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Music@18.png	1970-01-01 00:00:00 +0000 differ
2102
=== removed file 'Dash/graphics/lensIcons/People@18.png'
2103
55
Binary files Dash/graphics/lensIcons/People@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/People@18.png	1970-01-01 00:00:00 +0000 differ
55
Binary files Dash/graphics/lensIcons/People@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/People@18.png	1970-01-01 00:00:00 +0000 differ
2104
=== removed file 'Dash/graphics/lensIcons/Videos@18.png'
2105
56
Binary files Dash/graphics/lensIcons/Videos@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Videos@18.png	1970-01-01 00:00:00 +0000 differ
56
Binary files Dash/graphics/lensIcons/Videos@18.png	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/Videos@18.png	1970-01-01 00:00:00 +0000 differ
2106
=== modified file 'Shell.qml'
2107
--- Shell.qml	2013-06-19 18:10:57 +0000
2108
+++ Shell.qml	2013-06-19 20:05:35 +0000
2109
@@ -552,14 +552,14 @@
2110
552
                greeter.hide()
552
                greeter.hide()
2111
553
                // Animate if moving between application and dash
553
                // Animate if moving between application and dash
2112
554
                if (!stages.shown) {
554
                if (!stages.shown) {
2114
555
                    dash.setCurrentLens("home.lens", true, false)
555
                    dash.setCurrentScope("home.scope", true, false)
2115
556
                } else {
556
                } else {
2117
557
                    dash.setCurrentLens("home.lens", false, false)
557
                    dash.setCurrentScope("home.scope", false, false)
2118
558
                }
558
                }
2119
559
                stages.hide();
559
                stages.hide();
2120
560
            }
560
            }
2121
561
            onDash: {
561
            onDash: {
2123
562
                dash.setCurrentLens("applications.lens", true, false)
562
                dash.setCurrentScope("applications.scope", true, false)
2124
563
                stages.hide();
563
                stages.hide();
2125
564
            }
564
            }
2126
565
            onLauncherApplicationSelected:{
565
            onLauncherApplicationSelected:{
2127
566
566
2128
=== modified file 'build_unity'
2129
--- build_unity	2013-06-07 10:36:14 +0000
2130
+++ build_unity	2013-06-19 20:05:35 +0000
2131
@@ -6,11 +6,10 @@
2132
6
UPDATE=false
6
UPDATE=false
2133
7
CLEAN=false
7
CLEAN=false
2134
8
NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
8
NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
2135
9
LENSES="applications mockmusic mockvideos"
2136
10
9
2137
11
# verified working revisions
10
# verified working revisions
2140
12
LIBUNITY_REV=215
11
LIBUNITY_REV=228
2141
13
UNITY_REV=3260
12
UNITY_REV=3343
2142
14
HUD_REV=252
13
HUD_REV=252
2143
15
14
2144
16
usage() {
15
usage() {
2145
@@ -53,12 +52,12 @@
2146
53
52
2147
54
branch_libunity() {
53
branch_libunity() {
2148
55
    echo "Branching libunity.."
54
    echo "Branching libunity.."
2150
56
    bzr branch lp:libunity/phablet $TARGET_DIR/libunity || exit 8
55
    bzr branch lp:libunity $TARGET_DIR/libunity || exit 8
2151
57
}
56
}
2152
58
57
2153
59
branch_unity() {
58
branch_unity() {
2154
60
    echo "Branching Unity.."
59
    echo "Branching Unity.."
2156
61
    bzr branch lp:unity/phablet-mods $TARGET_DIR/unity || exit 9
60
    bzr branch lp:unity $TARGET_DIR/unity || exit 9
2157
62
}
61
}
2158
63
62
2159
64
branch_hud() {
63
branch_hud() {
2160
@@ -92,7 +91,7 @@
2161
92
    mkdir $TARGET_DIR/libunity/build
91
    mkdir $TARGET_DIR/libunity/build
2162
93
    cd $TARGET_DIR/libunity/build
92
    cd $TARGET_DIR/libunity/build
2163
94
93
2165
95
    ../autogen.sh --prefix $BUILD_DIR --disable-debug || exit 15
94
    ../autogen.sh --prefix $BUILD_DIR --disable-debug --with-pygi-overrides-dir=$BUILD_DIR/gi-overrides || exit 15
2166
96
95
2167
97
    echo "Building libunity and installing in " $BUILD_DIR
96
    echo "Building libunity and installing in " $BUILD_DIR
2168
98
    make -j$NUM_JOBS install || exit 16
97
    make -j$NUM_JOBS install || exit 16
2169
@@ -136,14 +135,6 @@
2170
136
135
2171
137
}
136
}
2172
138
137
2173
139
link_lenses() {
2174
140
    echo "Linking system lenses.."
2175
141
    mkdir -p $BUILD_DIR/share/unity/lenses/
2176
142
    for LENS in $LENSES; do
2177
143
        [ -e $BUILD_DIR/share/unity/lenses/$LENS ] || ln -ivs /usr/share/unity/lenses/$LENS $BUILD_DIR/share/unity/lenses/$LENS
2178
144
    done
2179
145
}
2180
146
2181
147
if $SETUP; then
138
if $SETUP; then
2182
148
    echo "Setting up environment for building Unity.."
139
    echo "Setting up environment for building Unity.."
2183
149
    install_utils
140
    install_utils
2184
@@ -163,6 +154,5 @@
2185
163
    compile_libunity
154
    compile_libunity
2186
164
    compile_unity_core
155
    compile_unity_core
2187
165
    compile_hud
156
    compile_hud
2188
166
    link_lenses
2189
167
fi
157
fi
2190
168
158
2191
169
159
2192
=== modified file 'debian/changelog'
2193
--- debian/changelog	2013-06-05 22:03:08 +0000
2194
+++ debian/changelog	2013-06-19 20:05:35 +0000
2195
@@ -1,3 +1,9 @@
2196
1
unity8 (7.81.0) UNRELEASED; urgency=low
2197
2
2198
3
  * New version with support for smart scopes.
2199
4
2200
5
 -- Michał Sawicz <michal.sawicz@canonical.com>  Fri, 14 Jun 2013 12:56:17 +0200
2201
6
2202
1
unity8 (7.80.0) saucy; urgency=low
7
unity8 (7.80.0) saucy; urgency=low
2203
2
8
2204
3
  * Rename to unity8.
9
  * Rename to unity8.
2205
4
10
2206
=== modified file 'debian/control'
2207
--- debian/control	2013-06-19 15:25:39 +0000
2208
+++ debian/control	2013-06-19 20:05:35 +0000
2209
@@ -11,7 +11,7 @@
2210
11
               libgles2-mesa-dev[armhf],
11
               libgles2-mesa-dev[armhf],
2211
12
               libhud-client2-dev,
12
               libhud-client2-dev,
2212
13
               libpulse-dev,
13
               libpulse-dev,
2214
14
               libunity-core-6.0-dev,
14
               libunity-core-6.0-dev (<< 7.80),
2215
15
               libxcb1-dev,
15
               libxcb1-dev,
2216
16
               pkg-config,
16
               pkg-config,
2217
17
               python3,
17
               python3,
2218
@@ -51,6 +51,8 @@
2219
51
            indicators-client-plugin-network (>= 0.6.1),
51
            indicators-client-plugin-network (>= 0.6.1),
2220
52
            indicators-client-plugin-power (>= 0.6.1),
52
            indicators-client-plugin-power (>= 0.6.1),
2221
53
            indicators-client-plugin-sound (>= 0.6.1),
53
            indicators-client-plugin-sound (>= 0.6.1),
2222
54
            unity-scope-home,
2223
55
            unity-lens-applications,
2224
54
Description: Ubuntu QML shell
56
Description: Ubuntu QML shell
2225
55
 The Ubuntu QML shell is the primary user interface for Ubuntu devices.
57
 The Ubuntu QML shell is the primary user interface for Ubuntu devices.
2226
56
58
2227
57
59
2228
=== modified file 'plugins/Unity/CMakeLists.txt'
2229
--- plugins/Unity/CMakeLists.txt	2013-06-05 22:03:08 +0000
2230
+++ plugins/Unity/CMakeLists.txt	2013-06-19 20:05:35 +0000
2231
@@ -13,11 +13,10 @@
2232
13
13
2233
14
set(QMLPLUGIN_SRC
14
set(QMLPLUGIN_SRC
2234
15
    ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
15
    ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
2237
16
    lens.cpp
16
    scope.cpp
2238
17
    lenses.cpp
17
    scopes.cpp
2239
18
    categories.cpp
18
    categories.cpp
2240
19
    categoryfilter.cpp
19
    categoryfilter.cpp
2241
20
    peoplepreviewdata.cpp
2242
21
    plugin.cpp
20
    plugin.cpp
2243
22
    bottombarvisibilitycommunicatorshell.cpp
21
    bottombarvisibilitycommunicatorshell.cpp
2244
23
    launchermodel.cpp
22
    launchermodel.cpp
2245
24
23
2246
=== modified file 'plugins/Unity/categories.cpp'
2247
--- plugins/Unity/categories.cpp	2013-06-05 22:03:08 +0000
2248
+++ plugins/Unity/categories.cpp	2013-06-19 20:05:35 +0000
2249
@@ -24,7 +24,6 @@
2250
24
Categories::Categories(QObject* parent)
24
Categories::Categories(QObject* parent)
2251
25
    : DeeListModel(parent)
25
    : DeeListModel(parent)
2252
26
    , m_resultModel(0)
26
    , m_resultModel(0)
2253
27
    , m_globalResultModel(0)
2254
28
{
27
{
2255
29
    // FIXME: need to clean up unused filters on countChanged
28
    // FIXME: need to clean up unused filters on countChanged
2256
30
    m_roles[Categories::RoleId] = "id";
29
    m_roles[Categories::RoleId] = "id";
2257
@@ -33,9 +32,7 @@
2258
33
    m_roles[Categories::RoleRenderer] = "renderer";
32
    m_roles[Categories::RoleRenderer] = "renderer";
2259
34
    m_roles[Categories::RoleHints] = "hints";
33
    m_roles[Categories::RoleHints] = "hints";
2260
35
    m_roles[Categories::RoleResults] = "results";
34
    m_roles[Categories::RoleResults] = "results";
2261
36
    m_roles[Categories::RoleGlobalResults] = "globalResults";
2262
37
    m_roles[Categories::RoleCount] = "count";
35
    m_roles[Categories::RoleCount] = "count";
2263
38
    m_roles[Categories::RoleGlobalCount] = "globalCount";
2264
39
36
2265
40
    // TODO This should not be needed but accumulatting the count changes
37
    // TODO This should not be needed but accumulatting the count changes
2266
41
    // makes the visualization more stable and also makes crashes on fast
38
    // makes the visualization more stable and also makes crashes on fast
2267
@@ -48,7 +45,6 @@
2268
48
Categories::~Categories()
45
Categories::~Categories()
2269
49
{
46
{
2270
50
    qDeleteAll(m_filters);
47
    qDeleteAll(m_filters);
2271
51
    qDeleteAll(m_globalFilters);
2272
52
}
48
}
2273
53
49
2274
54
CategoryFilter*
50
CategoryFilter*
2275
@@ -66,21 +62,6 @@
2276
66
    return m_filters[index];
62
    return m_filters[index];
2277
67
}
63
}
2278
68
64
2279
69
CategoryFilter*
2280
70
Categories::getGlobalFilter(int index) const
2281
71
{
2282
72
    if (!m_globalFilters.contains(index)) {
2283
73
        CategoryFilter* filter = new CategoryFilter();
2284
74
        connect(filter, SIGNAL(countChanged()), this, SLOT(onGlobalCountChanged()));
2285
75
        filter->setModel(m_globalResultModel);
2286
76
        filter->setIndex(index);
2287
77
2288
78
        m_globalFilters.insert(index, filter);
2289
79
    }
2290
80
2291
81
    return m_globalFilters[index];
2292
82
}
2293
83
2294
84
void
65
void
2295
85
Categories::setResultModel(DeeListModel* model)
66
Categories::setResultModel(DeeListModel* model)
2296
86
{
67
{
2297
@@ -96,20 +77,6 @@
2298
96
}
77
}
2299
97
78
2300
98
void
79
void
2301
99
Categories::setGlobalResultModel(DeeListModel* model)
2302
100
{
2303
101
    if (model != m_globalResultModel) {
2304
102
        m_globalResultModel = model;
2305
103
2306
104
        Q_FOREACH(CategoryFilter* filter, m_globalFilters) {
2307
105
            filter->setModel(m_globalResultModel);
2308
106
        }
2309
107
2310
108
        Q_EMIT globalResultModelChanged(m_globalResultModel);
2311
109
    }
2312
110
}
2313
111
2314
112
void
2315
113
Categories::onCountChanged()
80
Categories::onCountChanged()
2316
114
{
81
{
2317
115
    CategoryFilter* filter = qobject_cast<CategoryFilter*>(sender());
82
    CategoryFilter* filter = qobject_cast<CategoryFilter*>(sender());
2318
@@ -131,18 +98,6 @@
2319
131
    m_timerFilters.clear();
98
    m_timerFilters.clear();
2320
132
}
99
}
2321
133
100
2322
134
void
2323
135
Categories::onGlobalCountChanged()
2324
136
{
2325
137
    CategoryFilter* filter = qobject_cast<CategoryFilter*>(sender());
2326
138
    if (filter) {
2327
139
        QModelIndex changedIndex = index(filter->index());
2328
140
        QVector<int> roles;
2329
141
        roles.append(Categories::RoleGlobalCount);
2330
142
        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
2331
143
    }
2332
144
}
2333
145
2334
146
QHash<int, QByteArray>
101
QHash<int, QByteArray>
2335
147
Categories::roleNames() const
102
Categories::roleNames() const
2336
148
{
103
{
2337
@@ -159,23 +114,18 @@
2338
159
    if (role == RoleId) {
114
    if (role == RoleId) {
2339
160
        return QVariant::fromValue(index.row());
115
        return QVariant::fromValue(index.row());
2340
161
    } else if (role == RoleName) {
116
    } else if (role == RoleName) {
2342
162
        return QVariant::fromValue(DeeListModel::data(index, 0));
117
        return QVariant::fromValue(DeeListModel::data(index, 1)); //DISPLAY_NAME
2343
163
    } else if (role == RoleIcon) {
118
    } else if (role == RoleIcon) {
2345
164
        return QVariant::fromValue(DeeListModel::data(index, 1));
119
        return QVariant::fromValue(DeeListModel::data(index, 2)); //ICON_HINT
2346
165
    } else if (role == RoleRenderer) {
120
    } else if (role == RoleRenderer) {
2348
166
        return QVariant::fromValue(DeeListModel::data(index, 2));
121
        return QVariant::fromValue(DeeListModel::data(index, 3)); //RENDERER_NAME
2349
167
    } else if (role == RoleHints) {
122
    } else if (role == RoleHints) {
2351
168
        return QVariant::fromValue(DeeListModel::data(index, 3));
123
        return QVariant::fromValue(DeeListModel::data(index, 4)); //HINTS
2352
169
    } else if (role == RoleResults) {
124
    } else if (role == RoleResults) {
2353
170
        return QVariant::fromValue(getFilter(index.row()));
125
        return QVariant::fromValue(getFilter(index.row()));
2354
171
    } else if (role == RoleGlobalResults) {
2355
172
        return QVariant::fromValue(getGlobalFilter(index.row()));
2356
173
    } else if (role == RoleCount) {
126
    } else if (role == RoleCount) {
2357
174
        CategoryFilter* filter = getFilter(index.row());
127
        CategoryFilter* filter = getFilter(index.row());
2358
175
        return QVariant::fromValue(filter->rowCount());
128
        return QVariant::fromValue(filter->rowCount());
2359
176
    } else if (role == RoleGlobalCount) {
2360
177
        QSortFilterProxyModel* filter = getGlobalFilter(index.row());
2361
178
        return QVariant::fromValue(filter->rowCount());
2362
179
    } else {
129
    } else {
2363
180
        return QVariant();
130
        return QVariant();
2364
181
    }
131
    }
2365
182
132
2366
=== modified file 'plugins/Unity/categories.h'
2367
--- plugins/Unity/categories.h	2013-06-05 22:03:08 +0000
2368
+++ plugins/Unity/categories.h	2013-06-19 20:05:35 +0000
2369
@@ -36,7 +36,6 @@
2370
36
    Q_ENUMS(Roles)
36
    Q_ENUMS(Roles)
2371
37
37
2372
38
    Q_PROPERTY(DeeListModel* resultModel READ resultModel WRITE setResultModel NOTIFY resultModelChanged)
38
    Q_PROPERTY(DeeListModel* resultModel READ resultModel WRITE setResultModel NOTIFY resultModelChanged)
2373
39
    Q_PROPERTY(DeeListModel* globalResultModel READ globalResultModel WRITE setResultModel NOTIFY globalResultModelChanged)
2374
40
39
2375
41
public:
40
public:
2376
42
    explicit Categories(QObject* parent = 0);
41
    explicit Categories(QObject* parent = 0);
2377
@@ -49,9 +48,7 @@
2378
49
        RoleRenderer,
48
        RoleRenderer,
2379
50
        RoleHints,
49
        RoleHints,
2380
51
        RoleResults,
50
        RoleResults,
2384
52
        RoleGlobalResults,
51
        RoleCount
2382
53
        RoleCount,
2383
54
        RoleGlobalCount
2385
55
    };
52
    };
2386
56
53
2387
57
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
54
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
2388
@@ -60,32 +57,25 @@
2389
60
57
2390
61
    /* getters */
58
    /* getters */
2391
62
    DeeListModel* resultModel() { return m_resultModel; }
59
    DeeListModel* resultModel() { return m_resultModel; }
2392
63
    DeeListModel* globalResultModel() { return m_globalResultModel; }
2393
64
60
2394
65
    /* setters */
61
    /* setters */
2395
66
    void setResultModel(DeeListModel*);
62
    void setResultModel(DeeListModel*);
2396
67
    void setGlobalResultModel(DeeListModel*);
2397
68
63
2398
69
Q_SIGNALS:
64
Q_SIGNALS:
2399
70
    void resultModelChanged(DeeListModel*);
65
    void resultModelChanged(DeeListModel*);
2400
71
    void globalResultModelChanged(DeeListModel*);
2401
72
66
2402
73
private Q_SLOTS:
67
private Q_SLOTS:
2403
74
    void onCountChanged();
68
    void onCountChanged();
2404
75
    void onGlobalCountChanged();
2405
76
    void onEmitCountChanged();
69
    void onEmitCountChanged();
2406
77
70
2407
78
private:
71
private:
2408
79
    CategoryFilter* getFilter(int index) const;
72
    CategoryFilter* getFilter(int index) const;
2409
80
    CategoryFilter* getGlobalFilter(int index) const;
2410
81
73
2411
82
    QTimer m_timer;
74
    QTimer m_timer;
2412
83
    QSet<CategoryFilter*> m_timerFilters;
75
    QSet<CategoryFilter*> m_timerFilters;
2413
84
    QHash<int, QByteArray> m_roles;
76
    QHash<int, QByteArray> m_roles;
2414
85
    DeeListModel* m_resultModel;
77
    DeeListModel* m_resultModel;
2415
86
    DeeListModel* m_globalResultModel;
2416
87
    mutable QMap<int, CategoryFilter*> m_filters;
78
    mutable QMap<int, CategoryFilter*> m_filters;
2417
88
    mutable QMap<int, CategoryFilter*> m_globalFilters;
2418
89
};
79
};
2419
90
80
2420
91
#endif // CATEGORIES_H
81
#endif // CATEGORIES_H
2421
92
82
2422
=== removed file 'plugins/Unity/peoplepreviewdata.cpp'
2423
--- plugins/Unity/peoplepreviewdata.cpp	2013-06-05 22:03:08 +0000
2424
+++ plugins/Unity/peoplepreviewdata.cpp	1970-01-01 00:00:00 +0000
2425
@@ -1,438 +0,0 @@
2426
1
/*
2427
2
 * Copyright (C) 2012 Canonical, Ltd.
2428
3
 *
2429
4
 * Authors:
2430
5
 *  Guenter Schwann <guenter.schwann@canonical.com>
2431
6
 *
2432
7
 * This program is free software; you can redistribute it and/or modify
2433
8
 * it under the terms of the GNU General Public License as published by
2434
9
 * the Free Software Foundation; version 3.
2435
10
 *
2436
11
 * This program is distributed in the hope that it will be useful,
2437
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2438
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2439
14
 * GNU General Public License for more details.
2440
15
 *
2441
16
 * You should have received a copy of the GNU General Public License
2442
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2443
18
 */
2444
19
2445
20
#include "peoplepreviewdata.h"
2446
21
2447
22
#include <QDebug>
2448
23
2449
24
#include "lens.h"
2450
25
2451
26
static void phoneAppend(QQmlListProperty<PeoplePhoneData> *property, PeoplePhoneData *val)
2452
27
{
2453
28
    Q_UNUSED(val);
2454
29
    Q_UNUSED(property);
2455
30
}
2456
31
static PeoplePhoneData *phoneAt(QQmlListProperty<PeoplePhoneData> *property, int index)
2457
32
{
2458
33
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2459
34
    return d->phoneNumberList().at(index);
2460
35
}
2461
36
static int phoneCount(QQmlListProperty<PeoplePhoneData> *property)
2462
37
{
2463
38
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2464
39
    return d->phoneNumberList().count();
2465
40
}
2466
41
static void phoneClear(QQmlListProperty<PeoplePhoneData> *property)
2467
42
{
2468
43
    Q_UNUSED(property);
2469
44
}
2470
45
2471
46
static void emailAppend(QQmlListProperty<PeopleAddressData> *property, PeopleAddressData *val)
2472
47
{
2473
48
    Q_UNUSED(val);
2474
49
    Q_UNUSED(property);
2475
50
}
2476
51
static PeopleAddressData *emailAt(QQmlListProperty<PeopleAddressData> *property, int index)
2477
52
{
2478
53
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2479
54
    return d->emailAddressesList().at(index);
2480
55
}
2481
56
static int emailCount(QQmlListProperty<PeopleAddressData> *property)
2482
57
{
2483
58
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2484
59
    return d->emailAddressesList().count();
2485
60
}
2486
61
static void emailClear(QQmlListProperty<PeopleAddressData> *property)
2487
62
{
2488
63
    Q_UNUSED(property);
2489
64
}
2490
65
2491
66
static void imAppend(QQmlListProperty<PeopleIMData> *property, PeopleIMData *val)
2492
67
{
2493
68
    Q_UNUSED(val);
2494
69
    Q_UNUSED(property);
2495
70
}
2496
71
static PeopleIMData *imAt(QQmlListProperty<PeopleIMData> *property, int index)
2497
72
{
2498
73
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2499
74
    return d->imAccountsList().at(index);
2500
75
}
2501
76
static int imCount(QQmlListProperty<PeopleIMData> *property)
2502
77
{
2503
78
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2504
79
    return d->imAccountsList().count();
2505
80
}
2506
81
static void imClear(QQmlListProperty<PeopleIMData> *property)
2507
82
{
2508
83
    Q_UNUSED(property);
2509
84
}
2510
85
2511
86
static void addressAppend(QQmlListProperty<PeopleAddressData> *property, PeopleAddressData *val)
2512
87
{
2513
88
    Q_UNUSED(val);
2514
89
    Q_UNUSED(property);
2515
90
}
2516
91
static PeopleAddressData *addressAt(QQmlListProperty<PeopleAddressData> *property, int index)
2517
92
{
2518
93
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2519
94
    return d->addressesList().at(index);
2520
95
}
2521
96
static int addressCount(QQmlListProperty<PeopleAddressData> *property)
2522
97
{
2523
98
    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
2524
99
    return d->addressesList().count();
2525
100
}
2526
101
static void addressClear(QQmlListProperty<PeopleAddressData> *property)
2527
102
{
2528
103
    Q_UNUSED(property);
2529
104
}
2530
105
2531
106
2532
107
using namespace unity;
2533
108
2534
109
PeoplePreviewData::PeoplePreviewData(QObject *parent)
2535
110
:   QObject(parent)
2536
111
,   m_lens(0)
2537
112
,   m_ready(false)
2538
113
{
2539
114
}
2540
115
2541
116
PeoplePreviewData::~PeoplePreviewData()
2542
117
{
2543
118
    clearData();
2544
119
}
2545
120
2546
121
Lens *PeoplePreviewData::lens() const
2547
122
{
2548
123
    return m_lens;
2549
124
}
2550
125
2551
126
void PeoplePreviewData::setLens(Lens *lens)
2552
127
{
2553
128
    if (lens == m_lens)
2554
129
        return;
2555
130
2556
131
    setReady(false);
2557
132
2558
133
    if (m_lensConnection.connected())
2559
134
       m_lensConnection.disconnect();
2560
135
2561
136
    m_lens = lens;
2562
137
    m_lensConnection = m_lens->unityLens()->preview_ready.connect(
2563
138
                sigc::mem_fun(this, &PeoplePreviewData::setUnityPreview));
2564
139
    Q_EMIT lensChanged();
2565
140
2566
141
    if (!m_uri.isEmpty() && !m_lens)
2567
142
        getPeoplePreview();
2568
143
}
2569
144
2570
145
QString PeoplePreviewData::uri() const
2571
146
{
2572
147
    return m_uri;
2573
148
}
2574
149
2575
150
void PeoplePreviewData::setUri(const QString &uri)
2576
151
{
2577
152
    if (uri == m_uri)
2578
153
        return;
2579
154
2580
155
    setReady(false);
2581
156
2582
157
    m_uri = uri;
2583
158
    Q_EMIT uriChanged();
2584
159
    if (!m_uri.isEmpty() && m_lens)
2585
160
        getPeoplePreview();
2586
161
}
2587
162
2588
163
bool PeoplePreviewData::ready() const
2589
164
{
2590
165
    return m_ready;
2591
166
}
2592
167
2593
168
void PeoplePreviewData::setReady(const bool &ready)
2594
169
{
2595
170
    if (ready == m_ready)
2596
171
        return;
2597
172
2598
173
    m_ready = ready;
2599
174
    Q_EMIT readyChanged();
2600
175
}
2601
176
2602
177
QString PeoplePreviewData::renderName() const
2603
178
{
2604
179
    if (!m_unityPreview)
2605
180
        return QLatin1String("");
2606
181
2607
182
    return QString::fromStdString(m_unityPreview->renderer_name());
2608
183
}
2609
184
2610
185
QString PeoplePreviewData::title() const
2611
186
{
2612
187
    if (!m_unityPreview)
2613
188
        return QLatin1String("");
2614
189
2615
190
    return QString::fromStdString(m_unityPreview->title());
2616
191
}
2617
192
2618
193
QString PeoplePreviewData::subTitle() const
2619
194
{
2620
195
    if (!m_unityPreview)
2621
196
        return QLatin1String("");
2622
197
2623
198
    return QString::fromStdString(m_unityPreview->subtitle());
2624
199
}
2625
200
2626
201
QString PeoplePreviewData::description() const
2627
202
{
2628
203
    if (!m_unityPreview)
2629
204
        return QLatin1String("");
2630
205
2631
206
    return QString::fromStdString(m_unityPreview->description());
2632
207
}
2633
208
2634
209
QString PeoplePreviewData::imageSource() const
2635
210
{
2636
211
    if (!m_unityPreview)
2637
212
        return QLatin1String("");
2638
213
2639
214
    return QString::fromStdString(m_unityPreview->image_source_uri());
2640
215
}
2641
216
2642
217
QQmlListProperty<PeoplePhoneData> PeoplePreviewData::phoneNumbers()
2643
218
{
2644
219
    return QQmlListProperty<PeoplePhoneData> (this, this,
2645
220
                                              phoneAppend,
2646
221
                                              phoneCount,
2647
222
                                              phoneAt,
2648
223
                                              phoneClear);
2649
224
}
2650
225
2651
226
QQmlListProperty<PeopleAddressData> PeoplePreviewData::emailAddresses()
2652
227
{
2653
228
    return QQmlListProperty<PeopleAddressData> (this, this,
2654
229
                                              emailAppend,
2655
230
                                              emailCount,
2656
231
                                              emailAt,
2657
232
                                              emailClear);
2658
233
}
2659
234
2660
235
QQmlListProperty<PeopleIMData> PeoplePreviewData::imAccounts()
2661
236
{
2662
237
    return QQmlListProperty<PeopleIMData> (this, this,
2663
238
                                              imAppend,
2664
239
                                              imCount,
2665
240
                                              imAt,
2666
241
                                              imClear);
2667
242
}
2668
243
2669
244
QString PeoplePreviewData::displayName() const
2670
245
{
2671
246
    if (!m_unityPreview)
2672
247
        return QLatin1String("");
2673
248
2674
249
    return QString::fromStdString(m_unityPreview->display_name());
2675
250
}
2676
251
2677
252
QString PeoplePreviewData::status() const
2678
253
{
2679
254
    if (!m_unityPreview)
2680
255
        return QLatin1String("");
2681
256
2682
257
    return QString::fromStdString(m_unityPreview->status());
2683
258
}
2684
259
2685
260
QString PeoplePreviewData::statusTime() const
2686
261
{
2687
262
    if (!m_unityPreview)
2688
263
        return QLatin1String("");
2689
264
2690
265
    return QString::fromStdString(m_unityPreview->status_time());
2691
266
}
2692
267
2693
268
QString PeoplePreviewData::statusService() const
2694
269
{
2695
270
    if (!m_unityPreview)
2696
271
        return QLatin1String("");
2697
272
2698
273
    return QString::fromStdString(m_unityPreview->status_service());
2699
274
}
2700
275
2701
276
QString PeoplePreviewData::statusServiceIcon() const
2702
277
{
2703
278
    if (!m_unityPreview)
2704
279
        return QLatin1String("");
2705
280
2706
281
    glib::Object<GIcon> icon = m_unityPreview->status_service_icon();
2707
282
    if (!icon)
2708
283
        return QLatin1String("");
2709
284
2710
285
    return QString(g_icon_to_string(icon));
2711
286
}
2712
287
2713
288
QString PeoplePreviewData::statusPostUri() const
2714
289
{
2715
290
    if (!m_unityPreview)
2716
291
        return QLatin1String("");
2717
292
2718
293
    return QString::fromStdString(m_unityPreview->status_post_uri());
2719
294
}
2720
295
2721
296
QQmlListProperty<PeopleAddressData> PeoplePreviewData::addresses()
2722
297
{
2723
298
    return QQmlListProperty<PeopleAddressData> (this, this,
2724
299
                                              addressAppend,
2725
300
                                              addressCount,
2726
301
                                              addressAt,
2727
302
                                              addressClear);
2728
303
}
2729
304
2730
305
QString PeoplePreviewData::avatar() const
2731
306
{
2732
307
    if (!m_unityPreview)
2733
308
        return QLatin1String("");
2734
309
2735
310
    glib::Object<GIcon> avatar = m_unityPreview->avatar();
2736
311
    if (!avatar)
2737
312
        return QLatin1String("");
2738
313
2739
314
    return QString(g_icon_to_string(avatar));
2740
315
}
2741
316
2742
317
void PeoplePreviewData::getPeoplePreview()
2743
318
{
2744
319
    m_lens->unityLens()->Preview(m_uri.toStdString());
2745
320
}
2746
321
2747
322
void PeoplePreviewData::setUnityPreview(std::string const& uri, dash::Preview::Ptr const& preview)
2748
323
{
2749
324
    if (uri != m_uri.toStdString())
2750
325
        return;
2751
326
2752
327
    dash::PeoplePreview::Ptr peoplePtr = std::dynamic_pointer_cast<dash::PeoplePreview>(preview);
2753
328
    if (peoplePtr == nullptr) {
2754
329
        qWarning() << "Backend returned a dash::Preview that isn't a dash::PeoplePreview";
2755
330
        Q_EMIT error();
2756
331
        return;
2757
332
    }
2758
333
2759
334
    clearData();
2760
335
    m_unityPreview = peoplePtr;
2761
336
    getPhoneData();
2762
337
    getEmailAddresses();
2763
338
    getImAccounts();
2764
339
    getAddresses();
2765
340
2766
341
    Q_EMIT renderNameChanged();
2767
342
    Q_EMIT titleChanged();
2768
343
    Q_EMIT subTitleChanged();
2769
344
    Q_EMIT descriptionChanged();
2770
345
    Q_EMIT imageSourceChanged();
2771
346
    Q_EMIT phoneNumbersChanged();
2772
347
    Q_EMIT emailAddressesChanged();
2773
348
    Q_EMIT imAccountsChanged();
2774
349
    Q_EMIT displayNameChanged();
2775
350
    Q_EMIT statusChanged();
2776
351
    Q_EMIT statusTimeChanged();
2777
352
    Q_EMIT statusServiceChanged();
2778
353
    Q_EMIT addressesChanged();
2779
354
    Q_EMIT avatarChanged();
2780
355
2781
356
    setReady(true);
2782
357
}
2783
358
2784
359
void PeoplePreviewData::clearData()
2785
360
{
2786
361
    while (!m_phoneList.empty()) {
2787
362
        PeoplePhoneData *phone = m_phoneList.takeLast();
2788
363
        delete phone;
2789
364
    }
2790
365
    while (!m_emailList.empty()) {
2791
366
        PeopleAddressData *email = m_emailList.takeLast();
2792
367
        delete email;
2793
368
    }
2794
369
    while (!m_imList.empty()) {
2795
370
        PeopleIMData *im = m_imList.takeLast();
2796
371
        delete im;
2797
372
    }
2798
373
    while (!m_addressList.empty()) {
2799
374
        PeopleAddressData *address = m_addressList.takeLast();
2800
375
        delete address;
2801
376
    }
2802
377
}
2803
378
2804
379
void PeoplePreviewData::getPhoneData()
2805
380
{
2806
381
    dash::PeoplePreview::PhonePtrList uPhoneList;
2807
382
    uPhoneList = m_unityPreview->GetPhone();
2808
383
2809
384
    for (size_t i=0; i<uPhoneList.size(); ++i) {
2810
385
        PeoplePhoneData *phone = new PeoplePhoneData;
2811
386
        phone->m_type = QString::fromStdString(uPhoneList[i]->type);
2812
387
        phone->m_location = QString::fromStdString(uPhoneList[i]->location);
2813
388
        phone->m_number = QString::fromStdString(uPhoneList[i]->number);
2814
389
        m_phoneList.append(phone);
2815
390
    }
2816
391
}
2817
392
2818
393
void PeoplePreviewData::getEmailAddresses()
2819
394
{
2820
395
    dash::PeoplePreview::EmailPtrList uEmailList;
2821
396
    uEmailList = m_unityPreview->GetEmail();
2822
397
2823
398
    for (size_t i=0; i<uEmailList.size(); ++i) {
2824
399
        PeopleAddressData *email = new PeopleAddressData;
2825
400
        email->m_type = QString::fromStdString(uEmailList[i]->type);
2826
401
        email->m_address = QString::fromStdString(uEmailList[i]->address);
2827
402
        m_emailList.append(email);
2828
403
    }
2829
404
}
2830
405
2831
406
void PeoplePreviewData::getImAccounts()
2832
407
{
2833
408
    dash::PeoplePreview::IMAccountPtrList uIMList;
2834
409
    uIMList = m_unityPreview->GetIMAccount();
2835
410
2836
411
    for (size_t i=0; i<uIMList.size(); ++i) {
2837
412
        PeopleIMData *im = new PeopleIMData;
2838
413
        im->m_protocol = QString::fromStdString(uIMList[i]->protocol);
2839
414
        im->m_address = QString::fromStdString(uIMList[i]->address);
2840
415
        m_imList.append(im);
2841
416
    }
2842
417
}
2843
418
2844
419
void PeoplePreviewData::getAddresses()
2845
420
{
2846
421
    dash::PeoplePreview::AddressPtrList uAddressList;
2847
422
    uAddressList = m_unityPreview->GetAddress();
2848
423
2849
424
    for (size_t i=0; i<uAddressList.size(); ++i) {
2850
425
        PeopleAddressData *address = new PeopleAddressData;
2851
426
        address->m_type = QString::fromStdString(uAddressList[i]->type);
2852
427
        address->m_address = QString::fromStdString(uAddressList[i]->address);
2853
428
        address->m_poBox = QString::fromStdString(uAddressList[i]->po_box);
2854
429
        address->m_extension = QString::fromStdString(uAddressList[i]->extension);
2855
430
        address->m_street = QString::fromStdString(uAddressList[i]->street);
2856
431
        address->m_locality = QString::fromStdString(uAddressList[i]->locality);
2857
432
        address->m_region = QString::fromStdString(uAddressList[i]->region);
2858
433
        address->m_postalCode = QString::fromStdString(uAddressList[i]->postal_code);
2859
434
        address->m_country = QString::fromStdString(uAddressList[i]->country);
2860
435
        address->m_addressFormat = QString::fromStdString(uAddressList[i]->address_format);
2861
436
        m_addressList.append(address);
2862
437
    }
2863
438
}
2864
439
0
2865
=== removed file 'plugins/Unity/peoplepreviewdata.h'
2866
--- plugins/Unity/peoplepreviewdata.h	2013-06-05 22:03:08 +0000
2867
+++ plugins/Unity/peoplepreviewdata.h	1970-01-01 00:00:00 +0000
2868
@@ -1,251 +0,0 @@
2869
1
/*
2870
2
 * Copyright (C) 2012 Canonical, Ltd.
2871
3
 *
2872
4
 * Authors:
2873
5
 *  Guenter Schwann <guenter.schwann@canonical.com>
2874
6
 *
2875
7
 * This program is free software; you can redistribute it and/or modify
2876
8
 * it under the terms of the GNU General Public License as published by
2877
9
 * the Free Software Foundation; version 3.
2878
10
 *
2879
11
 * This program is distributed in the hope that it will be useful,
2880
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2881
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2882
14
 * GNU General Public License for more details.
2883
15
 *
2884
16
 * You should have received a copy of the GNU General Public License
2885
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2886
18
 */
2887
19
2888
20
#ifndef PEOPLEPREVIEWDATA_H
2889
21
#define PEOPLEPREVIEWDATA_H
2890
22
2891
23
#include <QList>
2892
24
#include <QObject>
2893
25
#include <qqmllist.h>
2894
26
#include <QString>
2895
27
2896
28
// libunity-core
2897
29
#include <UnityCore/PeoplePreview.h>
2898
30
2899
31
#include <sigc++/connection.h>
2900
32
2901
33
class Lens;
2902
34
2903
35
/*!
2904
36
 * \brief The PeoplePhoneData class stores the data for one phone number
2905
37
 */
2906
38
class PeoplePhoneData : public QObject
2907
39
{
2908
40
    Q_OBJECT
2909
41
    Q_PROPERTY(QString type READ type NOTIFY typeChanged)
2910
42
    Q_PROPERTY(QString location READ location NOTIFY locationChanged)
2911
43
    Q_PROPERTY(QString number READ number NOTIFY numberChanged)
2912
44
2913
45
Q_SIGNALS:
2914
46
    void typeChanged();
2915
47
    void locationChanged();
2916
48
    void numberChanged();
2917
49
2918
50
public:
2919
51
    explicit PeoplePhoneData(QObject *parent = 0) : QObject(parent) {}
2920
52
    QString type() const { return m_type; }
2921
53
    QString location() const { return m_location; }
2922
54
    QString number() const { return m_number; }
2923
55
2924
56
private:
2925
57
    QString m_type;
2926
58
    QString m_location;
2927
59
    QString m_number;
2928
60
    friend class PeoplePreviewData;
2929
61
};
2930
62
2931
63
/*!
2932
64
 * \brief The PeopleAddressData class stores the data for one single post/email address
2933
65
 */
2934
66
class PeopleAddressData : public QObject
2935
67
{
2936
68
    Q_OBJECT
2937
69
    Q_PROPERTY(QString type READ type NOTIFY typeChanged)
2938
70
    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
2939
71
    Q_PROPERTY(QString poBox READ poBox NOTIFY poBoxChanged)
2940
72
    Q_PROPERTY(QString extension READ extension NOTIFY extensionChanged)
2941
73
    Q_PROPERTY(QString street READ street NOTIFY streetChanged)
2942
74
    Q_PROPERTY(QString locality READ locality NOTIFY localityChanged)
2943
75
    Q_PROPERTY(QString region READ region NOTIFY regionChanged)
2944
76
    Q_PROPERTY(QString postalCode READ postalCode NOTIFY postalCodeChanged)
2945
77
    Q_PROPERTY(QString country READ country NOTIFY countryChanged)
2946
78
    Q_PROPERTY(QString addressFormat READ addressFormat NOTIFY addressFormatChanged)
2947
79
2948
80
Q_SIGNALS:
2949
81
    void typeChanged();
2950
82
    void addressChanged();
2951
83
    void poBoxChanged();
2952
84
    void extensionChanged();
2953
85
    void streetChanged();
2954
86
    void localityChanged();
2955
87
    void regionChanged();
2956
88
    void postalCodeChanged();
2957
89
    void countryChanged();
2958
90
    void addressFormatChanged();
2959
91
2960
92
public:
2961
93
    explicit PeopleAddressData(QObject *parent = 0) : QObject(parent) {}
2962
94
    QString type() const { return m_type; }
2963
95
    QString address() const { return m_address; }
2964
96
    QString poBox() const { return m_poBox; }
2965
97
    QString extension() const { return m_extension; }
2966
98
    QString street() const { return m_street; }
2967
99
    QString locality() const { return m_locality; }
2968
100
    QString region() const { return m_region; }
2969
101
    QString postalCode() const { return m_postalCode; }
2970
102
    QString country() const { return m_country; }
2971
103
    QString addressFormat() const { return m_addressFormat; }
2972
104
2973
105
private:
2974
106
    QString m_type;
2975
107
    QString m_address;
2976
108
    QString m_poBox;
2977
109
    QString m_extension;
2978
110
    QString m_street;
2979
111
    QString m_locality;
2980
112
    QString m_region;
2981
113
    QString m_postalCode;
2982
114
    QString m_country;
2983
115
    QString m_addressFormat;
2984
116
    friend class PeoplePreviewData;
2985
117
};
2986
118
2987
119
/*!
2988
120
 * \brief The PeopleIMData class stores the data for one single post/email address
2989
121
 */
2990
122
class PeopleIMData : public QObject
2991
123
{
2992
124
    Q_OBJECT
2993
125
    Q_PROPERTY(QString protocol READ protocol NOTIFY protocolChanged)
2994
126
    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
2995
127
2996
128
Q_SIGNALS:
2997
129
    void protocolChanged();
2998
130
    void addressChanged();
2999
131
3000
132
public:
3001
133
    explicit PeopleIMData(QObject *parent = 0) : QObject(parent) {}
3002
134
    QString protocol() const { return m_protocol; }
3003
135
    QString address() const { return m_address; }
3004
136
3005
137
private:
3006
138
    QString m_protocol;
3007
139
    QString m_address;
3008
140
    friend class PeoplePreviewData;
3009
141
};
3010
142
3011
143
3012
144
/*!
3013
145
 * \brief The PeoplePreviewData class providing information for one person
3014
146
 */
3015
147
class PeoplePreviewData : public QObject
3016
148
{
3017
149
    Q_OBJECT
3018
150
3019
151
    // These properties need to be set from QML
3020
152
    Q_PROPERTY(Lens* lens READ lens WRITE setLens NOTIFY lensChanged)
3021
153
    Q_PROPERTY(QString uri READ uri WRITE setUri NOTIFY uriChanged)
3022
154
    // Read only properties containing general Preview information
3023
155
    Q_PROPERTY(bool ready READ ready NOTIFY readyChanged)
3024
156
    Q_PROPERTY(QString renderName READ renderName NOTIFY renderNameChanged)
3025
157
    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
3026
158
    Q_PROPERTY(QString subTitle READ subTitle NOTIFY subTitleChanged)
3027
159
    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
3028
160
    Q_PROPERTY(QString imageSource READ imageSource NOTIFY imageSourceChanged)
3029
161
    // Read only properties containing PeoplePreview specific information
3030
162
    Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
3031
163
    Q_PROPERTY(QQmlListProperty<PeopleAddressData> emailAddresses READ emailAddresses NOTIFY emailAddressesChanged)
3032
164
    Q_PROPERTY(QQmlListProperty<PeoplePhoneData> phoneNumbers READ phoneNumbers NOTIFY phoneNumbersChanged)
3033
165
    Q_PROPERTY(QQmlListProperty<PeopleIMData> imAccounts READ imAccounts NOTIFY imAccountsChanged)
3034
166
    Q_PROPERTY(QString status READ status NOTIFY statusChanged)
3035
167
    Q_PROPERTY(QString statusTime READ statusTime NOTIFY statusTimeChanged)
3036
168
    Q_PROPERTY(QString statusService READ statusService NOTIFY statusServiceChanged)
3037
169
    Q_PROPERTY(QString statusServiceIcon READ statusServiceIcon NOTIFY statusServiceIconChanged)
3038
170
    Q_PROPERTY(QString statusPostUri READ statusPostUri NOTIFY statusPostUriChanged)
3039
171
    Q_PROPERTY(QQmlListProperty<PeopleAddressData> addresses READ addresses NOTIFY addressesChanged)
3040
172
    Q_PROPERTY(QString avatar READ avatar NOTIFY avatarChanged)
3041
173
3042
174
public:
3043
175
    PeoplePreviewData(QObject *parent = 0);
3044
176
    ~PeoplePreviewData();
3045
177
3046
178
    void setUnityPeoplePreview(const unity::dash::Preview::Ptr& preview);
3047
179
    void setLens(Lens *lens);
3048
180
    void setUri(const QString &uri);
3049
181
3050
182
    Lens *lens() const;
3051
183
    QString uri() const;
3052
184
    bool ready() const;
3053
185
    QString renderName() const;
3054
186
    QString title() const;
3055
187
    QString subTitle() const;
3056
188
    QString description() const;
3057
189
    QString imageSource() const;
3058
190
    QString displayName() const;
3059
191
    QQmlListProperty<PeoplePhoneData> phoneNumbers();
3060
192
    QQmlListProperty<PeopleAddressData> emailAddresses();
3061
193
    QQmlListProperty<PeopleIMData> imAccounts();
3062
194
    QString status() const;
3063
195
    QString statusTime() const;
3064
196
    QString statusService() const;
3065
197
    QString statusServiceIcon() const;
3066
198
    QString statusPostUri() const;
3067
199
    QQmlListProperty<PeopleAddressData> addresses();
3068
200
    QString avatar() const;
3069
201
3070
202
    QList<PeoplePhoneData*> &phoneNumberList() { return m_phoneList; }
3071
203
    QList<PeopleAddressData*> &emailAddressesList() { return m_emailList; }
3072
204
    QList<PeopleIMData*> &imAccountsList() { return m_imList; }
3073
205
    QList<PeopleAddressData*> &addressesList() { return m_addressList; }
3074
206
3075
207
Q_SIGNALS:
3076
208
    void lensChanged();
3077
209
    void uriChanged();
3078
210
    void readyChanged();
3079
211
    void renderNameChanged();
3080
212
    void titleChanged();
3081
213
    void subTitleChanged();
3082
214
    void descriptionChanged();
3083
215
    void imageSourceChanged();
3084
216
    void displayNameChanged();
3085
217
    void phoneNumbersChanged();
3086
218
    void emailAddressesChanged();
3087
219
    void imAccountsChanged();
3088
220
    void statusChanged();
3089
221
    void statusTimeChanged();
3090
222
    void statusServiceChanged();
3091
223
    void statusServiceIconChanged();
3092
224
    void statusPostUriChanged();
3093
225
    void addressesChanged();
3094
226
    void avatarChanged();
3095
227
    void error();
3096
228
3097
229
private:
3098
230
    void setReady(const bool &ready);
3099
231
    void getPeoplePreview();
3100
232
    void setUnityPreview(std::string const& uri, unity::dash::Preview::Ptr const& preview);
3101
233
    void clearData();
3102
234
    void getPhoneData();
3103
235
    void getEmailAddresses();
3104
236
    void getImAccounts();
3105
237
    void getAddresses();
3106
238
3107
239
    Lens *m_lens;
3108
240
    sigc::connection m_lensConnection;
3109
241
    QString m_uri;
3110
242
    bool m_ready;
3111
243
    unity::dash::PeoplePreview::Ptr m_unityPreview;
3112
244
3113
245
    QList<PeoplePhoneData*> m_phoneList;
3114
246
    QList<PeopleAddressData*> m_addressList;
3115
247
    QList<PeopleIMData*> m_imList;
3116
248
    QList<PeopleAddressData*> m_emailList;
3117
249
};
3118
250
3119
251
#endif // PEOPLEPREVIEWDATA_H
3120
252
0
3121
=== modified file 'plugins/Unity/plugin.cpp'
3122
--- plugins/Unity/plugin.cpp	2013-06-05 22:03:08 +0000
3123
+++ plugins/Unity/plugin.cpp	2013-06-19 20:05:35 +0000
3124
@@ -24,11 +24,10 @@
3125
24
#include "plugin.h"
24
#include "plugin.h"
3126
25
25
3127
26
// local
26
// local
3130
27
#include "lens.h"
27
#include "scope.h"
3131
28
#include "lenses.h"
28
#include "scopes.h"
3132
29
#include "categories.h"
29
#include "categories.h"
3133
30
#include "categoryfilter.h"
30
#include "categoryfilter.h"
3134
31
#include "peoplepreviewdata.h"
3135
32
#include "bottombarvisibilitycommunicatorshell.h"
31
#include "bottombarvisibilitycommunicatorshell.h"
3136
33
#include "launchermodel.h"
32
#include "launchermodel.h"
3137
34
33
3138
@@ -41,15 +40,11 @@
3139
41
void UnityPlugin::registerTypes(const char *uri)
40
void UnityPlugin::registerTypes(const char *uri)
3140
42
{
41
{
3141
43
    Q_ASSERT(uri == QLatin1String("Unity"));
42
    Q_ASSERT(uri == QLatin1String("Unity"));
3144
44
    qmlRegisterType<Lens>(uri, 0, 1, "Lens");
43
    qmlRegisterType<Scope>(uri, 0, 1, "Scope");
3145
45
    qmlRegisterType<Lenses>(uri, 0, 1, "Lenses");
44
    qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
3146
46
    qmlRegisterType<Categories>(uri, 0, 1, "Categories");
45
    qmlRegisterType<Categories>(uri, 0, 1, "Categories");
3147
47
    qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
46
    qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
3148
48
    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
47
    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
3149
49
    qmlRegisterType<PeoplePreviewData>(uri, 0, 1, "PeoplePreviewData");
3150
50
    qmlRegisterType<PeoplePhoneData>(uri, 0, 1, "PeoplePhoneData");
3151
51
    qmlRegisterType<PeopleAddressData>(uri, 0, 1, "PeopleAddressData");
3152
52
    qmlRegisterType<PeopleIMData>(uri, 0, 1, "PeopleIMData");
3153
53
    qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
48
    qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
3154
54
    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
49
    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
3155
55
    qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
50
    qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
3156
56
51
3157
=== renamed file 'plugins/Unity/lens.cpp' => 'plugins/Unity/scope.cpp'
3158
--- plugins/Unity/lens.cpp	2013-06-05 22:03:08 +0000
3159
+++ plugins/Unity/scope.cpp	2013-06-19 20:05:35 +0000
3160
@@ -18,7 +18,7 @@
3161
18
 */
18
 */
3162
19
19
3163
20
// Self
20
// Self
3165
21
#include "lens.h"
21
#include "scope.h"
3166
22
#include "categories.h"
22
#include "categories.h"
3167
23
23
3168
24
// Qt
24
// Qt
3169
@@ -28,113 +28,76 @@
3170
28
28
3171
29
#include <libintl.h>
29
#include <libintl.h>
3172
30
30
3174
31
Lens::Lens(QObject *parent) :
31
Scope::Scope(QObject *parent) :
3175
32
    QObject(parent)
32
    QObject(parent)
3176
33
{
33
{
3177
34
    m_results = new DeeListModel(this);
34
    m_results = new DeeListModel(this);
3178
35
    m_globalResults = new DeeListModel(this);
3179
36
    m_categories = new Categories(this);
35
    m_categories = new Categories(this);
3180
37
36
3181
38
    m_categories->setResultModel(m_results);
37
    m_categories->setResultModel(m_results);
3241
39
    m_categories->setGlobalResultModel(m_globalResults);
38
}
3242
40
}
39
3243
41
40
QString Scope::id() const
3244
42
QString Lens::id() const
41
{
3245
43
{
42
    return QString::fromStdString(m_unityScope->id());
3246
44
    return QString::fromStdString(m_unityLens->id());
43
}
3247
45
}
44
3248
46
45
QString Scope::name() const
3249
47
QString Lens::dbusName() const
46
{
3250
48
{
47
    return QString::fromStdString(m_unityScope->name());
3251
49
    return QString::fromStdString(m_unityLens->dbus_name());
48
}
3252
50
}
49
3253
51
50
QString Scope::iconHint() const
3254
52
QString Lens::dbusPath() const
51
{
3255
53
{
52
    return QString::fromStdString(m_unityScope->icon_hint());
3256
54
    return QString::fromStdString(m_unityLens->dbus_path());
53
}
3257
55
}
54
3258
56
55
QString Scope::description() const
3259
57
QString Lens::name() const
56
{
3260
58
{
57
    return QString::fromStdString(m_unityScope->description());
3261
59
    return QString::fromStdString(m_unityLens->name());
58
}
3262
60
}
59
3263
61
60
QString Scope::searchHint() const
3264
62
QString Lens::iconHint() const
61
{
3265
63
{
62
    return QString::fromStdString(m_unityScope->search_hint());
3266
64
    return QString::fromStdString(m_unityLens->icon_hint());
63
}
3267
65
}
64
3268
66
65
bool Scope::visible() const
3269
67
QString Lens::description() const
66
{
3270
68
{
67
    return m_unityScope->visible();
3271
69
    return QString::fromStdString(m_unityLens->description());
68
}
3272
70
}
69
3273
71
70
QString Scope::shortcut() const
3274
72
QString Lens::searchHint() const
71
{
3275
73
{
72
    return QString::fromStdString(m_unityScope->shortcut());
3276
74
    return QString::fromStdString(m_unityLens->search_hint());
73
}
3277
75
}
74
3278
76
75
bool Scope::connected() const
3279
77
bool Lens::visible() const
76
{
3280
78
{
77
    return m_unityScope->connected();
3281
79
    return m_unityLens->visible();
78
}
3282
80
}
79
3283
81
80
DeeListModel* Scope::results() const
3225
82
bool Lens::searchInGlobal() const
3226
83
{
3227
84
    return m_unityLens->search_in_global();
3228
85
}
3229
86
3230
87
QString Lens::shortcut() const
3231
88
{
3232
89
    return QString::fromStdString(m_unityLens->shortcut());
3233
90
}
3234
91
3235
92
bool Lens::connected() const
3236
93
{
3237
94
    return m_unityLens->connected();
3238
95
}
3239
96
3240
97
DeeListModel* Lens::results() const
3284
98
{
81
{
3285
99
    return m_results;
82
    return m_results;
3286
100
}
83
}
3287
101
84
3294
102
DeeListModel* Lens::globalResults() const
85
Categories* Scope::categories() const
3289
103
{
3290
104
    return m_globalResults;
3291
105
}
3292
106
3293
107
Categories* Lens::categories() const
3295
108
{
86
{
3296
109
    return m_categories;
87
    return m_categories;
3297
110
}
88
}
3298
111
89
3305
112
Lens::ViewType Lens::viewType() const
90
QString Scope::searchQuery() const
3300
113
{
3301
114
    return (Lens::ViewType) m_unityLens->view_type();
3302
115
}
3303
116
3304
117
QString Lens::searchQuery() const
3306
118
{
91
{
3307
119
    return m_searchQuery;
92
    return m_searchQuery;
3308
120
}
93
}
3309
121
94
3316
122
QString Lens::globalSearchQuery() const
95
QString Scope::noResultsHint() const
3311
123
{
3312
124
    return m_globalSearchQuery;
3313
125
}
3314
126
3315
127
QString Lens::noResultsHint() const
3317
128
{
96
{
3318
129
    return m_noResultsHint;
97
    return m_noResultsHint;
3319
130
}
98
}
3320
131
99
3327
132
void Lens::setViewType(const Lens::ViewType& viewType)
100
void Scope::setSearchQuery(const QString& search_query)
3322
133
{
3323
134
    m_unityLens->view_type = (unity::dash::ViewType) viewType;
3324
135
}
3325
136
3326
137
void Lens::setSearchQuery(const QString& search_query)
3328
138
{
101
{
3329
139
    /* Checking for m_searchQuery.isNull() which returns true only when the string
102
    /* Checking for m_searchQuery.isNull() which returns true only when the string
3330
140
       has never been set is necessary because when search_query is the empty
103
       has never been set is necessary because when search_query is the empty
3331
@@ -143,48 +106,37 @@
3332
143
    */
106
    */
3333
144
    if (m_searchQuery.isNull() || search_query != m_searchQuery) {
107
    if (m_searchQuery.isNull() || search_query != m_searchQuery) {
3334
145
        m_searchQuery = search_query;
108
        m_searchQuery = search_query;
3336
146
        m_unityLens->Search(search_query.toStdString(), sigc::mem_fun(this, &Lens::searchFinished));
109
        m_unityScope->Search(search_query.toStdString(), sigc::mem_fun(this, &Scope::searchFinished));
3337
147
        Q_EMIT searchQueryChanged();
110
        Q_EMIT searchQueryChanged();
3338
148
    }
111
    }
3339
149
}
112
}
3340
150
113
3356
151
void Lens::setGlobalSearchQuery(const QString& search_query)
114
void Scope::setNoResultsHint(const QString& hint) {
3342
152
{
3343
153
    /* Checking for m_globalSearchQuery.isNull() which returns true only when the string
3344
154
       has never been set is necessary because when search_query is the empty
3345
155
       string ("") and m_globalSearchQuery is the null string,
3346
156
       search_query != m_globalSearchQuery is still true.
3347
157
    */
3348
158
    if (m_globalSearchQuery.isNull() || search_query != m_globalSearchQuery) {
3349
159
        m_globalSearchQuery = search_query;
3350
160
        m_unityLens->GlobalSearch(search_query.toStdString(), sigc::mem_fun(this, &Lens::globalSearchFinished));
3351
161
        Q_EMIT globalSearchQueryChanged();
3352
162
    }
3353
163
}
3354
164
3355
165
void Lens::setNoResultsHint(const QString& hint) {
3357
166
    if (hint != m_noResultsHint) {
115
    if (hint != m_noResultsHint) {
3358
167
        m_noResultsHint = hint;
116
        m_noResultsHint = hint;
3359
168
        Q_EMIT noResultsHintChanged();
117
        Q_EMIT noResultsHintChanged();
3360
169
    }
118
    }
3361
170
}
119
}
3362
171
120
3364
172
void Lens::activate(const QString& uri)
121
void Scope::activate(const QString& /*uri*/)
3365
173
{
122
{
3367
174
    m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());
123
    // TODO:
3368
124
    // we need to create unity::dash::LocalResult (see UnityCore/Result.h) and pass it to Activate;
3369
125
    // this requires entire row from the model, so we need row index rather than uri.
3370
126
    // m_unityScope->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());
3371
175
}
127
}
3372
176
128
3374
177
void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
129
void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)
3375
178
{
130
{
3376
179
    if (type == unity::dash::NOT_HANDLED) {
131
    if (type == unity::dash::NOT_HANDLED) {
3378
180
        fallbackActivate(QString::fromStdString(uri));
132
        fallbackActivate(QString::fromStdString(result.uri));
3379
181
    }
133
    }
3380
182
}
134
}
3381
183
135
3383
184
void Lens::fallbackActivate(const QString& uri)
136
void Scope::fallbackActivate(const QString& uri)
3384
185
{
137
{
3385
186
    /* FIXME: stripping all content before the first column because for some
138
    /* FIXME: stripping all content before the first column because for some
3387
187
              reason the lenses give uri with junk content at their beginning.
139
              reason the scopes give uri with junk content at their beginning.
3388
188
    */
140
    */
3389
189
    QString tweakedUri = uri;
141
    QString tweakedUri = uri;
3390
190
    int firstColumnAt = tweakedUri.indexOf(":");
142
    int firstColumnAt = tweakedUri.indexOf(":");
3391
@@ -215,118 +167,101 @@
3392
215
    QDesktopServices::openUrl(url);
167
    QDesktopServices::openUrl(url);
3393
216
}
168
}
3394
217
169
3396
218
void Lens::setUnityLens(const unity::dash::Lens::Ptr& lens)
170
void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)
3397
219
{
171
{
3414
220
    m_unityLens = lens;
172
    m_unityScope = scope;
3415
221
173
3416
222
    if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {
174
    if (QString::fromStdString(m_unityScope->results()->swarm_name) == QString(":local")) {
3417
223
        m_results->setModel(m_unityLens->results()->model());
175
        m_results->setModel(m_unityScope->results()->model());
3418
224
    } else {
176
    } else {
3419
225
        m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
177
        m_results->setName(QString::fromStdString(m_unityScope->results()->swarm_name));
3420
226
    }
178
    }
3421
227
    if (QString::fromStdString(m_unityLens->global_results()->swarm_name) == QString(":local")) {
179
3422
228
        m_globalResults->setModel(m_unityLens->global_results()->model());
180
    if (QString::fromStdString(m_unityScope->categories()->swarm_name) == QString(":local")) {
3423
229
    } else {
181
        m_categories->setModel(m_unityScope->categories()->model());
3424
230
        m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
182
    } else {
3425
231
    }
183
        m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
3410
232
    if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {
3411
233
        m_categories->setModel(m_unityLens->categories()->model());
3412
234
    } else {
3413
235
        m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
3426
236
    }
184
    }
3427
237
185
3428
238
    /* Property change signals */
186
    /* Property change signals */
3448
239
    m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));
187
    m_unityScope->id.changed.connect(sigc::mem_fun(this, &Scope::idChanged));
3449
240
    m_unityLens->dbus_name.changed.connect(sigc::mem_fun(this, &Lens::dbusNameChanged));
188
    m_unityScope->name.changed.connect(sigc::mem_fun(this, &Scope::nameChanged));
3450
241
    m_unityLens->dbus_path.changed.connect(sigc::mem_fun(this, &Lens::dbusPathChanged));
189
    m_unityScope->icon_hint.changed.connect(sigc::mem_fun(this, &Scope::iconHintChanged));
3451
242
    m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));
190
    m_unityScope->description.changed.connect(sigc::mem_fun(this, &Scope::descriptionChanged));
3452
243
    m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));
191
    m_unityScope->search_hint.changed.connect(sigc::mem_fun(this, &Scope::searchHintChanged));
3453
244
    m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));
192
    m_unityScope->visible.changed.connect(sigc::mem_fun(this, &Scope::visibleChanged));
3454
245
    m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));
193
    m_unityScope->shortcut.changed.connect(sigc::mem_fun(this, &Scope::shortcutChanged));
3455
246
    m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));
194
    m_unityScope->connected.changed.connect(sigc::mem_fun(this, &Scope::connectedChanged));
3456
247
    m_unityLens->search_in_global.changed.connect(sigc::mem_fun(this, &Lens::searchInGlobalChanged));
195
    m_unityScope->results.changed.connect(sigc::mem_fun(this, &Scope::onResultsChanged));
3457
248
    m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));
196
    m_unityScope->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Scope::onResultsSwarmNameChanged));
3458
249
    m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));
197
    m_unityScope->results()->model.changed.connect(sigc::mem_fun(this, &Scope::onResultsModelChanged));
3459
250
    m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));
198
    m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesModelChanged));
3460
251
    m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));
199
    m_unityScope->categories.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesChanged));
3461
252
    m_unityLens->global_results.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsChanged));
200
    m_unityScope->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesSwarmNameChanged));
3443
253
    m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));
3444
254
    m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));
3445
255
    m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));
3446
256
    m_unityLens->view_type.changed.connect(sigc::mem_fun(this, &Lens::onViewTypeChanged));
3447
257
3462
258
    /* Signals forwarding */
201
    /* Signals forwarding */
3464
259
    connect(this, SIGNAL(searchFinished(unity::dash::Lens::Hints const &, unity::glib::Error const &)), SLOT(onSearchFinished(unity::dash::Lens::Hints const &)));
202
    connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));
3465
260
203
3466
261
    /* FIXME: signal should be forwarded instead of calling the handler directly */
204
    /* FIXME: signal should be forwarded instead of calling the handler directly */
3468
262
    m_unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated));
205
    m_unityScope->activated.connect(sigc::mem_fun(this, &Scope::onActivated));
3469
263
206
3472
264
    /* Synchronize local states with m_unityLens right now and whenever
207
    /* Synchronize local states with m_unityScope right now and whenever
3473
265
       m_unityLens becomes connected */
208
       m_unityScope becomes connected */
3474
266
    /* FIXME: should emit change notification signals for all properties */
209
    /* FIXME: should emit change notification signals for all properties */
3475
267
    connect(this, SIGNAL(connectedChanged(bool)), SLOT(synchronizeStates()));
210
    connect(this, SIGNAL(connectedChanged(bool)), SLOT(synchronizeStates()));
3476
268
    synchronizeStates();
211
    synchronizeStates();
3477
269
}
212
}
3478
270
213
3480
271
unity::dash::Lens::Ptr Lens::unityLens() const
214
unity::dash::Scope::Ptr Scope::unityScope() const
3481
272
{
215
{
3483
273
    return m_unityLens;
216
    return m_unityScope;
3484
274
}
217
}
3485
275
218
3487
276
void Lens::synchronizeStates()
219
void Scope::synchronizeStates()
3488
277
{
220
{
3489
278
    if (connected()) {
221
    if (connected()) {
3491
279
        /* Forward local states to m_unityLens */
222
        /* Forward local states to m_unityScope */
3492
280
        if (!m_searchQuery.isNull()) {
223
        if (!m_searchQuery.isNull()) {
3497
281
            m_unityLens->Search(m_searchQuery.toStdString());
224
            m_unityScope->Search(m_searchQuery.toStdString());
3494
282
        }
3495
283
        if (!m_globalSearchQuery.isNull()) {
3496
284
            m_unityLens->GlobalSearch(m_globalSearchQuery.toStdString());
3498
285
        }
225
        }
3499
286
    }
226
    }
3500
287
}
227
}
3501
288
228
3538
289
void Lens::onResultsSwarmNameChanged(const std::string& /* swarm_name */)
229
void Scope::onResultsSwarmNameChanged(const std::string& /* swarm_name */)
3539
290
{
230
{
3540
291
    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
231
    m_results->setName(QString::fromStdString(m_unityScope->results()->swarm_name));
3541
292
}
232
}
3542
293
233
3543
294
void Lens::onResultsChanged(const unity::dash::Results::Ptr& /* results */)
234
void Scope::onResultsChanged(const unity::dash::Results::Ptr& /* results */)
3544
295
{
235
{
3545
296
    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
236
    m_results->setName(QString::fromStdString(m_unityScope->results()->swarm_name));
3546
297
}
237
}
3547
298
238
3548
299
void Lens::onGlobalResultsSwarmNameChanged(const std::string& /* swarm_name */)
239
void Scope::onResultsModelChanged(unity::glib::Object<DeeModel> /* model */)
3549
300
{
240
{
3550
301
    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
241
    m_results->setModel(m_unityScope->results()->model());
3551
302
}
242
}
3552
303
243
3553
304
void Lens::onGlobalResultsChanged(const unity::dash::Results::Ptr& /* global_results */)
244
void Scope::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)
3554
305
{
245
{
3555
306
    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
246
    m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
3556
307
}
247
}
3557
308
248
3558
309
void Lens::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)
249
void Scope::onCategoriesChanged(const unity::dash::Categories::Ptr& /* categories */)
3559
310
{
250
{
3560
311
    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
251
    m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
3561
312
}
252
}
3562
313
253
3563
314
void Lens::onCategoriesChanged(const unity::dash::Categories::Ptr& /* categories */)
254
void Scope::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)
3564
315
{
255
{
3565
316
    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
256
    m_categories->setModel(model);
3566
317
}
257
}
3567
318
258
3568
319
void Lens::onViewTypeChanged(unity::dash::ViewType viewType)
259
void Scope::onSearchFinished(const std::string& /* query */, unity::glib::HintsMap const &hints)
3533
320
{
3534
321
    Q_EMIT viewTypeChanged( (Lens::ViewType) viewType);
3535
322
}
3536
323
3537
324
void Lens::onSearchFinished(unity::dash::Lens::Hints const &hints)
3569
325
{
260
{
3570
326
    QString hint;
261
    QString hint;
3571
327
262
3574
328
    if (!m_unityLens->results()->count()) {
263
    if (!m_unityScope->results()->count()) {
3575
329
        unity::dash::Lens::Hints::const_iterator it = hints.find("no-results-hint");
264
        unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");
3576
330
        if (it != hints.end()) {
265
        if (it != hints.end()) {
3577
331
            hint = QString::fromStdString(it->second.GetString());
266
            hint = QString::fromStdString(it->second.GetString());
3578
332
        } else {
267
        } else {
3579
333
268
3580
=== renamed file 'plugins/Unity/lens.h' => 'plugins/Unity/scope.h'
3581
--- plugins/Unity/lens.h	2013-06-05 22:03:08 +0000
3582
+++ plugins/Unity/scope.h	2013-06-19 20:05:35 +0000
3583
@@ -17,8 +17,8 @@
3584
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3585
18
 */
18
 */
3586
19
19
3589
20
#ifndef LENS_H
20
#ifndef SCOPE_H
3590
21
#define LENS_H
21
#define SCOPE_H
3591
22
22
3592
23
// Qt
23
// Qt
3593
24
#include <QObject>
24
#include <QObject>
3594
@@ -26,76 +26,56 @@
3595
26
#include <QMetaType>
26
#include <QMetaType>
3596
27
27
3597
28
// libunity-core
28
// libunity-core
3599
29
#include <UnityCore/Lens.h>
29
#include <UnityCore/Scope.h>
3600
30
#include <UnityCore/Results.h>
3601
30
31
3602
31
// dee-qt
32
// dee-qt
3603
32
#include "deelistmodel.h"
33
#include "deelistmodel.h"
3604
33
34
3605
34
class Categories;
35
class Categories;
3606
35
36
3608
36
class Lens : public QObject
37
class Scope : public QObject
3609
37
{
38
{
3610
38
    Q_OBJECT
39
    Q_OBJECT
3611
39
    Q_ENUMS(ViewType)
3612
40
40
3613
41
    Q_PROPERTY(QString id READ id NOTIFY idChanged)
41
    Q_PROPERTY(QString id READ id NOTIFY idChanged)
3614
42
    Q_PROPERTY(QString dbusName READ dbusName NOTIFY dbusNameChanged)
3615
43
    Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)
3616
44
    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
42
    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
3617
45
    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
43
    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
3618
46
    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
44
    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
3619
47
    Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
45
    Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
3620
48
    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
46
    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
3621
49
    Q_PROPERTY(bool searchInGlobal READ searchInGlobal NOTIFY searchInGlobalChanged)
3622
50
    Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
47
    Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
3623
51
    Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
48
    Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
3624
52
    Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
49
    Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
3625
53
    Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)
3626
54
    Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
50
    Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
3627
55
    Q_PROPERTY(ViewType viewType READ viewType WRITE setViewType NOTIFY viewTypeChanged)
3628
56
51
3629
57
    Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
52
    Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
3630
58
    Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)
3631
59
    Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
53
    Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
3632
60
54
3633
61
public:
55
public:
3641
62
    explicit Lens(QObject *parent = 0);
56
    explicit Scope(QObject *parent = 0);
3635
63
3636
64
    enum ViewType {
3637
65
        Hidden,
3638
66
        HomeView,
3639
67
        LensView
3640
68
    };
3642
69
57
3643
70
    /* getters */
58
    /* getters */
3644
71
    QString id() const;
59
    QString id() const;
3645
72
    QString dbusName() const;
3646
73
    QString dbusPath() const;
3647
74
    QString name() const;
60
    QString name() const;
3648
75
    QString iconHint() const;
61
    QString iconHint() const;
3649
76
    QString description() const;
62
    QString description() const;
3650
77
    QString searchHint() const;
63
    QString searchHint() const;
3651
78
    bool visible() const;
64
    bool visible() const;
3652
79
    bool searchInGlobal() const;
3653
80
    QString shortcut() const;
65
    QString shortcut() const;
3654
81
    bool connected() const;
66
    bool connected() const;
3655
82
    DeeListModel* results() const;
67
    DeeListModel* results() const;
3656
83
    DeeListModel* globalResults() const;
3657
84
    Categories* categories() const;
68
    Categories* categories() const;
3658
85
    ViewType viewType() const;
3659
86
    QString searchQuery() const;
69
    QString searchQuery() const;
3660
87
    QString globalSearchQuery() const;
3661
88
    QString noResultsHint() const;
70
    QString noResultsHint() const;
3662
89
71
3663
90
    /* setters */
72
    /* setters */
3664
91
    void setViewType(const ViewType& viewType);
3665
92
    void setSearchQuery(const QString& search_query);
73
    void setSearchQuery(const QString& search_query);
3666
93
    void setGlobalSearchQuery(const QString& search_query);
3667
94
    void setNoResultsHint(const QString& hint);
74
    void setNoResultsHint(const QString& hint);
3668
95
75
3669
96
    Q_INVOKABLE void activate(const QString& uri);
76
    Q_INVOKABLE void activate(const QString& uri);
3672
97
    void setUnityLens(const unity::dash::Lens::Ptr& lens);
77
    void setUnityScope(const unity::dash::Scope::Ptr& scope);
3673
98
    unity::dash::Lens::Ptr unityLens() const;
78
    unity::dash::Scope::Ptr unityScope() const;
3674
99
79
3675
100
Q_SIGNALS:
80
Q_SIGNALS:
3676
101
    void idChanged(const std::string&);
81
    void idChanged(const std::string&);
3677
@@ -106,44 +86,36 @@
3678
106
    void descriptionChanged(const std::string&);
86
    void descriptionChanged(const std::string&);
3679
107
    void searchHintChanged(const std::string&);
87
    void searchHintChanged(const std::string&);
3680
108
    void visibleChanged(bool);
88
    void visibleChanged(bool);
3681
109
    void searchInGlobalChanged(bool);
3682
110
    void shortcutChanged(const std::string&);
89
    void shortcutChanged(const std::string&);
3683
111
    void connectedChanged(bool);
90
    void connectedChanged(bool);
3684
112
    void resultsChanged();
91
    void resultsChanged();
3685
113
    void globalResultsChanged();
3686
114
    void categoriesChanged();
92
    void categoriesChanged();
3690
115
    void viewTypeChanged(ViewType);
93
    void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);
3688
116
    void searchFinished(unity::dash::Lens::Hints const&, unity::glib::Error const&);
3689
117
    void globalSearchFinished(unity::dash::Lens::Hints const&, unity::glib::Error const&);
3691
118
    void searchQueryChanged();
94
    void searchQueryChanged();
3692
119
    void globalSearchQueryChanged();
3693
120
    void noResultsHintChanged();
95
    void noResultsHintChanged();
3694
121
96
3695
122
private Q_SLOTS:
97
private Q_SLOTS:
3696
123
    void synchronizeStates();
98
    void synchronizeStates();
3698
124
    void onSearchFinished(unity::dash::Lens::Hints const &);
99
    void onSearchFinished(const std::string &, unity::glib::HintsMap const &);
3699
125
100
3700
126
private:
101
private:
3701
127
    void onResultsSwarmNameChanged(const std::string&);
102
    void onResultsSwarmNameChanged(const std::string&);
3702
128
    void onResultsChanged(const unity::dash::Results::Ptr&);
103
    void onResultsChanged(const unity::dash::Results::Ptr&);
3705
129
    void onGlobalResultsSwarmNameChanged(const std::string&);
104
    void onResultsModelChanged(unity::glib::Object<DeeModel>);
3704
130
    void onGlobalResultsChanged(const unity::dash::Results::Ptr&);
3706
131
    void onCategoriesSwarmNameChanged(const std::string&);
105
    void onCategoriesSwarmNameChanged(const std::string&);
3707
106
    void onCategoriesModelChanged(unity::glib::Object<DeeModel>);
3708
132
    void onCategoriesChanged(const unity::dash::Categories::Ptr&);
107
    void onCategoriesChanged(const unity::dash::Categories::Ptr&);
3709
133
    void onViewTypeChanged(unity::dash::ViewType);
3710
134
108
3712
135
    void onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&);
109
    void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);
3713
136
    void fallbackActivate(const QString& uri);
110
    void fallbackActivate(const QString& uri);
3714
137
111
3716
138
    unity::dash::Lens::Ptr m_unityLens;
112
    unity::dash::Scope::Ptr m_unityScope;
3717
139
    DeeListModel* m_results;
113
    DeeListModel* m_results;
3718
140
    DeeListModel* m_globalResults;
3719
141
    Categories* m_categories;
114
    Categories* m_categories;
3720
142
    QString m_searchQuery;
115
    QString m_searchQuery;
3721
143
    QString m_globalSearchQuery;
3722
144
    QString m_noResultsHint;
116
    QString m_noResultsHint;
3723
145
};
117
};
3724
146
118
3726
147
Q_DECLARE_METATYPE(Lens*)
119
Q_DECLARE_METATYPE(Scope*)
3727
148
120
3729
149
#endif // LENS_H
121
#endif // SCOPE_H
3730
150
122
3731
=== renamed file 'plugins/Unity/lenses.cpp' => 'plugins/Unity/scopes.cpp'
3732
--- plugins/Unity/lenses.cpp	2013-06-05 22:03:08 +0000
3733
+++ plugins/Unity/scopes.cpp	2013-06-19 20:05:35 +0000
3734
@@ -18,49 +18,44 @@
3735
18
 */
18
 */
3736
19
19
3737
20
// Self
20
// Self
3739
21
#include "lenses.h"
21
#include "scopes.h"
3740
22
22
3741
23
// Local
23
// Local
3743
24
#include "lens.h"
24
#include "scope.h"
3744
25
25
3745
26
// Qt
26
// Qt
3746
27
#include <QDebug>
27
#include <QDebug>
3747
28
#include <QtCore/QStringList>
28
#include <QtCore/QStringList>
3748
29
#include <QtGui/QKeySequence>
29
#include <QtGui/QKeySequence>
3749
30
30
3755
31
// libunity-core
31
Scopes::Scopes(QObject *parent)
3751
32
#include <UnityCore/FilesystemLenses.h>
3752
33
#include <UnityCore/HomeLens.h>
3753
34
3754
35
Lenses::Lenses(QObject *parent)
3756
36
    : QAbstractListModel(parent)
32
    : QAbstractListModel(parent)
3761
37
    , m_unityLenses(std::make_shared<unity::dash::FilesystemLenses>())
33
    , m_unityScopes(std::make_shared<unity::dash::GSettingsScopes>())
3758
38
    , m_homeLens(std::make_shared<unity::dash::HomeLens>(QString::fromUtf8(dgettext("unity", "Home")).toStdString(),
3759
39
                                                         QString::fromUtf8(dgettext("unity", "Home screen")).toStdString(),
3760
40
                                                         QString::fromUtf8(dgettext("unity", "Search")).toStdString()))
3762
41
    , m_loaded(false)
34
    , m_loaded(false)
3763
42
{
35
{
3767
43
    m_roles[Lenses::RoleLens] = "lens";
36
    m_roles[Scopes::RoleScope] = "scope";
3768
44
    m_roles[Lenses::RoleId] = "id";
37
    m_roles[Scopes::RoleId] = "id";
3769
45
    m_roles[Lenses::RoleVisible] = "visible";
38
    m_roles[Scopes::RoleVisible] = "visible";
3770
46
39
3773
47
    m_homeLens->AddLenses(m_unityLenses);
40
    m_unityScopes->scope_added.connect(sigc::mem_fun(this, &Scopes::onScopeAdded));
3774
48
    std::dynamic_pointer_cast<unity::dash::FilesystemLenses>(m_unityLenses)->lenses_loaded.connect(sigc::mem_fun(this, &Lenses::onLensesLoaded));
41
    m_unityScopes->scope_removed.connect(sigc::mem_fun(this, &Scopes::onScopeRemoved));
3775
42
    m_unityScopes->scopes_reordered.connect(sigc::mem_fun(this, &Scopes::onScopesReordered));
3776
43
    m_unityScopes->LoadScopes();
3777
49
}
44
}
3778
50
45
3780
51
QHash<int, QByteArray> Lenses::roleNames() const
46
QHash<int, QByteArray> Scopes::roleNames() const
3781
52
{
47
{
3782
53
    return m_roles;
48
    return m_roles;
3783
54
}
49
}
3784
55
50
3786
56
int Lenses::rowCount(const QModelIndex& parent) const
51
int Scopes::rowCount(const QModelIndex& parent) const
3787
57
{
52
{
3788
58
    Q_UNUSED(parent)
53
    Q_UNUSED(parent)
3789
59
54
3791
60
    return m_lenses.count();
55
    return m_scopes.count();
3792
61
}
56
}
3793
62
57
3795
63
QVariant Lenses::data(const QModelIndex& index, int role) const
58
QVariant Scopes::data(const QModelIndex& index, int role) const
3796
64
{
59
{
3797
65
    Q_UNUSED(role)
60
    Q_UNUSED(role)
3798
66
61
3799
@@ -68,115 +63,114 @@
3800
68
        return QVariant();
63
        return QVariant();
3801
69
    }
64
    }
3802
70
65
3804
71
    Lens* lens = m_lenses.at(index.row());
66
    Scope* scope = m_scopes.at(index.row());
3805
72
67
3812
73
    if (role == Lenses::RoleLens) {
68
    if (role == Scopes::RoleScope) {
3813
74
        return QVariant::fromValue(lens);
69
        return QVariant::fromValue(scope);
3814
75
    } else if (role == Lenses::RoleId) {
70
    } else if (role == Scopes::RoleId) {
3815
76
        return QVariant::fromValue(lens->id());
71
        return QVariant::fromValue(scope->id());
3816
77
    } else if (role == Lenses::RoleVisible) {
72
    } else if (role == Scopes::RoleVisible) {
3817
78
        return QVariant::fromValue(lens->visible());
73
        return QVariant::fromValue(scope->visible());
3818
79
    } else {
74
    } else {
3819
80
        return QVariant();
75
        return QVariant();
3820
81
    }
76
    }
3821
82
}
77
}
3822
83
78
3824
84
QVariant Lenses::get(int row) const
79
QVariant Scopes::get(int row) const
3825
85
{
80
{
3826
86
    return data(QAbstractListModel::index(row), 0);
81
    return data(QAbstractListModel::index(row), 0);
3827
87
}
82
}
3828
88
83
3830
89
QVariant Lenses::get(const QString& lens_id) const
84
QVariant Scopes::get(const QString& scope_id) const
3831
90
{
85
{
3835
91
    Q_FOREACH(Lens* lens, m_lenses) {
86
    Q_FOREACH(Scope* scope, m_scopes) {
3836
92
        if (lens->id() == lens_id) {
87
        if (scope->id() == scope_id) {
3837
93
            return QVariant::fromValue(lens);
88
            return QVariant::fromValue(scope);
3838
94
        }
89
        }
3839
95
    }
90
    }
3840
96
91
3841
97
    return QVariant();
92
    return QVariant();
3842
98
}
93
}
3843
99
94
3845
100
bool Lenses::loaded() const
95
bool Scopes::loaded() const
3846
101
{
96
{
3847
102
    return m_loaded;
97
    return m_loaded;
3848
103
}
98
}
3849
104
99
3851
105
void Lenses::onLensAdded(const unity::dash::Lens::Ptr& lens)
100
void Scopes::onScopeAdded(const unity::dash::Scope::Ptr& scope, int /*position*/)
3852
106
{
101
{
3854
107
    int index = m_lenses.count();
102
    int index = m_scopes.count();
3855
108
    beginInsertRows(QModelIndex(), index, index);
103
    beginInsertRows(QModelIndex(), index, index);
3857
109
    addUnityLens(lens);
104
    addUnityScope(scope);
3858
110
    endInsertRows();
105
    endInsertRows();
3903
111
}
106
3904
112
107
    // FIXME: do only once after all loaded?
3861
113
void Lenses::onLensesLoaded()
3862
114
{
3863
115
    /* FIXME: this is temporary code that is required on mobile to order
3864
116
       the lenses according to the design.
3865
117
    */
3866
118
    QStringList staticLenses;
3867
119
    staticLenses << "mockmusic.lens" << "people.lens" << "home.lens" << "applications.lens" << "mockvideos.lens";
3868
120
3869
121
    // not all the lenses are guaranteed to go into the model (only if their UnitCore counterparts exist);
3870
122
    // so build up a list of the valid ones, then add them later.
3871
123
    QList<unity::dash::Lens::Ptr> added_lenses;
3872
124
3873
125
    // add statically ordered lenses
3874
126
    Q_FOREACH(QString lensId, staticLenses) {
3875
127
        if (lensId == "home.lens") {
3876
128
            added_lenses << m_homeLens;
3877
129
        } else {
3878
130
            unity::dash::Lens::Ptr lens = m_unityLenses->GetLens(lensId.toStdString());
3879
131
            if (lens != NULL) {
3880
132
                added_lenses << lens;
3881
133
            }
3882
134
        }
3883
135
    }
3884
136
3885
137
    // add remaining lenses
3886
138
    unity::dash::Lenses::LensList lensesList = m_unityLenses->GetLenses();
3887
139
    for(auto it = lensesList.begin(); it != lensesList.end(); ++it) {
3888
140
        unity::dash::Lens::Ptr lens = (*it);
3889
141
        if (!staticLenses.contains(QString::fromStdString(lens->id))) {
3890
142
            added_lenses << lens;
3891
143
        }
3892
144
    }
3893
145
3894
146
    if (added_lenses.count() > 0) {
3895
147
        int index = rowCount();
3896
148
        beginInsertRows(QModelIndex(), index, index+added_lenses.count()-1);
3897
149
        Q_FOREACH(unity::dash::Lens::Ptr lens, added_lenses) {
3898
150
            addUnityLens(lens);
3899
151
        }
3900
152
        endInsertRows();
3901
153
    }
3902
154
3905
155
    m_loaded = true;
108
    m_loaded = true;
3906
156
    Q_EMIT loadedChanged(m_loaded);
109
    Q_EMIT loadedChanged(m_loaded);
3922
157
110
}
3923
158
    // listen to dynamically added lenses
111
3924
159
    m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
112
void Scopes::onScopesLoaded()
3925
160
}
113
{
3926
161
114
}
3927
162
void Lenses::onLensPropertyChanged()
115
3928
163
{
116
void Scopes::onScopeRemoved(const unity::dash::Scope::Ptr& scope)
3929
164
    QModelIndex lensIndex = index(m_lenses.indexOf(qobject_cast<Lens*>(sender())));
117
{
3930
165
    Q_EMIT dataChanged(lensIndex, lensIndex);
118
    auto id = QString::fromStdString(scope->id);
3931
166
}
119
    auto index = findScopeById(id);
3932
167
120
    if (index >= 0) {
3933
168
void Lenses::addUnityLens(const unity::dash::Lens::Ptr& unity_lens)
121
        beginRemoveRows(QModelIndex(), index, index);
3934
169
{
122
        removeUnityScope(index);
3935
170
    Lens* lens = new Lens(this);
123
        endRemoveRows();
3936
171
    lens->setUnityLens(unity_lens);
124
3937
125
        Q_EMIT scopeRemoved(id, index);
3938
126
    }
3939
127
}
3940
128
3941
129
void Scopes::onScopesReordered(const unity::dash::Scopes::ScopeList& scopes)
3942
130
{
3943
131
    // FIXME Should use beginMoveRows()/endMoveRows() to not recreate the UI for every scope.
3944
132
    beginResetModel();
3945
133
3946
134
    // remove existing scopes
3947
135
    for (auto i=m_scopes.count()-1; i>=0; i--) {
3948
136
        removeUnityScope(i);
3949
137
    }
3950
138
3951
139
    // re-create scopes
3952
140
    for (uint i=0; i<scopes.size(); i++) {
3953
141
        addUnityScope(scopes[i]);
3954
142
    }
3955
143
    endResetModel();
3956
144
}
3957
145
3958
146
void Scopes::onScopePropertyChanged()
3959
147
{
3960
148
    QModelIndex scopeIndex = index(m_scopes.indexOf(qobject_cast<Scope*>(sender())));
3961
149
    Q_EMIT dataChanged(scopeIndex, scopeIndex);
3962
150
}
3963
151
3964
152
void Scopes::addUnityScope(const unity::dash::Scope::Ptr& unity_scope)
3965
153
{
3966
154
    Scope* scope = new Scope(this);
3967
155
    scope->setUnityScope(unity_scope);
3968
172
    /* DOCME */
156
    /* DOCME */
3978
173
    QObject::connect(lens, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));
157
    QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onScopePropertyChanged()));
3979
174
    m_lenses.append(lens);
158
    m_scopes.append(scope);
3980
175
}
159
}
3981
176
160
3982
177
void Lenses::removeUnityLens(int index)
161
void Scopes::removeUnityScope(int index)
3983
178
{
162
{
3984
179
    Lens* lens = m_lenses.takeAt(index);
163
    Scope* scope = m_scopes.takeAt(index);
3985
180
164
3986
181
    delete lens;
165
    delete scope;
3987
166
}
3988
167
3989
168
int Scopes::findScopeById(const QString& scope_id)
3990
169
{
3991
170
    for (int i=0; i<m_scopes.count(); i++) {
3992
171
        if (m_scopes[i]->id() == scope_id) {
3993
172
            return i;
3994
173
        }
3995
174
    }
3996
175
    return -1;
3997
182
}
176
}
3998
183
177
3999
=== renamed file 'plugins/Unity/lenses.h' => 'plugins/Unity/scopes.h'
4000
--- plugins/Unity/lenses.h	2013-06-05 22:03:08 +0000
4001
+++ plugins/Unity/scopes.h	2013-06-19 20:05:35 +0000
4002
@@ -17,29 +17,29 @@
4003
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4004
18
 */
18
 */
4005
19
19
4008
20
#ifndef LENSES_H
20
#ifndef SCOPES_H
4009
21
#define LENSES_H
21
#define SCOPES_H
4010
22
22
4011
23
// Qt
23
// Qt
4012
24
#include <QAbstractListModel>
24
#include <QAbstractListModel>
4013
25
#include <QList>
25
#include <QList>
4014
26
26
4015
27
// libunity-core
27
// libunity-core
4018
28
#include <UnityCore/Lens.h>
28
#include <UnityCore/Scope.h>
4019
29
#include <UnityCore/HomeLens.h>
29
#include <UnityCore/GSettingsScopes.h>
4020
30
30
4021
31
namespace unity
31
namespace unity
4022
32
{
32
{
4023
33
namespace dash
33
namespace dash
4024
34
{
34
{
4026
35
class Lenses;
35
class Scopes;
4027
36
}
36
}
4028
37
}
37
}
4029
38
38
4030
39
class Hotkey;
39
class Hotkey;
4032
40
class Lens;
40
class Scope;
4033
41
41
4035
42
class Lenses : public QAbstractListModel
42
class Scopes : public QAbstractListModel
4036
43
{
43
{
4037
44
    Q_OBJECT
44
    Q_OBJECT
4038
45
45
4039
@@ -48,11 +48,11 @@
4040
48
    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
48
    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
4041
49
49
4042
50
public:
50
public:
4045
51
    explicit Lenses(QObject *parent = 0);
51
    explicit Scopes(QObject *parent = 0);
4046
52
    ~Lenses() = default;
52
    ~Scopes() = default;
4047
53
53
4048
54
    enum Roles {
54
    enum Roles {
4050
55
        RoleLens,
55
        RoleScope,
4051
56
        RoleId,
56
        RoleId,
4052
57
        RoleVisible
57
        RoleVisible
4053
58
    };
58
    };
4054
@@ -61,30 +61,34 @@
4055
61
    Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
61
    Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
4056
62
62
4057
63
    Q_INVOKABLE QVariant get(int row) const;
63
    Q_INVOKABLE QVariant get(int row) const;
4059
64
    Q_INVOKABLE QVariant get(const QString& lens_id) const;
64
    Q_INVOKABLE QVariant get(const QString& scope_id) const;
4060
65
65
4061
66
    QHash<int, QByteArray> roleNames() const;
66
    QHash<int, QByteArray> roleNames() const;
4062
67
67
4063
68
    bool loaded() const;
68
    bool loaded() const;
4064
69
69
4065
70
Q_SIGNALS:
70
Q_SIGNALS:
4067
71
    void activateLensRequested(const QString& lens_id);
71
    void activateScopeRequested(const QString& scope_id);
4068
72
    void loadedChanged(bool loaded);
72
    void loadedChanged(bool loaded);
4069
73
    void scopeRemoved(const QString& scope_id, int index);
4070
73
74
4071
74
private Q_SLOTS:
75
private Q_SLOTS:
4075
75
    void onLensAdded(const unity::dash::Lens::Ptr& lens);
76
    void onScopesLoaded();
4076
76
    void onLensesLoaded();
77
    void onScopeAdded(const unity::dash::Scope::Ptr& scope, int position);
4077
77
    void onLensPropertyChanged();
78
    void onScopeRemoved(const unity::dash::Scope::Ptr& scope);
4078
79
    void onScopesReordered(const unity::dash::Scopes::ScopeList& scopes);
4079
80
    void onScopePropertyChanged();
4080
78
81
4081
79
private:
82
private:
4085
80
    unity::dash::Lenses::Ptr m_unityLenses;
83
    unity::dash::GSettingsScopesReader::Ptr m_scopesReader;
4086
81
    unity::dash::HomeLens::Ptr m_homeLens;
84
    unity::dash::Scopes::Ptr m_unityScopes;
4087
82
    QList<Lens*> m_lenses;
85
    QList<Scope*> m_scopes;
4088
83
    QHash<int, QByteArray> m_roles;
86
    QHash<int, QByteArray> m_roles;
4089
84
    bool m_loaded;
87
    bool m_loaded;
4090
85
88
4093
86
    void addUnityLens(const unity::dash::Lens::Ptr& unity_lens);
89
    void addUnityScope(const unity::dash::Scope::Ptr& unity_scope);
4094
87
    void removeUnityLens(int index);
90
    void removeUnityScope(int index);
4095
91
    int findScopeById(const QString& scope_id);
4096
88
};
92
};
4097
89
93
4099
90
#endif // LENSES_H
94
#endif // SCOPES_H
4100
91
95
4101
=== modified file 'po/unity8.pot'
4102
--- po/unity8.pot	2013-06-19 15:07:15 +0000
4103
+++ po/unity8.pot	2013-06-19 20:05:35 +0000
4104
@@ -109,27 +109,19 @@
4105
109
msgid "Apps"
109
msgid "Apps"
4106
110
msgstr ""
110
msgstr ""
4107
111
111
4108
112
#: Dash/DashHome.qml:40
4109
113
msgid "Frequent Apps"
4110
114
msgstr ""
4111
115
4112
112
#: Dash/DashHome.qml:43
116
#: Dash/DashHome.qml:43
4114
113
msgid "Frequent Apps"
117
msgid "Recent Music"
4115
114
msgstr ""
118
msgstr ""
4116
115
119
4117
116
#: Dash/DashHome.qml:46
120
#: Dash/DashHome.qml:46
4118
117
msgid "Favourite People"
4119
118
msgstr ""
4120
119
4121
120
#: Dash/DashHome.qml:49
4122
121
msgid "People Recently in Touch"
4123
122
msgstr ""
4124
123
4125
124
#: Dash/DashHome.qml:52
4126
125
msgid "Recent Music"
4127
126
msgstr ""
4128
127
4129
128
#: Dash/DashHome.qml:55
4130
129
msgid "Videos Popular Online"
121
msgid "Videos Popular Online"
4131
130
msgstr ""
122
msgstr ""
4132
131
123
4134
132
#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124
#: Dash/DashHome.qml:175
4135
133
msgid "Home"
125
msgid "Home"
4136
134
msgstr ""
126
msgstr ""
4137
135
127
4138
@@ -153,26 +145,6 @@
4139
153
msgid "Music"
145
msgid "Music"
4140
154
msgstr ""
146
msgstr ""
4141
155
147
4142
156
#: Dash/DashPeople.qml:31
4143
157
msgid "Favourites"
4144
158
msgstr ""
4145
159
4146
160
#: Dash/DashPeople.qml:32
4147
161
msgid "Recently in touch"
4148
162
msgstr ""
4149
163
4150
164
#: Dash/DashPeople.qml:33
4151
165
msgid "New Contacts"
4152
166
msgstr ""
4153
167
4154
168
#: Dash/DashPeople.qml:34
4155
169
msgid "A-Z"
4156
170
msgstr ""
4157
171
4158
172
#: Dash/DashPeople.qml:123
4159
173
msgid "People"
4160
174
msgstr ""
4161
175
4162
176
#: Dash/DashVideos.qml:31
148
#: Dash/DashVideos.qml:31
4163
177
msgid "Popular Online"
149
msgid "Popular Online"
4164
178
msgstr ""
150
msgstr ""
4165
@@ -234,16 +206,17 @@
4166
234
msgid "Flight mode"
206
msgid "Flight mode"
4167
235
msgstr ""
207
msgstr ""
4168
236
208
4170
237
#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209
#: Panel/SearchIndicator.qml:26
4171
238
msgid "Search"
210
msgid "Search"
4172
239
msgstr ""
211
msgstr ""
4173
240
212
4175
241
#: plugins/Unity/lens.cpp:333
213
#: plugins/Unity/scope.cpp:268
4176
242
msgid "Sorry, there is nothing that matches your search."
214
msgid "Sorry, there is nothing that matches your search."
4177
243
msgstr ""
215
msgstr ""
4178
244
216
4181
245
#: plugins/Unity/lenses.cpp:39
217
#: Shell.qml:380
4182
246
msgid "Home screen"
218
#, qt-format
4183
219
msgid "Please enter %1:"
4184
247
msgstr ""
220
msgstr ""
4185
248
221
4186
249
#: Shell.qml:380
222
#: Shell.qml:380
4187
250
223
4188
=== modified file 'tests/autopilot/unity8/tests/helpers.py'
4189
--- tests/autopilot/unity8/tests/helpers.py	2013-06-05 22:03:08 +0000
4190
+++ tests/autopilot/unity8/tests/helpers.py	2013-06-19 20:05:35 +0000
4191
@@ -71,7 +71,7 @@
4192
71
            self.touch.drag(start_x, start_y, stop_x, stop_y)
71
            self.touch.drag(start_x, start_y, stop_x, stop_y)
4193
72
72
4194
73
        # Because the shell loads up lots of stuff, unlocking the greeter can
73
        # Because the shell loads up lots of stuff, unlocking the greeter can
4196
74
        # be a bit stuttery while lenses are still consuming all resources.
74
        # be a bit stuttery while scopes are still consuming all resources.
4197
75
        # Give it another (max retries) chance
75
        # Give it another (max retries) chance
4198
76
        try:
76
        try:
4199
77
            self.assertThat(greeter.created, Eventually(Equals(False)))
77
            self.assertThat(greeter.created, Eventually(Equals(False)))
4200
78
78
4201
=== modified file 'tests/autopilot/unity8/tests/testhud.py'
4202
--- tests/autopilot/unity8/tests/testhud.py	2013-06-11 15:45:45 +0000
4203
+++ tests/autopilot/unity8/tests/testhud.py	2013-06-19 20:05:35 +0000
4204
@@ -73,7 +73,7 @@
4205
73
        super(TestHud, self).setUp("%sx%s" % (self.app_width / divisor, self.app_height / divisor), "%s" % (self.grid_unit_px / divisor))
73
        super(TestHud, self).setUp("%sx%s" % (self.app_width / divisor, self.app_height / divisor), "%s" % (self.grid_unit_px / divisor))
4206
74
74
4207
75
        dash = self.main_window.get_dash()
75
        dash = self.main_window.get_dash()
4209
76
        self.assertThat(dash.showLensOnLoaded, Eventually(Equals(""), timeout=30))
76
        self.assertThat(dash.showScopeOnLoaded, Eventually(Equals(""), timeout=30))
4210
77
77
4211
78
    def test_show_hud(self):
78
    def test_show_hud(self):
4212
79
        hud = self.main_window.get_hud()
79
        hud = self.main_window.get_hud()
4213
80
80
4214
=== modified file 'tests/autopilot/unity8/tests/testlockscreen.py'
4215
--- tests/autopilot/unity8/tests/testlockscreen.py	2013-06-12 07:59:03 +0000
4216
+++ tests/autopilot/unity8/tests/testlockscreen.py	2013-06-19 20:05:35 +0000
4217
@@ -71,7 +71,7 @@
4218
71
        super(TestLockscreens, self).setUp("%sx%s" % (self.app_width / divisor, self.app_height / divisor), "%s" % (self.grid_unit_px / divisor))
71
        super(TestLockscreens, self).setUp("%sx%s" % (self.app_width / divisor, self.app_height / divisor), "%s" % (self.grid_unit_px / divisor))
4219
72
72
4220
73
        dash = self.main_window.get_dash()
73
        dash = self.main_window.get_dash()
4222
74
        self.assertThat(dash.showLensOnLoaded, Eventually(Equals(""), timeout=30))
74
        self.assertThat(dash.showScopeOnLoaded, Eventually(Equals(""), timeout=30))
4223
75
75
4224
76
    def test_unlock(self):
76
    def test_unlock(self):
4225
77
        self.unlock_greeter()
77
        self.unlock_greeter()
4226
78
78
4227
=== modified file 'tests/qmltests/CMakeLists.txt'
4228
--- tests/qmltests/CMakeLists.txt	2013-06-19 18:10:57 +0000
4229
+++ tests/qmltests/CMakeLists.txt	2013-06-19 20:05:35 +0000
4230
@@ -41,13 +41,11 @@
4231
41
add_qml_test(Dash DashBar IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
41
add_qml_test(Dash DashBar IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
4232
42
add_qml_test(Dash DashContent IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
42
add_qml_test(Dash DashContent IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
4233
43
add_qml_test(Dash DashPreview)
43
add_qml_test(Dash DashPreview)
4237
44
add_qml_test(Dash GenericLensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
44
add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
4238
45
add_qml_test(Dash LensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
45
add_qml_test(Dash ScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
4236
46
add_qml_test(Dash PeoplePreview)
4239
47
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
46
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
4240
48
                                           ${CMAKE_BINARY_DIR}/tests/mocks)
47
                                           ${CMAKE_BINARY_DIR}/tests/mocks)
4241
49
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
48
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
4242
50
add_qml_test(Dash/People PeopleFilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
4243
51
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
49
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
4244
52
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
50
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
4245
53
add_qml_test(Greeter Tablet IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
51
add_qml_test(Greeter Tablet IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
4246
54
52
4247
=== removed directory 'tests/qmltests/Dash/People'
4248
=== removed file 'tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml'
4249
--- tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml	2013-06-05 22:03:08 +0000
4250
+++ tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml	1970-01-01 00:00:00 +0000
4251
@@ -1,154 +0,0 @@
4252
1
/*
4253
2
 * Copyright 2013 Canonical Ltd.
4254
3
 *
4255
4
 * This program is free software; you can redistribute it and/or modify
4256
5
 * it under the terms of the GNU General Public License as published by
4257
6
 * the Free Software Foundation; version 3.
4258
7
 *
4259
8
 * This program is distributed in the hope that it will be useful,
4260
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4261
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4262
11
 * GNU General Public License for more details.
4263
12
 *
4264
13
 * You should have received a copy of the GNU General Public License
4265
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4266
15
 */
4267
16
4268
17
import QtQuick 2.0
4269
18
import QtTest 1.0
4270
19
import ".."
4271
20
import "../.."
4272
21
import "../../../../Dash/People"
4273
22
import Ubuntu.Components 0.1
4274
23
import Unity.Test 0.1 as UT
4275
24
4276
25
Item {
4277
26
    id: root
4278
27
    width: units.gu(120)
4279
28
    height: units.gu(40)
4280
29
4281
30
    PeopleFilterGrid {
4282
31
        id: peopleFilterGrid
4283
32
        anchors.fill: parent
4284
33
        model: mockModel
4285
34
    }
4286
35
4287
36
    SignalSpy {
4288
37
        id: signalSpy
4289
38
        target: peopleFilterGrid
4290
39
        signalName: "clicked"
4291
40
    }
4292
41
4293
42
    ListModel {
4294
43
        id: mockModel
4295
44
4296
45
        ListElement {
4297
46
            column_0: 'user://001'
4298
47
            column_1: "gtk-apply"
4299
48
            column_2: ""
4300
49
            column_3: ""
4301
50
            column_4: "User 1"
4302
51
            column_5: "Text 1"
4303
52
        }
4304
53
4305
54
        ListElement {
4306
55
            column_0: 'user://002'
4307
56
            column_1: "gtk-apply"
4308
57
            column_2: ""
4309
58
            column_3: ""
4310
59
            column_4: "User 2"
4311
60
            column_5: "Text 2"
4312
61
        }
4313
62
4314
63
        ListElement {
4315
64
            column_0: 'user://003'
4316
65
            column_1: "gtk-apply"
4317
66
            column_2: ""
4318
67
            column_3: ""
4319
68
            column_4: "User 3"
4320
69
            column_5: "Text 3"
4321
70
        }
4322
71
4323
72
        ListElement {
4324
73
            column_0: 'user://004'
4325
74
            column_1: "gtk-apply"
4326
75
            column_2: ""
4327
76
            column_3: ""
4328
77
            column_4: "User 4"
4329
78
            column_5: "Text 4"
4330
79
        }
4331
80
4332
81
        ListElement {
4333
82
            column_0: 'user://005'
4334
83
            column_1: "gtk-apply"
4335
84
            column_2: ""
4336
85
            column_3: ""
4337
86
            column_4: "User 5"
4338
87
            column_5: "Text 5"
4339
88
        }
4340
89
4341
90
    }
4342
91
4343
92
    UT.UnityTestCase {
4344
93
        id: testCase
4345
94
        name: "DashPeopleFilterGrid"
4346
95
        when: windowShown
4347
96
4348
97
        function init() {
4349
98
        }
4350
99
4351
100
        function test_clickCell_data() {
4352
101
            return [
4353
102
                {
4354
103
                    x: peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth/2,
4355
104
                    y: peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight/2,
4356
105
                    index: 0,
4357
106
                    uri: "user://001"
4358
107
                },
4359
108
                {
4360
109
                    x: 2*peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth+peopleFilterGrid.cellWidth/2,
4361
110
                    y: peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight/2,
4362
111
                    index: 1,
4363
112
                    uri: "user://002"
4364
113
                },
4365
114
                {
4366
115
                    x: 3*peopleFilterGrid.minimumHorizontalSpacing+2*peopleFilterGrid.cellWidth+peopleFilterGrid.cellWidth/2,
4367
116
                    y: peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight/2,
4368
117
                    index: 2,
4369
118
                    uri: "user://003"
4370
119
                },
4371
120
                {
4372
121
                    x: peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth/2,
4373
122
                    y: 2*peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight+peopleFilterGrid.cellHeight/2,
4374
123
                    index: 3,
4375
124
                    uri: "user://004"
4376
125
                },
4377
126
                {
4378
127
                    x: 2*peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth+peopleFilterGrid.cellWidth/2,
4379
128
                    y: 2*peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight+peopleFilterGrid.cellHeight/2,
4380
129
                    index: 4,
4381
130
                    uri: "user://005"
4382
131
                },
4383
132
            ]
4384
133
        }
4385
134
4386
135
        function test_columns() {
4387
136
            compare(peopleFilterGrid.columns,3)
4388
137
        }
4389
138
4390
139
        function test_clickCell(data) {
4391
140
            tryCompare(peopleFilterGrid, "flicking", false)
4392
141
            tryCompare(peopleFilterGrid, "moving", false)
4393
142
            signalSpy.clear()
4394
143
            wait(peopleFilterGrid.pressDelay > 0 ? peopleFilterGrid.pressDelay : 5)
4395
144
            mouseClick(peopleFilterGrid, data.x, data.y)
4396
145
            tryCompare(peopleFilterGrid, "flicking", false)
4397
146
            tryCompare(peopleFilterGrid, "moving", false)
4398
147
            compare(signalSpy.count, 1)
4399
148
            compare(signalSpy.signalArguments.length, 1, "signalArguments.length != 1")
4400
149
            compare(signalSpy.signalArguments[0][0], data.index)
4401
150
            compare(signalSpy.signalArguments[0][1]["uri"], data.uri)
4402
151
        }
4403
152
4404
153
    }
4405
154
}
4406
155
0
4407
=== renamed file 'tests/qmltests/Dash/qml/FakeLensView.qml' => 'tests/qmltests/Dash/qml/FakeScopeView.qml'
4408
--- tests/qmltests/Dash/qml/FakeLensView.qml	2013-06-11 10:36:55 +0000
4409
+++ tests/qmltests/Dash/qml/FakeScopeView.qml	2013-06-19 20:05:35 +0000
4410
@@ -18,8 +18,8 @@
4411
18
import Unity 0.1
18
import Unity 0.1
4412
19
19
4413
20
FocusScope {
20
FocusScope {
4416
21
    id: fakeLensView
21
    id: fakeScopeView
4417
22
    property Lens lens : null
22
    property Scope scope : null
4418
23
    property bool isCurrent : false
23
    property bool isCurrent : false
4419
24
24
4420
25
    property ListModel searchHistory
25
    property ListModel searchHistory
4421
@@ -31,18 +31,18 @@
4422
31
    property alias backColor : back.color
31
    property alias backColor : back.color
4423
32
32
4424
33
    onEndReached: {
33
    onEndReached: {
4427
34
        if (shell != undefined && shell.lensStatus != undefined) {
34
        if (shell != undefined && shell.scopeStatus != undefined) {
4428
35
            shell.lensStatus[lens.id].endReached++;
35
            shell.scopeStatus[scope.id].endReached++;
4429
36
        }
36
        }
4430
37
    }
37
    }
4431
38
    onMovementStarted: {
38
    onMovementStarted: {
4434
39
        if (shell != undefined && shell.lensStatus != undefined) {
39
        if (shell != undefined && shell.scopeStatus != undefined) {
4435
40
            shell.lensStatus[lens.id].movementStarted++;
40
            shell.scopeStatus[scope.id].movementStarted++;
4436
41
        }
41
        }
4437
42
    }
42
    }
4438
43
    onPositionedAtBeginning: {
43
    onPositionedAtBeginning: {
4441
44
        if (shell != undefined && shell.lensStatus != undefined) {
44
        if (shell != undefined && shell.scopeStatus != undefined) {
4442
45
            shell.lensStatus[lens.id].positionedAtBeginning++;
45
            shell.scopeStatus[scope.id].positionedAtBeginning++;
4443
46
        }
46
        }
4444
47
    }
47
    }
4445
48
48
4446
@@ -68,7 +68,7 @@
4447
68
    ListView {
68
    ListView {
4448
69
        id: listView
69
        id: listView
4449
70
        anchors.fill: parent
70
        anchors.fill: parent
4451
71
        model: lens ? lens.categories : null
71
        model: scope ? scope.categories : null
4452
72
        orientation: ListView.Vertical
72
        orientation: ListView.Vertical
4453
73
73
4454
74
        delegate:  Column {
74
        delegate:  Column {
4455
75
75
4456
=== renamed file 'tests/qmltests/Dash/qml/fake_generic_lensView.qml' => 'tests/qmltests/Dash/qml/fake_generic_scopeView.qml'
4457
--- tests/qmltests/Dash/qml/fake_generic_lensView.qml	2013-06-11 10:36:55 +0000
4458
+++ tests/qmltests/Dash/qml/fake_generic_scopeView.qml	2013-06-19 20:05:35 +0000
4459
@@ -16,9 +16,9 @@
4460
16
16
4461
17
import QtQuick 2.0
17
import QtQuick 2.0
4462
18
18
4466
19
FakeLensView {
19
FakeScopeView {
4467
20
    id: fake_generic_lensView
20
    id: fake_generic_scopeView
4468
21
    objectName: "fake_generic_lensView"
21
    objectName: "fake_generic_scopeView"
4469
22
22
4470
23
    backColor: "#D0D0D0"
23
    backColor: "#D0D0D0"
4471
24
}
24
}
4472
25
25
4473
=== renamed file 'tests/qmltests/Dash/qml/fake_lensView1.qml' => 'tests/qmltests/Dash/qml/fake_scopeView1.qml'
4474
--- tests/qmltests/Dash/qml/fake_lensView1.qml	2013-06-11 10:36:55 +0000
4475
+++ tests/qmltests/Dash/qml/fake_scopeView1.qml	2013-06-19 20:05:35 +0000
4476
@@ -16,9 +16,9 @@
4477
16
16
4478
17
import QtQuick 2.0
17
import QtQuick 2.0
4479
18
18
4483
19
FakeLensView {
19
FakeScopeView {
4484
20
    id: fake_lensView1
20
    id: fake_scopeView1
4485
21
    objectName: "fake_lensView1"
21
    objectName: "fake_scopeView1"
4486
22
22
4487
23
    backColor: "#909090"
23
    backColor: "#909090"
4488
24
}
24
}
4489
25
25
4490
=== renamed file 'tests/qmltests/Dash/qml/fake_lensView2.qml' => 'tests/qmltests/Dash/qml/fake_scopeView2.qml'
4491
--- tests/qmltests/Dash/qml/fake_lensView2.qml	2013-06-11 10:36:55 +0000
4492
+++ tests/qmltests/Dash/qml/fake_scopeView2.qml	2013-06-19 20:05:35 +0000
4493
@@ -16,9 +16,9 @@
4494
16
16
4495
17
import QtQuick 2.0
17
import QtQuick 2.0
4496
18
18
4500
19
FakeLensView {
19
FakeScopeView {
4501
20
    id: fake_lensView2
20
    id: fake_scopeView2
4502
21
    objectName: "fake_lensView2"
21
    objectName: "fake_scopeView2"
4503
22
22
4504
23
    backColor: "#A0A0A0"
23
    backColor: "#A0A0A0"
4505
24
}
24
}
4506
25
25
4507
=== renamed file 'tests/qmltests/Dash/qml/fake_lensView3.qml' => 'tests/qmltests/Dash/qml/fake_scopeView3.qml'
4508
--- tests/qmltests/Dash/qml/fake_lensView3.qml	2013-06-11 10:36:55 +0000
4509
+++ tests/qmltests/Dash/qml/fake_scopeView3.qml	2013-06-19 20:05:35 +0000
4510
@@ -16,9 +16,9 @@
4511
16
16
4512
17
import QtQuick 2.0
17
import QtQuick 2.0
4513
18
18
4517
19
FakeLensView {
19
FakeScopeView {
4518
20
    id: fake_lensView3
20
    id: fake_scopeView3
4519
21
    objectName: "fake_lensView3"
21
    objectName: "fake_scopeView3"
4520
22
22
4521
23
    backColor: "#B0B0B0"
23
    backColor: "#B0B0B0"
4522
24
}
24
}
4523
25
25
4524
=== renamed file 'tests/qmltests/Dash/qml/fake_lensView4.qml' => 'tests/qmltests/Dash/qml/fake_scopeView4.qml'
4525
--- tests/qmltests/Dash/qml/fake_lensView4.qml	2013-06-11 10:36:55 +0000
4526
+++ tests/qmltests/Dash/qml/fake_scopeView4.qml	2013-06-19 20:05:35 +0000
4527
@@ -16,9 +16,9 @@
4528
16
16
4529
17
import QtQuick 2.0
17
import QtQuick 2.0
4530
18
18
4534
19
FakeLensView {
19
FakeScopeView {
4535
20
    id: fake_lensView4
20
    id: fake_scopeView4
4536
21
    objectName: "fake_lensView4"
21
    objectName: "fake_scopeView4"
4537
22
22
4538
23
    backColor: "#C0C0C0"
23
    backColor: "#C0C0C0"
4539
24
}
24
}
4540
25
25
4541
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
4542
--- tests/qmltests/Dash/tst_Dash.qml	2013-06-11 10:36:55 +0000
4543
+++ tests/qmltests/Dash/tst_Dash.qml	2013-06-19 20:05:35 +0000
4544
@@ -30,79 +30,79 @@
4545
30
    Dash {
30
    Dash {
4546
31
        id: dash
31
        id: dash
4547
32
        anchors.fill: parent
32
        anchors.fill: parent
4549
33
        showLensOnLoaded: "MockLens2"
33
        showScopeOnLoaded: "MockScope2"
4550
34
    }
34
    }
4551
35
35
4559
36
    LensDelegateMapper {
36
    ScopeDelegateMapper {
4560
37
        id: lensDelegateMapper
37
        id: scopeDelegateMapper
4561
38
        lensDelegateMapping: {
38
        scopeDelegateMapping: {
4562
39
            "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
39
            "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
4563
40
            "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
40
            "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
4564
41
            "MockLens3": "../tests/qmltests/Dash/qml/fake_lensView3.qml",
41
            "MockScope3": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
4565
42
            "MockLens4": "../tests/qmltests/Dash/qml/fake_lensView4.qml"
42
            "MockScope4": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
4566
43
        }
43
        }
4568
44
        genericLens: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
44
        genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
4569
45
    }
45
    }
4570
46
46
4571
47
    UT.UnityTestCase {
47
    UT.UnityTestCase {
4572
48
        name: "Dash"
48
        name: "Dash"
4573
49
        when: windowShown
49
        when: windowShown
4574
50
50
4576
51
        property var lenses
51
        property var scopes
4577
52
52
4578
53
        Component.onCompleted: {
53
        Component.onCompleted: {
4579
54
            var dashContent = findChild(dash, "dashContent");
54
            var dashContent = findChild(dash, "dashContent");
4582
55
            dashContent.lensMapper = lensDelegateMapper;
55
            dashContent.scopeMapper = scopeDelegateMapper;
4583
56
            lenses = dashContent.lenses;
56
            scopes = dashContent.scopes;
4584
57
        }
57
        }
4585
58
58
4586
59
        function init() {
59
        function init() {
4589
60
            // clear and reload the lenses.
60
            // clear and reload the scopes.
4590
61
            lenses.clear();
61
            scopes.clear();
4591
62
            var dashContentList = findChild(dash, "dashContentList");
62
            var dashContentList = findChild(dash, "dashContentList");
4592
63
            verify(dashContentList != undefined);
63
            verify(dashContentList != undefined);
4593
64
            tryCompare(dashContentList, "count", 0);
64
            tryCompare(dashContentList, "count", 0);
4595
65
            lenses.load();
65
            scopes.load();
4596
66
        }
66
        }
4597
67
67
4599
68
        function get_lens_data() {
68
        function get_scope_data() {
4600
69
            return [
69
            return [
4606
70
                        { tag: "MockLens1", visualIndex: 0, shouldBeVisible: true },
70
                        { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },
4607
71
                        { tag: "MockLens2", visualIndex: -1, shouldBeVisible: false },
71
                        { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },
4608
72
                        { tag: "MockLens3", visualIndex: 1, shouldBeVisible: true },
72
                        { tag: "MockScope3", visualIndex: 1, shouldBeVisible: true },
4609
73
                        { tag: "MockLens4", visualIndex: 2, shouldBeVisible: true },
73
                        { tag: "MockScope4", visualIndex: 2, shouldBeVisible: true },
4610
74
                        { tag: "MockLens5", visualIndex: 3, shouldBeVisible: true },
74
                        { tag: "MockScope5", visualIndex: 3, shouldBeVisible: true },
4611
75
            ]
75
            ]
4612
76
        }
76
        }
4613
77
77
4616
78
        function test_set_current_lens_data() {
78
        function test_set_current_scope_data() {
4617
79
            return get_lens_data()
79
            return get_scope_data()
4618
80
        }
80
        }
4619
81
81
4623
82
        function test_set_current_lens(data) {
82
        function test_set_current_scope(data) {
4624
83
            // wait for lenses to load
83
            // wait for scopes to load
4625
84
            tryCompare(lenses, "loaded", true);
84
            tryCompare(scopes, "loaded", true);
4626
85
85
4627
86
            var dashbar = findChild(dash, "dashbar");
86
            var dashbar = findChild(dash, "dashbar");
4628
87
            verify(dashbar != undefined)
87
            verify(dashbar != undefined)
4629
88
            var dashContent = findChild(dash, "dashContent");
88
            var dashContent = findChild(dash, "dashContent");
4630
89
            var current_index = dashContent.currentIndex;
89
            var current_index = dashContent.currentIndex;
4631
90
90
4633
91
            dash.setCurrentLens(data.tag, true /* animate */, false /* reset */);
91
            dash.setCurrentScope(data.tag, true /* animate */, false /* reset */);
4634
92
            compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
92
            compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
4635
93
            compare(dashbar.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
93
            compare(dashbar.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
4636
94
        }
94
        }
4637
95
95
4640
96
        function test_show_lens_on_load_data() {
96
        function test_show_scope_on_load_data() {
4641
97
            return get_lens_data()
97
            return get_scope_data()
4642
98
        }
98
        }
4643
99
99
4645
100
        function test_show_lens_on_load(data) {
100
        function test_show_scope_on_load(data) {
4646
101
            if (data.shouldBeVisible == false) {
101
            if (data.shouldBeVisible == false) {
4647
102
                console.log("Not testing " + data.tag + ": not visible");
102
                console.log("Not testing " + data.tag + ": not visible");
4648
103
                return;
103
                return;
4649
104
            }
104
            }
4651
105
            dash.showLensOnLoaded = data.tag
105
            dash.showScopeOnLoaded = data.tag
4652
106
106
4653
107
            var dashContentList = findChild(dash, "dashContentList");
107
            var dashContentList = findChild(dash, "dashContentList");
4654
108
            verify(dashContentList != undefined);
108
            verify(dashContentList != undefined);
4655
@@ -110,7 +110,7 @@
4656
110
        }
110
        }
4657
111
111
4658
112
        function test_dash_bar_set_index_connection_data() {
112
        function test_dash_bar_set_index_connection_data() {
4660
113
            return get_lens_data()
113
            return get_scope_data()
4661
114
        }
114
        }
4662
115
115
4663
116
        function test_dash_bar_set_index_connection(data) {
116
        function test_dash_bar_set_index_connection(data) {
4664
@@ -118,8 +118,8 @@
4665
118
                console.log("Not testing " + data.tag + ": not visible");
118
                console.log("Not testing " + data.tag + ": not visible");
4666
119
                return;
119
                return;
4667
120
            }
120
            }
4670
121
            // wait for lenses to load
121
            // wait for scopes to load
4671
122
            tryCompare(lenses, "loaded", true);
122
            tryCompare(scopes, "loaded", true);
4672
123
123
4673
124
            var dashbar = findChild(dash, "dashbar");
124
            var dashbar = findChild(dash, "dashbar");
4674
125
            verify(dashbar != undefined)
125
            verify(dashbar != undefined)
4675
126
126
4676
=== modified file 'tests/qmltests/Dash/tst_DashBar.qml'
4677
--- tests/qmltests/Dash/tst_DashBar.qml	2013-06-05 22:03:08 +0000
4678
+++ tests/qmltests/Dash/tst_DashBar.qml	2013-06-19 20:05:35 +0000
4679
@@ -34,12 +34,12 @@
4680
34
            right: parent.right
34
            right: parent.right
4681
35
            bottom: parent.bottom
35
            bottom: parent.bottom
4682
36
        }
36
        }
4684
37
        model: lenses
37
        model: scopes
4685
38
        onItemSelected: currentIndex = index
38
        onItemSelected: currentIndex = index
4686
39
    }
39
    }
4687
40
40
4690
41
    Lenses {
41
    Scopes {
4691
42
        id: lenses
42
        id: scopes
4692
43
    }
43
    }
4693
44
44
4694
45
    SignalSpy {
45
    SignalSpy {
4695
@@ -50,7 +50,7 @@
4696
50
50
4697
51
    UT.UnityTestCase {
51
    UT.UnityTestCase {
4698
52
        name: "DashBar"
52
        name: "DashBar"
4700
53
        when: lenses.loaded
53
        when: scopes.loaded
4701
54
54
4702
55
        property alias model: dashBar.model
55
        property alias model: dashBar.model
4703
56
        property alias currentIndex: dashBar.currentIndex
56
        property alias currentIndex: dashBar.currentIndex
4704
57
57
4705
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
4706
--- tests/qmltests/Dash/tst_DashContent.qml	2013-06-11 10:36:55 +0000
4707
+++ tests/qmltests/Dash/tst_DashContent.qml	2013-06-19 20:05:35 +0000
4708
@@ -28,60 +28,60 @@
4709
28
28
4710
29
    property ListModel searchHistory: ListModel {}
29
    property ListModel searchHistory: ListModel {}
4711
30
30
4718
31
    property var lensStatus: {
31
    property var scopeStatus: {
4719
32
        'MockLens1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
32
        'MockScope1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
4720
33
        'MockLens2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
33
        'MockScope2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
4721
34
        'MockLens3': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
34
        'MockScope3': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
4722
35
        'MockLens4': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
35
        'MockScope4': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
4723
36
        'MockLens5': { 'movementStarted': 0, 'positionedAtBeginning': 0 }
36
        'MockScope5': { 'movementStarted': 0, 'positionedAtBeginning': 0 }
4724
37
    }
37
    }
4725
38
38
4728
39
    Lenses {
39
    Scopes {
4729
40
        id: lensesModel
40
        id: scopesModel
4730
41
    }
41
    }
4731
42
42
4732
43
    DashContent {
43
    DashContent {
4733
44
        id: dashContent
44
        id: dashContent
4734
45
        anchors.fill: parent
45
        anchors.fill: parent
4735
46
46
4738
47
        model: lensesModel
47
        model: scopesModel
4739
48
        lenses : lensesModel
48
        scopes : scopesModel
4740
49
49
4742
50
        lensMapper : lensDelegateMapper
50
        scopeMapper : scopeDelegateMapper
4743
51
    }
51
    }
4744
52
52
4752
53
    LensDelegateMapper {
53
    ScopeDelegateMapper {
4753
54
        id: lensDelegateMapper
54
        id: scopeDelegateMapper
4754
55
        lensDelegateMapping: {
55
        scopeDelegateMapping: {
4755
56
            "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
56
            "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
4756
57
            "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
57
            "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
4757
58
            "MockLens3": "../tests/qmltests/Dash/qml/fake_lensView3.qml",
58
            "MockScope3": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
4758
59
            "MockLens4": "../tests/qmltests/Dash/qml/fake_lensView4.qml"
59
            "MockScope4": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
4759
60
        }
60
        }
4761
61
        genericLens: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
61
        genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
4762
62
    }
62
    }
4763
63
63
4779
64
    function clear_lens_status() {
64
    function clear_scope_status() {
4780
65
        lensStatus["MockLens1"].movementStarted = 0;
65
        scopeStatus["MockScope1"].movementStarted = 0;
4781
66
        lensStatus["MockLens1"].positionedAtBeginning = 0;
66
        scopeStatus["MockScope1"].positionedAtBeginning = 0;
4782
67
67
4783
68
        lensStatus["MockLens2"].movementStarted = 0;
68
        scopeStatus["MockScope2"].movementStarted = 0;
4784
69
        lensStatus["MockLens2"].positionedAtBeginning = 0;
69
        scopeStatus["MockScope2"].positionedAtBeginning = 0;
4785
70
70
4786
71
        lensStatus["MockLens3"].movementStarted = 0;
71
        scopeStatus["MockScope3"].movementStarted = 0;
4787
72
        lensStatus["MockLens3"].positionedAtBeginning = 0;
72
        scopeStatus["MockScope3"].positionedAtBeginning = 0;
4788
73
73
4789
74
        lensStatus["MockLens4"].movementStarted = 0;
74
        scopeStatus["MockScope4"].movementStarted = 0;
4790
75
        lensStatus["MockLens4"].positionedAtBeginning = 0;
75
        scopeStatus["MockScope4"].positionedAtBeginning = 0;
4791
76
76
4792
77
        lensStatus["MockLens5"].movementStarted = 0;
77
        scopeStatus["MockScope5"].movementStarted = 0;
4793
78
        lensStatus["MockLens5"].positionedAtBeginning = 0;
78
        scopeStatus["MockScope5"].positionedAtBeginning = 0;
4794
79
    }
79
    }
4795
80
80
4796
81
    SignalSpy {
81
    SignalSpy {
4798
82
        id: lensLoadedSpy
82
        id: scopeLoadedSpy
4799
83
        target: dashContent
83
        target: dashContent
4801
84
        signalName: "lensLoaded"
84
        signalName: "scopeLoaded"
4802
85
    }
85
    }
4803
86
86
4804
87
    SignalSpy {
87
    SignalSpy {
4805
@@ -101,78 +101,81 @@
4806
101
        when: windowShown
101
        when: windowShown
4807
102
102
4808
103
        function init() {
103
        function init() {
4810
104
            lensLoadedSpy.clear();
104
            scopeLoadedSpy.clear();
4811
105
            movementStartedSpy.clear();
105
            movementStartedSpy.clear();
4812
106
            contentEndReachedSpy.clear()
106
            contentEndReachedSpy.clear()
4814
107
            clear_lens_status();
107
            clear_scope_status();
4815
108
108
4817
109
            // clear, wait for dahs to empty and load lenses.
109
            // clear, wait for dahs to empty and load scopes.
4818
110
            var dashContentList = findChild(dashContent, "dashContentList");
110
            var dashContentList = findChild(dashContent, "dashContentList");
4819
111
            verify(dashContentList != undefined)
111
            verify(dashContentList != undefined)
4821
112
            lensesModel.clear();
112
            scopesModel.clear();
4822
113
            tryCompare(dashContentList, "count", 0);
113
            tryCompare(dashContentList, "count", 0);
4824
114
            lensesModel.load();
114
            scopesModel.load();
4825
115
        }
115
        }
4826
116
116
4827
117
        function test_movement_started_signal() {
117
        function test_movement_started_signal() {
4829
118
            dashContent.setCurrentLensAtIndex(3, true, false);
118
            dashContent.setCurrentScopeAtIndex(3, true, false);
4830
119
119
4831
120
            var dashContentList = findChild(dashContent, "dashContentList");
120
            var dashContentList = findChild(dashContent, "dashContentList");
4832
121
            verify(dashContentList != undefined)
121
            verify(dashContentList != undefined)
4834
122
            tryCompare(lensLoadedSpy, "count", 5);
122
4835
123
            tryCompare(scopeLoadedSpy, "count", 5);
4836
123
124
4837
124
            dashContentList.movementStarted();
125
            dashContentList.movementStarted();
4838
126
4839
125
            compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");
127
            compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");
4845
126
            compare(lensStatus["MockLens1"].movementStarted, 1, "MockLens1 should have emitted movementStarted signal when content list did.");
128
            compare(scopeStatus["MockScope1"].movementStarted, 1, "MockScope1 should have emitted movementStarted signal when content list did.");
4846
127
            compare(lensStatus["MockLens2"].movementStarted, 1, "MockLens2 should have emitted movementStarted signal when content list did.");
129
            compare(scopeStatus["MockScope2"].movementStarted, 1, "MockScope2 should have emitted movementStarted signal when content list did.");
4847
128
            compare(lensStatus["MockLens3"].movementStarted, 1, "MockLens3 should have emitted movementStarted signal when content list did.");
130
            compare(scopeStatus["MockScope3"].movementStarted, 1, "MockScope3 should have emitted movementStarted signal when content list did.");
4848
129
            compare(lensStatus["MockLens4"].movementStarted, 1, "MockLens4 should have emitted movementStarted signal when content list did.");
131
            compare(scopeStatus["MockScope4"].movementStarted, 1, "MockScope4 should have emitted movementStarted signal when content list did.");
4849
130
            compare(lensStatus["MockLens5"].movementStarted, 1, "MockLens5 should have emitted movementStarted signal when content list did.");
132
            compare(scopeStatus["MockScope5"].movementStarted, 1, "MockScope5 should have emitted movementStarted signal when content list did.");
4850
131
        }
133
        }
4851
132
134
4852
133
        function test_positioned_at_beginning_signal() {
135
        function test_positioned_at_beginning_signal() {
4854
134
            dashContent.setCurrentLensAtIndex(3, true, false);
136
            dashContent.setCurrentScopeAtIndex(3, true, false);
4855
135
137
4857
136
            tryCompare(lensLoadedSpy, "count", 5);
138
            tryCompare(scopeLoadedSpy, "count", 5);
4858
137
139
4859
138
            dashContent.positionedAtBeginning();
140
            dashContent.positionedAtBeginning();
4865
139
            compare(lensStatus["MockLens1"].positionedAtBeginning, 1, "MockLens1 should have emitted positionedAtBeginning signal when DashContent did.");
141
            compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");
4866
140
            compare(lensStatus["MockLens2"].positionedAtBeginning, 1, "MockLens2 should have emitted positionedAtBeginning signal when DashContent did.");
142
            compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");
4867
141
            compare(lensStatus["MockLens3"].positionedAtBeginning, 1, "MockLens3 should have emitted positionedAtBeginning signal when DashContent did.");
143
            compare(scopeStatus["MockScope3"].positionedAtBeginning, 1, "MockScope3 should have emitted positionedAtBeginning signal when DashContent did.");
4868
142
            compare(lensStatus["MockLens4"].positionedAtBeginning, 1, "MockLens4 should have emitted positionedAtBeginning signal when DashContent did.");
144
            compare(scopeStatus["MockScope4"].positionedAtBeginning, 1, "MockScope4 should have emitted positionedAtBeginning signal when DashContent did.");
4869
143
            compare(lensStatus["MockLens5"].positionedAtBeginning, 1, "MockLens5 should have emitted positionedAtBeginning signal when DashContent did.");
145
            compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");
4870
144
        }
146
        }
4871
145
147
4874
146
        function test_lens_loaded() {
148
        function test_scope_loaded() {
4875
147
            tryCompare(lensLoadedSpy, "count", 5);
149
            tryCompare(scopeLoadedSpy, "count", 5);
4876
148
        }
150
        }
4877
149
151
4878
150
        function test_content_end_reached() {
152
        function test_content_end_reached() {
4879
151
            var dashContentList = findChild(dashContent, "dashContentList");
153
            var dashContentList = findChild(dashContent, "dashContentList");
4880
152
            verify(dashContentList != undefined);
154
            verify(dashContentList != undefined);
4881
153
            tryCompare(lensLoadedSpy, "count", 5);
4882
154
155
4884
155
            dashContent.setCurrentLensAtIndex(0, true, false);
156
            tryCompare(scopeLoadedSpy, "count", 5);
4885
157
            dashContent.setCurrentScopeAtIndex(0, true, false);
4886
156
            dashContentList.currentItem.item.endReached();
158
            dashContentList.currentItem.item.endReached();
4887
157
159
4888
158
            compare(contentEndReachedSpy.count, 1);
160
            compare(contentEndReachedSpy.count, 1);
4889
159
        }
161
        }
4890
160
162
4895
161
        // This tests that setting the current lens index will end up at the correct index even if
163
        // This tests that setting the current scope index will end up at the correct index even if
4896
162
        // the lenses are loaded asynchrounsly.
164
        // the scopes are loaded asynchrounsly.
4897
163
        function test_set_current_lens_index_async() {
165
        function test_set_current_scope_index_async() {
4898
164
            verify(lensesModel.loaded == false);
166
            verify(scopesModel.loaded == false);
4899
165
167
4900
166
            // next index is 1 if current is -1, otherwise it's current + 1
168
            // next index is 1 if current is -1, otherwise it's current + 1
4901
167
            var next_index = ((dashContent.currentIndex == -1 ? 0 : dashContent.currentIndex) + 1) % 5
169
            var next_index = ((dashContent.currentIndex == -1 ? 0 : dashContent.currentIndex) + 1) % 5
4902
168
170
4904
169
            dashContent.setCurrentLensAtIndex(next_index, true, false);
171
            dashContent.setCurrentScopeAtIndex(next_index, true, false);
4905
170
            tryCompare(dashContent, "currentIndex", next_index);
172
            tryCompare(dashContent, "currentIndex", next_index);
4907
171
            verify(lensesModel.loaded == true);
173
            verify(scopesModel.loaded == true);
4908
172
174
4912
173
            // test greater than lens count.
175
            // test greater than scope count.
4913
174
            dashContent.setCurrentLensAtIndex(lensesModel.count, true, false);
176
            var currentScopeIndex = dashContent.currentIndex;
4914
175
            compare(dashContent.currentIndex, 4);
177
            dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false);
4915
178
            compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
4916
176
        }
179
        }
4917
177
180
4918
178
        function get_current_item_object_name() {
181
        function get_current_item_object_name() {
4919
@@ -187,18 +190,18 @@
4920
187
            return "";
190
            return "";
4921
188
        }
191
        }
4922
189
192
4924
190
        function test_lens_mapping_data() {
193
        function test_scope_mapping_data() {
4925
191
            return [
194
            return [
4931
192
                {tag: "index0", index: 0, objectName: "fake_lensView1"},
195
                {tag: "index0", index: 0, objectName: "fake_scopeView1"},
4932
193
                {tag: "index1", index: 1, objectName: "fake_lensView2"},
196
                {tag: "index1", index: 1, objectName: "fake_scopeView2"},
4933
194
                {tag: "index2", index: 2, objectName: "fake_lensView3"},
197
                {tag: "index2", index: 2, objectName: "fake_scopeView3"},
4934
195
                {tag: "index3", index: 3, objectName: "fake_lensView4"},
198
                {tag: "index3", index: 3, objectName: "fake_scopeView4"},
4935
196
                {tag: "index4", index: 4, objectName: "fake_generic_lensView"}
199
                {tag: "index4", index: 4, objectName: "fake_generic_scopeView"}
4936
197
            ]
200
            ]
4937
198
        }
201
        }
4938
199
202
4941
200
        function test_lens_mapping(data) {
203
        function test_scope_mapping(data) {
4942
201
            dashContent.setCurrentLensAtIndex(data.index, true, false);
204
            dashContent.setCurrentScopeAtIndex(data.index, true, false);
4943
202
            tryCompareFunction(get_current_item_object_name, data.objectName)
205
            tryCompareFunction(get_current_item_object_name, data.objectName)
4944
203
        }
206
        }
4945
204
207
4946
205
208
4947
=== modified file 'tests/qmltests/Dash/tst_FilterGrids.qml'
4948
--- tests/qmltests/Dash/tst_FilterGrids.qml	2013-06-05 22:03:08 +0000
4949
+++ tests/qmltests/Dash/tst_FilterGrids.qml	2013-06-19 20:05:35 +0000
4950
@@ -108,7 +108,6 @@
4951
108
        function test_clicked_signal_data() {
108
        function test_clicked_signal_data() {
4952
109
            return [
109
            return [
4953
110
                {tag: "VideosFilterGrid", component: "Video/VideosFilterGrid.qml"},
110
                {tag: "VideosFilterGrid", component: "Video/VideosFilterGrid.qml"},
4954
111
                {tag: "PeopleFilterGrid", component: "People/PeopleFilterGrid.qml"},
4955
112
                {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"},
111
                {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"},
4956
113
                {tag: "ApplicationsFilterGrid", component: "Apps/ApplicationsFilterGrid.qml"}
112
                {tag: "ApplicationsFilterGrid", component: "Apps/ApplicationsFilterGrid.qml"}
4957
114
            ]
113
            ]
4958
115
114
4959
=== renamed file 'tests/qmltests/Dash/tst_GenericLensView.qml' => 'tests/qmltests/Dash/tst_GenericScopeView.qml'
4960
--- tests/qmltests/Dash/tst_GenericLensView.qml	2013-06-05 22:03:08 +0000
4961
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2013-06-19 20:05:35 +0000
4962
@@ -26,27 +26,27 @@
4963
26
    width: units.gu(120)
26
    width: units.gu(120)
4964
27
    height: units.gu(80)
27
    height: units.gu(80)
4965
28
28
4968
29
    Lenses {
29
    Scopes {
4969
30
        id: lenses
30
        id: scopes
4970
31
    }
31
    }
4971
32
32
4974
33
    GenericLensView {
33
    GenericScopeView {
4975
34
        id: genericLensView
34
        id: genericScopeView
4976
35
        anchors.fill: parent
35
        anchors.fill: parent
4977
36
36
4978
37
        UT.UnityTestCase {
37
        UT.UnityTestCase {
4981
38
            name: "GenericLensView"
38
            name: "GenericScopeView"
4982
39
            when: lenses.loaded
39
            when: scopes.loaded
4983
40
40
4984
41
            function init() {
41
            function init() {
4986
42
                genericLensView.lens = lenses.get(0)
42
                genericScopeView.scope = scopes.get(0)
4987
43
            }
43
            }
4988
44
44
4989
45
            function test_isCurrent() {
45
            function test_isCurrent() {
4992
46
                var pageHeader = findChild(genericLensView, "pageHeader");
46
                var pageHeader = findChild(genericScopeView, "pageHeader");
4993
47
                genericLensView.isCurrent = true
47
                genericScopeView.isCurrent = true
4994
48
                pageHeader.searchQuery = "test"
48
                pageHeader.searchQuery = "test"
4996
49
                genericLensView.isCurrent = false
49
                genericScopeView.isCurrent = false
4997
50
                tryCompare(pageHeader, "searchQuery", "")
50
                tryCompare(pageHeader, "searchQuery", "")
4998
51
            }
51
            }
4999
52
        }
52
        }
5000
53
53
Status:	Merged
Approved by:	Ricardo Salveti on 2013-06-19
Approved revision:	no longer in the source branch.
Merged at revision:	31
Proposed branch:	lp:~unity-team/unity/8.new-libunity
Merge into:	lp:unity/8.0
Diff against target:	5742 lines (+706/-3241) 66 files modified Components/IconUtil.js (+42/-0) Dash/Apps/ApplicationsFilterGrid.qml (+2/-2) Dash/Dash.qml (+27/-27) Dash/DashApps.qml (+5/-5) Dash/DashBar.qml (+3/-8) Dash/DashContent.qml (+18/-17) Dash/DashHome.qml (+15/-37) Dash/DashMusic.qml (+7/-7) Dash/DashPeople.qml (+0/-235) Dash/DashVideos.qml (+9/-9) Dash/GenericScopeView.qml (+8/-7) Dash/Music/MusicFilterGrid.qml (+2/-2) Dash/People/CarouselDelegatePeople.qml (+0/-166) Dash/People/Data.qml (+0/-71) Dash/People/Delegate.qml (+0/-167) Dash/People/PeopleCarousel.qml (+0/-43) Dash/People/PeopleFilterGrid.qml (+0/-74) Dash/People/PeoplePreview.qml (+0/-124) Dash/People/Preview/Address.qml (+0/-74) Dash/People/Preview/Base.qml (+0/-22) Dash/People/Preview/Generic.qml (+0/-80) Dash/People/Preview/Phone.qml (+0/-108) Dash/People/Preview/Status.qml (+0/-97) Dash/People/graphics/bottomshape@18.sci (+0/-5) Dash/ScopeDelegateMapper.qml (+10/-11) Dash/ScopeView.qml (+4/-4) Dash/Video/VideosFilterGrid.qml (+2/-2) Shell.qml (+3/-3) build_unity (+5/-15) debian/changelog (+6/-0) debian/control (+3/-1) plugins/Unity/CMakeLists.txt (+2/-3) plugins/Unity/categories.cpp (+4/-54) plugins/Unity/categories.h (+1/-11) plugins/Unity/peoplepreviewdata.cpp (+0/-438) plugins/Unity/peoplepreviewdata.h (+0/-251) plugins/Unity/plugin.cpp (+4/-9) plugins/Unity/scope.cpp (+129/-194) plugins/Unity/scope.h (+16/-44) plugins/Unity/scopes.cpp (+98/-104) plugins/Unity/scopes.h (+25/-21) po/unity8.pot (+11/-38) tests/autopilot/unity8/tests/helpers.py (+1/-1) tests/autopilot/unity8/tests/testhud.py (+1/-1) tests/autopilot/unity8/tests/testlockscreen.py (+1/-1) tests/qmltests/CMakeLists.txt (+2/-4) tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml (+0/-154) tests/qmltests/Dash/qml/FakeScopeView.qml (+9/-9) tests/qmltests/Dash/qml/fake_generic_scopeView.qml (+3/-3) tests/qmltests/Dash/qml/fake_scopeView1.qml (+3/-3) tests/qmltests/Dash/qml/fake_scopeView2.qml (+3/-3) tests/qmltests/Dash/qml/fake_scopeView3.qml (+3/-3) tests/qmltests/Dash/qml/fake_scopeView4.qml (+3/-3) tests/qmltests/Dash/tst_Dash.qml (+34/-34) tests/qmltests/Dash/tst_DashBar.qml (+4/-4) tests/qmltests/Dash/tst_DashContent.qml (+79/-76) tests/qmltests/Dash/tst_FilterGrids.qml (+0/-1) tests/qmltests/Dash/tst_GenericScopeView.qml (+10/-10) tests/qmltests/Dash/tst_PeoplePreview.qml (+0/-254) tests/qmltests/Dash/tst_ScopeView.qml (+12/-12) tests/qmltests/plugins/Unity/CMakeLists.txt (+2/-2) tests/qmltests/plugins/Unity/fake_scope.cpp (+15/-13) tests/qmltests/plugins/Unity/fake_scope.h (+6/-6) tests/qmltests/plugins/Unity/fake_scopes.cpp (+38/-38) tests/qmltests/plugins/Unity/fake_scopes.h (+13/-13) tests/qmltests/plugins/Unity/fake_unity_plugin.cpp (+3/-3)
To merge this branch:	bzr merge lp:~unity-team/unity/8.new-libunity
Related bugs:	Link a bug report
Reviewer	Review Type	Status
Ricardo Salveti (community)		Approve on 2013-06-19
Michał Sawicz		Approve on 2013-06-19
PS Jenkins bot (community)	continuous-integration	Approve on 2013-06-19
Michael Zanetti (community)		Approve on 2013-06-19
Review via email: mp+167733@code.launchpad.net