@@ -33,23 +33,23 @@ Item {
3333 signal contentFlickStarted()
3434 signal contentEndReached()
3535 signal previewShown()
36− signal lensLoaded(string lensId)
36+ signal scopeLoaded(string scopeId)
3737 signal positionedAtBeginning()
3838
39− // If we set the current lens index before the scopes have been added,
39+ // If we set the current scope index before the scopes have been added,
4040 // then we need to wait until the loaded signals gets emitted from the scopes
4141 property var set_current_index: undefined
4242 Connections {
4343 target: scopes
4444 onLoadedChanged: {
4545 if (scopes.loaded && set_current_index != undefined) {
46− setCurrentLensAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);
46+ setCurrentScopeAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);
4747 set_current_index = undefined;
4848 }
4949 }
5050 }
5151
52− function setCurrentLensAtIndex(index, animate, reset) {
52+ function setCurrentScopeAtIndex(index, animate, reset) {
5353 var storedMoveDuration = dashContentList.highlightMoveDuration
5454 var storedMoveSpeed = dashContentList.highlightMoveVelocity
5555 if (!animate) {
@@ -79,12 +79,12 @@ Item {
7979 }
8080 }
8181
82− property var lensDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",
82+ property var scopeDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",
8383 "applications.scope": "DashApps.qml",
8484 "home.scope": "DashHome.qml",
8585 "mockvideosmaster.scope": "DashVideos.qml",
8686 }
87− property string genericLens: "GenericLensView.qml"
87+ property string genericScope: "GenericScopeView.qml"
8888
8989 ListView {
9090 id: dashContentList
@@ -102,7 +102,7 @@ Item {
102102 highlightMoveDuration: 250
103103 highlightRangeMode: ListView.StrictlyEnforceRange
104104 /* FIXME: workaround rendering issue due to use of ShaderEffectSource in
105− UbuntuShape. While switching from the home lens to the People lens the
105+ UbuntuShape. While switching from the home scope to the People scope the
106106 rendering would block midway.
107107 */
108108 cacheBuffer: 2147483647
@@ -112,7 +112,7 @@ Item {
112112 // If the number of items is less than the current index, then need to reset to another item.
113113 onCountChanged: {
114114 if (currentIndex >= count)
115− dashContent.setCurrentLensAtIndex(count-1, true, true)
115+ dashContent.setCurrentScopeAtIndex(count-1, true, true)
116116 }
117117
118118 delegate:
@@ -121,20 +121,20 @@ Item {
121121 height: ListView.view.height
122122 asynchronous: true
123123 source: {
124− var customLens = lensDelegateMapping[lens.id]
125− if (customLens) {
126− return customLens
124+ var customScope = scopeDelegateMapping[scope.id]
125+ if (customScope) {
126+ return customScope
127127 } else {
128− return genericLens
128+ return genericScope
129129 }
130130 }
131131 onLoaded: {
132− item.lens = Qt.binding(function() { return lens })
132+ item.scope = Qt.binding(function() { return scope })
133133 item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
134134 item.searchHistory = Qt.binding(function() { return shell.searchHistory })
135135 dashContentList.movementStarted.connect(item.movementStarted)
136136 dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
137− dashContent.lensLoaded(item.lens.id)
137+ dashContent.scopeLoaded(item.scope.id)
138138 }
139139 Connections {
140140 target: item