Merge lp:~unity-team/unity/8.new-libunity into lp:unity/8.0

[Michał Sawicz]

First cut at porting phablet code to the new scopes API.

First cut at porting phablet code to the new scopes API. Please note that it needs lp:~stolowski/demo-assets/new-api and
lp:~stolowski/phablet-extras/unity-lens-mock-new-api

Here is a short note about how to get it running:
https://docs.google.com/a/canonical.com/document/d/1aNB6kfLOMq0asyxiSLahakfLU5si6V5RqxBuacMB0-U/edit

Please note that there are some 'issues' caused by the transition to the new API that I think are out of scope for this MP and should be handled as we move forward:
- shell needs to handle AnnotatedIcon (icon + price ribbon overlay), for now I implemented a simple fallback (just an icon).
- some themed icons are not loaded (mostly mime-type icons).

Also note that customized Home and Apps are disabled at the moment. Instead, you will see the real Home Scope content (Home is now a real scope in the backed, rather then a special case in UnityCore) and the desktop version of Apps (applications.scope) if present. We have a branch of applications scope that merges recent App scope changes with phablet apps mod. It needs to land in saucy for Apps to work on the phone.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:10
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1204/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

We might need to (build)depend on libunity, libunity-core < 7.80 so that we pick up the saucy version, at least until we drop the modded versions from 13.04.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/9/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1209
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1934

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/10/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1938

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1217/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/19/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1220
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1972

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/20/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1221
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1973

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/23/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/23/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1224
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1977

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/23/rebuild

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

I got the same jenkins error before. I have to build it against the latest UnityCore. Like modify the build script to UNITY_REV=3326.
Is that an issue here?

[Michał Sawicz (saviq)]

W dniu 10.06.2013 15:19, Ying-Chun Liu pisze:
> I got the same jenkins error before. I have to build it against the latest UnityCore. Like modify the build script to UNITY_REV=3326.
> Is that an issue here?

The build script isn't used here. But the unity packages didn't get
updated in the cache or something. Triggering a rebuild.

--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/33/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/33/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1245
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/2048

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/33/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

* please move from_gicon(name) out into a separate .js file for use in all the Tiles and Carousel*Delegates
* please complete the s/lens/scope/g, there's lenses mentioned all over the place - in tests/, too
* is there a header from which we could take the column ids in categories.cpp?
* "TODO needs model row" does that mean the whole row? row index? is it still needed, btw? you said we were moving away from scope-side activation?
* #include <UnityCore/Variant.h> not needed?
* #include <UnityCore/Results.h> Result.h should be enough?
* is ViewType::HomeView still used?
* should we make sure ViewType and ScopeViewType enums are in sync?
* Scopes::onScopeRemoved and ::onScopesReordered - we should probably implement those?

review: Needs Fixing

[Ying-Chun Liu (paulliu)]

--- debian/control 2013-06-05 22:03:08 +0000
158 +++ debian/control 2013-06-07 15:37:31 +0000
159 @@ -11,7 +11,7 @@
160 libgles2-mesa-dev[armhf],
161 libhud-client2-dev,
162 libpulse-dev,
163 - libunity-core-6.0-dev,
164 + libunity-core-6.0-dev (<7.80),

Should be libunity-core-6.0-dev (<< 7.80)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/38
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1250

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/40
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1252

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/51/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/51
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/59
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/59/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/53/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/53
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/65
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/65/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/63

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/53/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/55/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/55
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/67
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/67/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/65

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/55/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

The resulting package has a Depends:

libunity-core-6.0-5 (>= 4.14.2)

... can we please bump libunity-core SONAME, so that we're actually depending on the right version of the libs?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/72/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Yeah, and there's the conflicts that I mentioned now...

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/58/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/58
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/24/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/82
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/82/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/77

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/83/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/59
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/25/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/83
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/83/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/78/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/59/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/61/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/85/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/61
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/85
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/85/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/80/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/88/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/63
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/88
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/88/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/83/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/90/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/65
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/90
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/90/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/85/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/65/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/93/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/67
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/93
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/93/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/87/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/71/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/100/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/71
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/100
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/100/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/91/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/71/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/76/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/114/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/76
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/44/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/114
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/114/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/104/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/76/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/78/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/78
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/116/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/105/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/78/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/82/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/82
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/126
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/126/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/114

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/82/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/83/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/83
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/128
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/128/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/116

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/83/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/84/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/84
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/132
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/132/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/119

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/84/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/85/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/134/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/121

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/85/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/89/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/152
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/152/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/137

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/89/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/241/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/242
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/242/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/217/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/143/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

3914 + // is this QML-friendly? Shall it be more robust (beginMoveRows)?

Unfortunately it is not. Well, it doesn't crash anything or the like, but will destroy all the views for the model and build them up again. Very expensive operation. begin/endMoveRows() instead moves them without destroying and recreating.

Same for

3917 + // remove existing scopes
3918 + for (auto i=m_scopes.count()-1; i>=0; i--) {
3919 + removeUnityScope(i);
3920 + }
3921 +
3922 + // re-create scopes
3923 + for (uint i=0; i<scopes.size(); i++) {
3924 + addUnityScope(scopes[i]);
3925 + }

While Scope doesn't seem to be the most expensive class, it's still a lot more energy wasted then just reordering it in the list.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

206 - /* FIXME: should be 'source: lens.iconHint' but the
207 - lenses do not contain the right icons yet
208 + /* FIXME: should be 'source: scope.iconHint' but the
209 + scopes do not contain the right icons yet
210 */

Not sure what the state is, but just in case the new scopes would allow to get rid of such FIXME's, please make sure to either directly fix it if its straight forward, or to modify the FIXME comment in a way its obvious for us that we can get rid of it now.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/245/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/145/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/246/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/221/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/146/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

looks good to me now

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/146/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/252
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/252/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/227/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/147/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/253/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/255
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/255/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/230/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/233

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/149/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[Ricardo Salveti (rsalveti)]

Good, tested, working fine :-)

review: Approve

=== added file 'Components/IconUtil.js'
--- Components/IconUtil.js	1970-01-01 00:00:00 +0000
+++ Components/IconUtil.js	2013-06-19 20:05:35 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.pragma library
+
+// FIXME: a quick hack to get icons out of gicons and fallback to
+// base icon for annotated icons. Doesn't correctly handle all icons.
+// Proper global solution needed.
+function from_gicon(name) {
+    var icon_name = name;
+    var annotated_re = /^. UnityProtocolAnnotatedIcon/;
+    if (annotated_re.test(name)) {
+        var base_icon_re = /'base-icon':.+?'(.+?)'/;
+        var base_icon = name.toString().match(base_icon_re);
+        icon_name = base_icon[1];
+    }
+    else {
+        var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;
+        var themed = name.match(themed_re);
+        if (themed) {
+            return "image://gicon/" + themed[1];
+        }
+    }
+    var remote_re = /^http/;
+    if (remote_re.test(icon_name)) {
+        return icon_name;
+    }
+    return "image://gicon/" + icon_name;
+}

=== modified file 'Dash/Apps/ApplicationsFilterGrid.qml'
--- Dash/Apps/ApplicationsFilterGrid.qml	2013-06-05 22:03:08 +0000
+++ Dash/Apps/ApplicationsFilterGrid.qml	2013-06-19 20:05:35 +0000
@@ -35,7 +35,7 @@
         objectName: "delegate" + index
         Application {
             id: application
-            desktopFile: model.column_6 ? stripProtocol(model.column_6) : model.desktopFile // FIXME: this is temporary
+            desktopFile: model.column_7 ? stripProtocol(model.column_7) : model.desktopFile // FIXME: this is temporary
 
             function stripProtocol(uri) {
                 var chunks = uri.split('file://')
@@ -47,7 +47,7 @@
 
         width: filterGrid.cellWidth
         height: filterGrid.cellHeight
-        text: model.column_4 ? model.column_4 : application.name // FIXME: this is temporary
+        text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
         imageWidth: units.gu(8)
         imageHeight: units.gu(7.5)
         source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon

=== modified file 'Dash/Dash.qml'
--- Dash/Dash.qml	2013-06-07 09:22:34 +0000
+++ Dash/Dash.qml	2013-06-19 20:05:35 +0000
@@ -24,36 +24,36 @@
     id: dash
 
     property alias contentProgress: dashContent.contentProgress
-    property string showLensOnLoaded: "home.lens"
+    property string showScopeOnLoaded: "home.scope"
     property real contentScale: 1.0
 
     width: units.gu(40)
     height: units.gu(71)
 
-    function setCurrentLens(lensId, animate, reset) {
-        var lensIndex = filteredLenses.findFirst(Lenses.RoleId, lensId)
-
-        if (lensIndex == -1) {
-            console.warn("No match for lens with id: %1".arg(lensId))
-            return
-        }
-
-        if (lensIndex == dashContent.currentIndex && !reset) {
-            // the lens is already the current one
-            return
-        }
-
-        dashContent.setCurrentLensAtIndex(lensIndex, animate, reset)
+    function setCurrentScope(scopeId, animate, reset) {
+        var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)
+
+        if (scopeIndex == -1) {
+            console.warn("No match for scope with id: %1".arg(scopeId))
+            return
+        }
+
+        if (scopeIndex == dashContent.currentIndex && !reset) {
+            // the scope is already the current one
+            return
+        }
+
+        dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
     }
 
     SortFilterProxyModel {
-        id: filteredLenses
-        model: Lenses {
-            id: lenses
+        id: filteredScopes
+        model: Scopes {
+            id: scopes
         }
         dynamicSortFilter: true
 
-        filterRole: Lenses.RoleVisible
+        filterRole: Scopes.RoleVisible
         filterRegExp: RegExp("^true$")
     }
 
@@ -61,17 +61,17 @@
         id: dashContent
         objectName: "dashContent"
         anchors.fill: parent
-        model: filteredLenses
-        lenses: lenses
+        model: filteredScopes
+        scopes: scopes
         onMovementStarted: dashbar.startNavigation()
         onMovementEnded: dashbar.stopNavigation()
         onContentFlickStarted: dashbar.finishNavigation()
         onContentEndReached: dashbar.finishNavigation()
         onPreviewShown: dashbar.finishNavigation()
-        onLensLoaded: {
-            if (lensId == dash.showLensOnLoaded) {
-                dash.setCurrentLens(lensId, false, false)
-                dash.showLensOnLoaded = ""
+        onScopeLoaded: {
+            if (scopeId == dash.showScopeOnLoaded) {
+                dash.setCurrentScope(scopeId, false, false)
+                dash.showScopeOnLoaded = ""
             }
         }
         scale: dash.contentScale
@@ -84,9 +84,9 @@
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: parent.right
-        model: filteredLenses
+        model: filteredScopes
         currentIndex: dashContent.currentIndex
-        onItemSelected: dashContent.setCurrentLensAtIndex(index, true, false)
+        onItemSelected: dashContent.setCurrentScopeAtIndex(index, true, false)
         opacity: dash.contentScale == 1.0 ? 1.0 : 0.0
         Behavior on opacity { NumberAnimation { easing.type: Easing.OutQuad; duration: 150 } }
     }

=== modified file 'Dash/DashApps.qml'
--- Dash/DashApps.qml	2013-06-05 22:03:08 +0000
+++ Dash/DashApps.qml	2013-06-19 20:05:35 +0000
@@ -21,8 +21,8 @@
 import "../Components/ListItems"
 import "Apps"
 
-LensView {
-    id: lensView
+ScopeView {
+    id: scopeView
 
     // FIXME: a way to aggregate these models would be ideal
     property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
@@ -40,7 +40,7 @@
     }
 
     Binding {
-        target: lensView.lens
+        target: scopeView.scope
         property: "searchQuery"
         value: pageHeader.searchQuery
     }
@@ -86,7 +86,7 @@
         dynamicSortFilter: true
         filterRole: 2 // this is the category id for each result
         filterRegExp: /^3$/ // only proxy items that are category 3 - Installed
-        model: dashContent.lenses.get("applications.lens").results
+        model: dashContent.scopes.get("applications.scope").results
     }
 
     property var categoryModels: {
@@ -177,7 +177,7 @@
             width: categoryView.width
             text: i18n.tr("Apps")
             searchEntryEnabled: true
-            searchHistory: lensView.searchHistory
+            searchHistory: scopeView.searchHistory
         }
     }
 }

=== modified file 'Dash/DashBar.qml'
--- Dash/DashBar.qml	2013-06-05 22:03:08 +0000
+++ Dash/DashBar.qml	2013-06-19 20:05:35 +0000
@@ -26,7 +26,7 @@
 
     property int lineHeight: units.dp(2)
     property int itemSize: units.gu(7)
-    property int iconSize: units.gu(2.5)
+    property int iconSize: units.gu(3.5)
 
     signal itemSelected(int index)
 
@@ -97,14 +97,9 @@
 
                         Image {
                             anchors.centerIn: parent
-                            /* FIXME: should be 'source: lens.iconHint' but the
-                               lenses do not contain the right icons yet
-                            */
-                            source: "graphics/lensIcons/%1.png".arg(lens.name)
-                            height: iconSize
-                            width: iconSize
+                            source: scope.iconHint
+                            sourceSize { width: iconSize; height: iconSize }
                             // opacity: index == currentIndex ? 1 : 1 // same opacity for now
-                            smooth: true
                         }
                     }
             }

=== modified file 'Dash/DashContent.qml'
--- Dash/DashContent.qml	2013-06-11 10:36:55 +0000
+++ Dash/DashContent.qml	2013-06-19 20:05:35 +0000
@@ -24,34 +24,34 @@
     height: units.gu(71)
 
     property var model: null
-    property var lenses: null
+    property var scopes: null
     property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
     property alias currentIndex: dashContentList.currentIndex
 
-    property LensDelegateMapper lensMapper : LensDelegateMapper {}
+    property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
 
     signal movementStarted()
     signal movementEnded()
     signal contentFlickStarted()
     signal contentEndReached()
     signal previewShown()
-    signal lensLoaded(string lensId)
+    signal scopeLoaded(string scopeId)
     signal positionedAtBeginning()
 
-    // If we set the current lens index before the lenses have been added,
-    // then we need to wait until the loaded signals gets emitted from the lenses
+    // If we set the current scope index before the scopes have been added,
+    // then we need to wait until the loaded signals gets emitted from the scopes
     property var set_current_index: undefined
     Connections {
-        target: lenses
+        target: scopes
         onLoadedChanged: {
-            if (lenses.loaded && set_current_index != undefined) {
-                setCurrentLensAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);
+            if (scopes.loaded && set_current_index != undefined) {
+                setCurrentScopeAtIndex(set_current_index[0], set_current_index[1], set_current_index[2]);
                 set_current_index = undefined;
             }
         }
     }
 
-    function setCurrentLensAtIndex(index, animate, reset) {
+    function setCurrentScopeAtIndex(index, animate, reset) {
         var storedMoveDuration = dashContentList.highlightMoveDuration
         var storedMoveSpeed = dashContentList.highlightMoveVelocity
         if (!animate) {
@@ -59,8 +59,8 @@
             dashContentList.highlightMoveDuration = 0
         }
 
-        // if the lenses haven't loaded yet, then wait until they are.
-        if (!lenses.loaded) {
+        // if the scopes haven't loaded yet, then wait until they are.
+        if (!scopes.loaded) {
             set_current_index = [ index, animate, reset ]
             return;
         }
@@ -85,7 +85,7 @@
         id: dashContentList
         objectName: "dashContentList"
 
-        interactive: dashContent.lenses.loaded
+        interactive: dashContent.scopes.loaded
 
         anchors.fill: parent
         model: dashContent.model
@@ -97,7 +97,7 @@
         highlightMoveDuration: 250
         highlightRangeMode: ListView.StrictlyEnforceRange
         /* FIXME: workaround rendering issue due to use of ShaderEffectSource in
-           UbuntuShape. While switching from the home lens to the People lens the
+           UbuntuShape. While switching from the home scope to the People scope the
            rendering would block midway.
         */
         cacheBuffer: 2147483647
@@ -107,7 +107,7 @@
         // If the number of items is less than the current index, then need to reset to another item.
         onCountChanged: {
             if (currentIndex >= count)
-                dashContent.setCurrentLensAtIndex(count-1, true, true)
+                dashContent.setCurrentScopeAtIndex(count-1, true, true)
         }
 
         delegate:
@@ -115,14 +115,15 @@
                 width: ListView.view.width
                 height: ListView.view.height
                 asynchronous: true
-                source: lensMapper.map(lens.id)
+                source: scopeMapper.map(scope.id)
+
                 onLoaded: {
-                    item.lens = Qt.binding(function() { return lens })
+                    item.scope = Qt.binding(function() { return scope })
                     item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
                     item.searchHistory = Qt.binding(function() { return shell.searchHistory })
                     dashContentList.movementStarted.connect(item.movementStarted)
                     dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
-                    dashContent.lensLoaded(item.lens.id)
+                    dashContent.scopeLoaded(item.scope.id)
                 }
                 Connections {
                     target: item

=== modified file 'Dash/DashHome.qml'
--- Dash/DashHome.qml	2013-06-05 22:03:08 +0000
+++ Dash/DashHome.qml	2013-06-19 20:05:35 +0000
@@ -23,9 +23,8 @@
 import "Apps"
 import "Video"
 import "Music"
-import "People"
 
-LensView {
+ScopeView {
     id: root
 
     onMovementStarted: listView.showHeader()
@@ -34,20 +33,12 @@
         id: categoryListModel
         // specifies page's content categories, type of delegate and model used in each category
         ListElement { category: "Frequent Apps";         component: "AppsGrid";       modelName: "AppsModel" }
-        ListElement { category: "Favourite People";      component: "PeopleCarousel"; modelName: "FavouriteModel" }
-        ListElement { category: "People Recently in Touch"; component: "PeopleGrid";  modelName: "RecentModel" }
         ListElement { category: "Recent Music";          component: "MusicGrid";      modelName: "MusicModel" }
         ListElement { category: "Videos Popular Online"; component: "VideosGrid";     modelName: "VideosModel" }
         function getCategory(category1) {
             if (category1 === "Frequent Apps") {
                 return i18n.tr("Frequent Apps");
             }
-            if (category1 === "Favourite People") {
-                return i18n.tr("Favourite People");
-            }
-            if (category1 === "People Recently in Touch") {
-                return i18n.tr("People Recently in Touch");
-            }
             if (category1 === "Recent Music") {
                 return i18n.tr("Recent Music");
             }
@@ -90,33 +81,24 @@
     }
 
     Component.onCompleted: {
-        var lens = dashContent.lenses.get("people.lens")
-        if (lens) {
-            favouritesFilter.model = dashContent.lenses.get("people.lens").results
-            recentFilter.model = dashContent.lenses.get("people.lens").results
-        }
-        lens = dashContent.lenses.get("mockmusic.lens")
-        if (lens) {
-            musicFilter.model = dashContent.lenses.get("mockmusic.lens").results
-        }
-        lens = dashContent.lenses.get("mockvideos.lens")
-        if (lens) {
-            videosFilter.model = dashContent.lenses.get("mockvideos.lens").results
+        var scope = dashContent.scopes.get("mockmusicmaster.scope")
+        if (scope) {
+            musicFilter.model = dashContent.scopes.get("mockmusicmaster.scope").results
+        }
+        scope = dashContent.scopes.get("mockvideosmaster.scope")
+        if (scope) {
+            videosFilter.model = dashContent.scopes.get("mockvideosmaster.scope").results
         }
     }
 
     Connections {
         target: dashContent
-        onLensLoaded: switch (lensId) {
-            case "people.lens":
-                favouritesFilter.model = dashContent.lenses.get("people.lens").results
-                recentFilter.model = dashContent.lenses.get("people.lens").results
-                break;
-            case "mockmusic.lens":
-                musicFilter.model = dashContent.lenses.get("mockmusic.lens").results
-                break;
-            case "mockvideos.lens":
-                videosFilter.model = dashContent.lenses.get("mockvideos.lens").results
+        onScopeLoaded: switch (scopeId) {
+            case "mockmusicmaster.scope":
+                musicFilter.model = dashContent.scopes.get("mockmusicmaster.scope").results
+                break;
+            case "mockvideosmaster.scope":
+                videosFilter.model = dashContent.scopes.get("mockvideosmaster.scope").results
                 break;
         }
     }
@@ -140,14 +122,10 @@
         }
     }
 
-    Component { id: peopleCarousel; PeopleCarousel {}   }
-    Component { id: peopleGrid;     PeopleFilterGrid {} }
     Component { id: musicGrid;      MusicFilterGrid {}  }
     Component { id: videosGrid;     VideosFilterGrid {} }
     property var componentModels: {
                 "AppsGrid": applicationsFilterGrid,
-                "PeopleCarousel": peopleCarousel,
-                "PeopleGrid": peopleGrid,
                 "MusicGrid": musicGrid,
                 "VideosGrid": videosGrid,
     }
@@ -171,7 +149,7 @@
                 onLoaded: {
                     item.model = categoryModels[modelName]
 
-                    //FIXME: workaround for lack of previews for videos in Home lens.
+                    //FIXME: workaround for lack of previews for videos in Home scope.
                     //Need to connect to the clicked() signal here and act upon it here instead.
                     if (component === "VideosGrid") {
                         function playVideo(index, data) {

=== modified file 'Dash/DashMusic.qml'
--- Dash/DashMusic.qml	2013-06-08 13:44:29 +0000
+++ Dash/DashMusic.qml	2013-06-19 20:05:35 +0000
@@ -20,8 +20,8 @@
 import "../Components/ListItems" as ListItems
 import "Music"
 
-LensView {
-    id: lensView
+ScopeView {
+    id: scopeView
 
     property var categoryNames: [
         i18n.tr("Featured"),
@@ -37,7 +37,7 @@
     onMovementStarted: categoryView.showHeader()
 
     Binding {
-        target: lensView.lens
+        target: scopeView.scope
         property: "searchQuery"
         value: pageHeader.searchQuery
     }
@@ -59,7 +59,7 @@
 
     function getRenderer(categoryId) {
         switch (categoryId) {
-            case 0: return musicCarousel
+            case 1: return musicCarousel
             default: return musicFilterGrid
         }
     }
@@ -67,7 +67,7 @@
     ListViewWithPageHeader {
         id: categoryView
         anchors.fill: parent
-        model: lensView.categories
+        model: scopeView.categories
 
         onAtYEndChanged: if (atYEnd) endReached()
         onMovingChanged: if (moving && atYEnd) endReached()
@@ -80,7 +80,7 @@
 
             Loader {
                 anchors { top: parent.top; left: parent.left; right: parent.right }
-                sourceComponent: lensView.getRenderer(base.categoryId)
+                sourceComponent: scopeView.getRenderer(base.categoryId)
                 onLoaded: {
                     item.model = results
                 }
@@ -98,7 +98,7 @@
             width: categoryView.width
             text: i18n.tr("Music")
             searchEntryEnabled: true
-            searchHistory: lensView.searchHistory
+            searchHistory: scopeView.searchHistory
         }
     }
 }

=== removed file 'Dash/DashPeople.qml'
--- Dash/DashPeople.qml	2013-06-08 13:44:29 +0000
+++ Dash/DashPeople.qml	1970-01-01 00:00:00 +0000
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Dee 3.0
-import Unity 0.1
-import Utils 0.1
-import "../Components"
-import "../Components/ListItems" as ListItems
-import "People"
-
-LensView {
-    id: lensView
-    property alias previewShown: previewLoader.onScreen
-
-    property var categoryNames: [
-        i18n.tr("Favourites"),
-        i18n.tr("Recently in touch"),
-        i18n.tr("New Contacts"),
-        i18n.tr("A-Z")
-    ]
-
-    onIsCurrentChanged: {
-        pageHeader.resetSearch();
-    }
-
-    onMovementStarted: categoryView.showHeader()
-
-    Binding {
-        target: lensView.lens
-        property: "searchQuery"
-        value: pageHeader.searchQuery
-    }
-
-    Connections {
-        target: panel
-        onSearchClicked: if (isCurrent) {
-            pageHeader.triggerSearch()
-            categoryView.showHeader()
-        }
-    }
-
-    OpenEffect {
-        id: effect
-        anchors {
-            fill: parent
-            bottomMargin: -bottomOverflow
-        }
-        sourceItem: categoryView
-
-        enabled: gap > 0.0
-
-        topGapPx: (1 - gap) * positionPx
-        topOpacity: (1 - gap * 1.2)
-        bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
-        bottomOverflow: units.gu(20)
-        bottomOpacity: 1 - (gap * 0.8)
-
-        property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
-        property real gap: previewLoader.open ? 1.0 : 0.0
-
-        Behavior on gap {
-            NumberAnimation {
-                duration: 200
-                easing.type: Easing.InOutQuad
-                onRunningChanged: {
-                    if (!previewLoader.open && !running) {
-                        previewLoader.onScreen = false;
-                    }
-                }
-            }
-        }
-    }
-
-    ListViewWithPageHeader {
-        id: categoryView
-        anchors.fill: parent
-        model: lensView.categories
-        onAtYEndChanged: if (atYEnd) endReached()
-        onMovingChanged: if (moving && atYEnd) endReached()
-        clipListView: !previewLoader.onScreen
-
-        delegate: ListItems.Base {
-            id: base
-            property int categoryIndex: index
-            property int categoryId: id
-            highlightWhenPressed: false
-
-            Loader {
-                width: categoryView.width
-                sourceComponent: base.categoryId == 0 ? peopleCarouselComponent : peopleGridComponent
-
-                onLoaded: {
-                    item.categoryId = Qt.binding(function() { return base.categoryId; })
-                    item.categoryIndex = Qt.binding(function() { return base.categoryIndex; })
-                    item.model = results;
-                }
-            }
-        }
-
-        sectionProperty: "name"
-        sectionDelegate: ListItems.Header {
-            width: categoryView.width
-            text: i18n.tr(section)
-        }
-        pageHeader: PageHeader {
-            id: pageHeader
-            width: categoryView.width
-            text: i18n.tr("People")
-            searchEntryEnabled: true
-            searchHistory: lensView.searchHistory
-        }
-    }
-
-    Component {
-        id: peopleCarouselComponent
-        PeopleCarousel {
-            id: peopleCarousel
-
-            property int categoryId
-            property int categoryIndex
-
-            onClicked: {
-                effect.positionPx = mapToItem(categoryView, 0, itemY).y;
-                previewData.model = delegateItem.dataModel;
-                previewData.uri = delegateItem.dataModel.uri;
-                previewLoader.open = true;
-            }
-        }
-    }
-
-    Component {
-        id: peopleGridComponent
-        PeopleFilterGrid {
-            id: peopleGrid
-
-            property int categoryIndex
-
-            onClicked: {
-                if (peopleGrid.columnCount == 1) {
-                    if (categoryIndex >= categoryView.model.count -1 && index >= peopleGrid.model.count - 1) {
-                        effect.positionPx = mapToItem(categoryView, 0, itemY).y;
-                    } else {
-                        effect.positionPx = mapToItem(categoryView, 0, itemY + peopleGrid.cellHeight).y
-                    }
-                } else {
-                    effect.positionPx = mapToItem(categoryView, 0, itemY).y
-                }
-                previewData.model = data;
-                previewData.uri = data.uri
-                previewLoader.open = true;
-            }
-        }
-    }
-
-    Loader {
-        id: previewLoader
-        height: effect.bottomGapPx - effect.topGapPx
-        anchors {
-            top: parent.top
-            topMargin: effect.topGapPx
-            left: parent.left
-            right: parent.right
-        }
-        sourceComponent: onScreen ? previewComponent : undefined
-
-        property bool open: false
-        property bool onScreen: false
-        property QtObject videoItem
-
-        onOpenChanged: {
-            if (open) {
-                onScreen = true
-            }
-        }
-
-        onLoaded: {
-            if (previewData.ready) {
-                item.model = previewData;
-            }
-        }
-    }
-
-    Component {
-        id: previewComponent
-
-        PeoplePreview {
-            id: preview
-            anchors.fill: parent
-            forceSquare: true
-            onClose: {
-                open = false;
-            }
-        }
-    }
-
-    PeoplePreviewData {
-        id: previewData
-        lens: lensView.lens
-        property Data model
-
-        onError: previewLoader.open = false
-        onReadyChanged: {
-            if (previewLoader.item) {
-                previewLoader.item.model = ready ? previewData : undefined
-            }
-        }
-    }
-
-    // TODO: Move as InverseMouseArea to DashPreview
-    MouseArea {
-        enabled: previewLoader.onScreen
-        anchors {
-            fill: parent
-            topMargin: effect.bottomGapPx
-        }
-        onClicked: {
-            previewLoader.open = false;
-        }
-    }
-}

=== modified file 'Dash/DashVideos.qml'
--- Dash/DashVideos.qml	2013-06-08 13:44:29 +0000
+++ Dash/DashVideos.qml	2013-06-19 20:05:35 +0000
@@ -20,8 +20,8 @@
 import "../Components/ListItems" as ListItems
 import "Video"
 
-LensView {
-    id: lensView
+ScopeView {
+    id: scopeView
     property alias previewShown: previewLoader.onScreen
 
     property var categoryNames: [
@@ -38,7 +38,7 @@
     onMovementStarted: categoryView.showHeader()
 
     Binding {
-        target: lensView.lens
+        target: scopeView.scope
         property: "searchQuery"
         value: pageHeader.searchQuery
     }
@@ -60,7 +60,7 @@
 
     function getRenderer(categoryId) {
         switch (categoryId) {
-            case 0: return videosCarousel
+            case 1: return videosCarousel
             default: return videosFilterGrid
         }
     }
@@ -100,7 +100,7 @@
     ListViewWithPageHeader {
         id: categoryView
         anchors.fill: parent
-        model: lensView.categories
+        model: scopeView.categories
         clipListView: !previewLoader.onScreen
 
         onAtYEndChanged: if (atYEnd) endReached()
@@ -115,7 +115,7 @@
             Loader {
                 id: loader
                 anchors { top: parent.top; left: parent.left; right: parent.right }
-                sourceComponent: lensView.getRenderer(base.categoryId)
+                sourceComponent: scopeView.getRenderer(base.categoryId)
                 onLoaded: {
                     item.model = results
                 }
@@ -127,9 +127,9 @@
                         var dataItem;
                         // VideosCarousel and VideosFilterGrid have different
                         // clicked signals, accomodate for that
-                        if (categoryId == 0) {
+                        if (categoryId == 1) {
                             var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
-                            dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_5}
+                            dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_6}
                         } else {
                             dataItem = data;
                         }
@@ -154,7 +154,7 @@
             width: categoryView.width
             text: i18n.tr("Videos")
             searchEntryEnabled: true
-            searchHistory: lensView.searchHistory
+            searchHistory: scopeView.searchHistory
         }
     }
 

=== renamed file 'Dash/GenericLensView.qml' => 'Dash/GenericScopeView.qml'
--- Dash/GenericLensView.qml	2013-06-05 22:03:08 +0000
+++ Dash/GenericScopeView.qml	2013-06-19 20:05:35 +0000
@@ -18,9 +18,10 @@
 import Ubuntu.Components 0.1
 import "../Components"
 import "../Components/ListItems" as ListItems
+import "../Components/IconUtil.js" as IconUtil
 
-LensView {
-    id: lensView
+ScopeView {
+    id: scopeView
 
     onIsCurrentChanged: {
         pageHeader.resetSearch();
@@ -29,7 +30,7 @@
     onMovementStarted: categoryView.showHeader()
 
     Binding {
-        target: lensView.lens
+        target: scopeView.scope
         property: "searchQuery"
         value: pageHeader.searchQuery
     }
@@ -45,7 +46,7 @@
     ListViewWithPageHeader {
         id: categoryView
         anchors.fill: parent
-        model: lensView.categories
+        model: scopeView.categories
         onAtYEndChanged: if (atYEnd) endReached()
         onMovingChanged: if (moving && atYEnd) endReached()
 
@@ -71,10 +72,10 @@
                 delegate: Tile {
                     width: filtergrid.cellWidth
                     height: filtergrid.cellHeight
-                    text: column_4 ? column_4 : "" // FIXME: this shouldn't be necessary
+                    text: column_5 ? column_5 : "" // FIXME: this shouldn't be necessary
                     imageWidth: units.gu(11)
                     imageHeight: units.gu(16)
-                    source: column_1 ? column_1 : "" // FIXME: ditto
+                    source: column_1 ? IconUtil.from_gicon(column_1) : "" // FIXME: ditto
                 }
             }
         }
@@ -88,7 +89,7 @@
             id: pageHeader
             objectName: "pageHeader"
             width: categoryView.width
-            text: lensView.lens.name
+            text: scopeView.scope.name
             searchEntryEnabled: true
         }
     }

=== modified file 'Dash/Music/MusicFilterGrid.qml'
--- Dash/Music/MusicFilterGrid.qml	2013-06-05 22:03:08 +0000
+++ Dash/Music/MusicFilterGrid.qml	2013-06-19 20:05:35 +0000
@@ -38,8 +38,8 @@
         height: filterGrid.cellHeight
         iconWidth: filterGrid.iconWidth
         iconHeight: filterGrid.iconHeight
-        artist: model.column_4
-        album: model.column_5
+        artist: model.column_5
+        album: model.column_6
         source: model.column_1
         onClicked: {
             filterGrid.clicked(index);

=== removed directory 'Dash/People'
=== removed file 'Dash/People/CarouselDelegatePeople.qml'
--- Dash/People/CarouselDelegatePeople.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/CarouselDelegatePeople.qml	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../Components"
-
-BaseCarouselDelegate {
-    id: item
-
-    property var dataModel
-    readonly property real frameHeight: Math.max(height / 3.6, units.gu(5.5))
-
-    UbuntuShape {
-        anchors.fill: parent
-        radius: "medium"
-        borderSource: ""
-        image: Image {
-            asynchronous: true
-            sourceSize { width: item.width; height: item.height }
-            source: dataModel.avatar ? dataModel.avatar : ""
-            fillMode: Image.PreserveAspectCrop
-        }
-    }
-
-    Component {
-        id: component_frame
-        Item {
-            id: frame
-
-            BorderImage {
-                // TODO This will go away once we have 'clip: true' in UbuntuShape
-                anchors.centerIn: parent
-                width: parent.width + units.gu(1.5)
-                height: parent.height + units.gu(1.5)
-                visible: labelRemotePost.visible
-                opacity: 0.9
-                source: "graphics/bottomshape.sci"
-            }
-
-            property bool showRemoteDetails: true
-            // To decide if the remote icon and time should be shown, its once layed out to do so.
-            // Then it's checked if everything fits in the frame size. If not, showRemoteDetails is set false
-            // Using bindings to do so cause a binding loop
-            function checkSizeForRemoteDetails() {
-                showRemoteDetails = true
-                showRemoteDetails = (frame.height - column.minimumHeight) >= labelRemotePostTime.height
-            }
-
-            Item {
-                id: remoteSourceIconContainer
-
-                // TODO use proper asset and get rid of these dimensions
-                width: units.gu(3)
-                height: units.gu(4)
-                visible: showRemoteDetails
-
-                Image {
-                    anchors.centerIn: parent
-                    anchors.horizontalCenterOffset: units.gu(1)
-                    source: dataModel.remoteSourceIcon ? dataModel.remoteSourceIcon : ""
-                    fillMode: Image.PreserveAspectFit
-                }
-            }
-
-            Column {
-                id: column
-
-                property real minimumHeight: labelName.height + labelRemotePost.height + anchors.topMargin + anchors.bottomMargin
-
-                anchors {
-                    left: remoteSourceIconContainer.visible ? remoteSourceIconContainer.right : parent.left
-                    right: parent.right
-                    top: remoteSourceIconContainer.visible ? parent.top : undefined
-                    verticalCenter: remoteSourceIconContainer.visible ? undefined : parent.verticalCenter
-                    margins: units.gu(1)
-                }
-
-                Label {
-                    id: labelName
-
-                    width: parent.width
-                    text: dataModel.name ? dataModel.name : ""
-                    color: "white"
-                    fontSize: "x-small"
-                    elide: Text.ElideRight
-                    font.weight: Font.Bold
-                    onTextChanged: checkSizeForRemoteDetails()
-                }
-
-                Label {
-                    id: labelRemotePost
-
-                    width: parent.width
-                    text: dataModel.remotePost ? dataModel.remotePost : ""
-                    color: "white"
-                    opacity: 0.8
-                    fontSize: "xx-small"
-                    elide: Text.ElideRight
-                    maximumLineCount: 2
-                    wrapMode: Text.WordWrap
-                    onTextChanged: checkSizeForRemoteDetails()
-                }
-
-                Label {
-                    id: labelRemotePostTime
-
-                    width: parent.width
-                    text: model.remotePostTime ? model.remotePostTime : ""
-                    color: "white"
-                    opacity: 0.5
-                    fontSize: "xx-small"
-                    elide: Text.ElideRight
-                    visible: showRemoteDetails
-                    onTextChanged: checkSizeForRemoteDetails()
-                }
-            }
-
-            onHeightChanged: checkSizeForRemoteDetails()
-            onWidthChanged: checkSizeForRemoteDetails()
-            Component.onCompleted: checkSizeForRemoteDetails()
-        }
-    }
-
-    Loader {
-        id: loader_frame
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: item.frameHeight
-        opacity: item.explicitlyScaled ? 1.0 : 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 250
-                easing.type: Easing.InOutQuad
-            }
-        }
-
-        sourceComponent: opacity > 0 ? component_frame : undefined
-    }
-
-    BorderImage {
-        anchors.centerIn: parent
-        opacity: 0.6
-        source: "../../Components/graphics/non-selected.sci"
-        width: parent.width + units.gu(1.5)
-        height: parent.height + units.gu(1.5)
-    }
-}

=== removed file 'Dash/People/Data.qml'
--- Dash/People/Data.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Data.qml	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Dee 3.0
-
-DeeVariantText {
-    property string uri
-    property string name
-    property url avatar
-    property var emails: ListModel {}
-    property var phones: ListModel {}
-    property string presenceStatus
-    property string presenceMessage
-    property url remoteSourceIcon
-    property string remotePost
-    property bool favorite
-    property bool recent
-    property url statusIcon
-    property string status: remotePost ? remotePost : presenceMessage
-    property url recentIcon
-    property string recentTime
-
-    statusIcon: switch(presenceStatus) {
-        case "offline": "graphics/icon_offline.png"; break
-        // FIXME random for now, as we don't get actual presence data on the phone
-        case "":
-            var r = Math.random();
-            if (r >= 0.7) "graphics/icon_online.png"
-            else if (r >= 0.4) "graphics/icon_offline.png"
-            else "graphics/icon_unknown.png"
-            break;
-        default: "graphics/icon_online.png"
-    }
-
-    onValueChanged: {
-        for (var i in value) switch (value[i][0]) {
-            case "presence-message": presenceMessage = value[i][1]; break
-            case "presence-status": presenceStatus = value[i][1]; break
-            case "remote-source-icon": remoteSourceIcon = value[i][1]; break
-            case "remote-post": remotePost = value[i][1]; break
-            case "recent-icon": recentIcon = value[i][1]; break
-            case "recent-time": recentTime = value[i][1]; break
-            case "phone": phones.append({"type": generateType(), "number": value[i][1]}); break
-            case "email": emails.append({"type": generateType(), "address": value[i][1]}); break
-        }
-    }
-
-    // FIXME: random for now, as we don't have multiple phone numbers in the backend yet
-    function generateType() {
-        var phoneType = "";
-        var r = Math.random();
-        if (r >= 0.7) phoneType = "Private";
-        else if (r >= 0.4) phoneType = "Mobile";
-        else phoneType = "Work";
-        return phoneType;
-    }
-}

=== removed file 'Dash/People/Delegate.qml'
--- Dash/People/Delegate.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Delegate.qml	1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../Components"
-import "../../Components/Time.js" as Time
-
-Item {
-    id: peopleView
-
-    property var dataModel
-
-    property int __spacing: units.gu(1)
-
-    /* Select what is shown in the subtitle
-       data: phone number or email address
-       status: social media presence status
-    */
-    property string subtitleType: "data"
-    height: subtitleType == "data" && detailsLabel.lineCount < 2 ? units.gu(10) : units.gu(11.5)
-
-    Row {
-        id: row
-        anchors {
-            left: parent.left
-            right: parent.right
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(4)
-            top: parent.top
-            topMargin: units.gu(2)
-        }
-        spacing: __spacing
-
-        UbuntuShape {
-            id: avatar
-            anchors { top: parent.top }
-            width: units.gu(6)
-            height: units.gu(6)
-            image: Image {
-                width: units.gu(6)
-                source: peopleView.dataModel.avatar
-                sourceSize { width: avatar.width; height: avatar.height }
-                fillMode: Image.PreserveAspectCrop
-                smooth: true
-                asynchronous: true
-                cache: false
-            }
-        }
-
-        Grid {
-            spacing: units.gu(0.5)
-            width: parent.width - x
-            columns: 2
-
-            Item {
-                height: units.gu(2)
-                width: units.gu(2)
-
-                Image {
-                    id: statusImage
-                    source: peopleView.dataModel.statusIcon
-                    width: units.gu(1.5)
-                    height: units.gu(1.5)
-                    fillMode: Image.PreserveAspectFit
-                    smooth: true
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-
-            Label {
-                id: nameLabel
-                elide: Text.ElideRight
-                text: peopleView.dataModel.name
-                color: "#f3f3e7"
-                style: Text.Raised
-                styleColor: "black"
-                font.weight: Font.DemiBold;
-                opacity: 0.9;
-            }
-
-            Image {
-                source: switch(peopleView.subtitleType) {
-                        case "data":
-                            return peopleView.dataModel.remoteSourceIcon;
-                        case "status":
-                            return peopleView.dataModel.recent ? peopleView.dataModel.recentIcon : "";
-                        }
-
-                width: units.gu(1.5)
-                height: units.gu(1.5)
-                fillMode: Image.PreserveAspectFit
-                smooth: true
-            }
-
-            Label {
-                id: detailsLabel
-                width: parent.width - x
-                elide: Text.ElideRight
-                text: switch (peopleView.subtitleType) {
-                    case "data":
-                        if (peopleView.dataModel.phones && peopleView.dataModel.phones.count > 0) {
-                            return peopleView.dataModel.phones.get(0).number;
-                        } else if (peopleView.dataModel.emails && peopleView.dataModel.emails.count > 0) {
-                            return peopleView.dataModel.emails.get(0).address;
-                        }
-                        return "";
-                    case "status":
-                        return peopleView.dataModel.status;
-                     }
-                color: "#f3f3e7"
-                style: Text.Raised
-                styleColor: "black"
-                opacity: 0.7;
-                fontSize: "small";
-                wrapMode: Text.WordWrap;
-                maximumLineCount: 2;
-            }
-
-            Item {
-                height: units.gu(2)
-                width: units.gu(1.5)
-
-                // Placeholder
-            }
-
-            Label {
-                width: parent.width - x
-                elide: Text.ElideRight
-                text: switch (peopleView.subtitleType) {
-                      case "data":
-                          if (peopleView.dataModel.phones && peopleView.dataModel.phones.count > 0) {
-                              return peopleView.dataModel.phones.get(0).type;
-                          } else if (peopleView.dataModel.emails && peopleView.dataModel.emails.count > 0) {
-                              return peopleView.dataModel.emails.get(0).type;
-                          }
-                          return "";
-                      case "status":
-                          if (peopleView.dataModel.recent) {
-                              var time = Time.readableFromNow(peopleView.dataModel.recentTime);
-                              return time ? time : peopleView.dataModel.recentTime;
-                          } else {
-                              return peopleView.dataModel.status
-                          }
-                      }
-                color: "#8f8f88"
-                style: Text.Raised
-                styleColor: "black"
-                opacity: 0.7;
-                fontSize: "x-small";
-            }
-        }
-    }
-}

=== removed file 'Dash/People/PeopleCarousel.qml'
--- Dash/People/PeopleCarousel.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/PeopleCarousel.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import "../../Components"
-
-Carousel {
-    id: peopleCarousel
-    tileAspectRatio: 1
-    minimumTileWidth: units.gu(13)
-    itemComponent: carouselDelegatePeople
-    selectedItemScaleFactor: 1.2
-    cacheBuffer: 1404 // 18px * 13gu * 6
-    height: implicitHeight + units.gu(6)
-
-    Component {
-        id: carouselDelegatePeople
-        CarouselDelegatePeople {
-            dataModel: data
-
-            Data {
-                id: data
-                uri: model.column_0
-                text: model.column_5
-                name: model.column_4
-                avatar: model.column_1
-            }
-        }
-    }
-}

=== removed file 'Dash/People/PeopleFilterGrid.qml'
--- Dash/People/PeopleFilterGrid.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/PeopleFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import "../../Components"
-import "../../Components/ListItems" as ListItems
-
-FilterGrid {
-    id: filterGrid
-
-    filter: true
-    minimumHorizontalSpacing: 0
-    delegateWidth: units.gu(40)
-    delegateHeight: showStatusMessage ? units.gu(11.5) : units.gu(10)
-    verticalSpacing: 0
-    collapsedRowCount: 50 / columns
-    expandable: false
-
-    property int categoryId
-    property bool showStatusMessage: categoryId == 1 || categoryId == 2
-
-    readonly property int columnCount: width / cellWidth
-
-    signal clicked(int index, variant data, real itemY)
-
-    delegate: ListItems.Base {
-        id: tile
-        objectName: "delegate" + index
-        width: filterGrid.cellWidth
-        showDivider: index < Math.floor((filterGrid.model.count-1) / filterGrid.columnCount) * filterGrid.columnCount
-
-        onClicked: {
-            filterGrid.clicked(index, data, tile.y);
-        }
-
-        Delegate {
-            width: filterGrid.cellWidth
-            height: filterGrid.cellHeight
-            // This caches the Delegate into FBO because:
-            // - People data Delegates are slow because of their item count
-            // - FilterGrid is "height: childrenRect.height" so all delegates are always loaded
-            // TODO: Optimize this by:
-            // - not loading all delegates all the time and remove layer.enabled and/or
-            // - destroy whole lens when not visible/needed to free the GPU memory
-            layer.enabled: true
-
-            dataModel: data
-            subtitleType: filterGrid.showStatusMessage ? "status" : "data"
-
-            Data {
-                id: data
-                uri: column_0
-                text: column_5
-                name: column_4
-                avatar: column_1
-                favorite: filterGrid.categoryId == 0
-                recent: filterGrid.showStatusMessage
-            }
-        }
-    }
-}

=== removed file 'Dash/People/PeoplePreview.qml'
--- Dash/People/PeoplePreview.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/PeoplePreview.qml	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../Components"
-import "../../Components/ListItems" as ListItems
-import ".."
-import "Preview"
-
-DashPreview {
-    id: preview
-
-    property var model: undefined
-
-    title: (model && model.displayName) ? model.displayName : ""
-    url: (model && model.avatar) ? model.avatar : ""
-    previewWidthRatio: 0.34
-
-
-    description: Grid {
-        spacing: columns > 1 ? units.gu(2) : 0
-        columns: preview.narrowMode || width < units.gu(60) ? 1 : 2
-        property int columnWidth: columns > 1 ? (width - spacing * (columns - 1)) / columns : width
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        Status {
-            id: status
-            objectName: "statusField"
-            width: parent.columnWidth
-            visible: preview.model != undefined && preview.model.status != undefined
-            model: preview.model
-            property int index: 1
-            // FIXME that should trigger the action on the lens/scope, when there's support
-            onClicked: shell.activateApplication("/usr/share/applications/%1-webapp.desktop".arg(model.statusService), "--homepage=%1".arg(model.statusPostUri))
-        }
-
-
-        Column {
-            id: descriptionColumn
-            width: parent.columnWidth
-
-
-            Column {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Repeater {
-                    model: preview.model ? preview.model.phoneNumbers : undefined
-
-                    delegate: Phone {
-                        objectName: "phoneField" + index
-                        model: preview.model
-                        // FIXME these should trigger actions on the lens/scope, when there's support
-                        onPhoneClicked: shell.activateApplication("/usr/share/applications/phone-app.desktop", "call://%1".arg(number.replace(/[^\d\+]/g, "")))
-                        onTextClicked: shell.activateApplication("/usr/share/applications/phone-app.desktop", "message://%1".arg(number.replace(/[^\d\+]/g, "")))
-                    }
-                }
-            }
-
-            Column {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Repeater {
-                    model: preview.model ? preview.model.emailAddresses : undefined
-                    delegate: Generic {
-                        objectName: "emailField" + index
-                        type: "email"
-                    }
-                }
-            }
-
-            Column {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Repeater {
-                    model: preview.model ? preview.model.imAccounts : undefined
-                    delegate: Generic {
-                        objectName: "imField" + index
-                        type: "imAccount"
-                    }
-                }
-            }
-
-            Column {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Repeater {
-                    model: preview.model ? preview.model.addresses : undefined
-                    delegate: Address {
-                        objectName: "addressField" + index
-                    }
-                }
-            }
-        }
-    }
-}

=== removed directory 'Dash/People/Preview'
=== removed file 'Dash/People/Preview/Address.qml'
--- Dash/People/Preview/Address.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Preview/Address.qml	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Base {
-    id: root
-
-    Item {
-        anchors {
-            left: parent.left
-            right: parent.right
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(4)
-        }
-        height: childrenRect.height + units.gu(2.5)
-
-        Label {
-            id: typeLabel
-            anchors {
-                top: parent.top
-                topMargin: units.gu(1)
-            }
-            text: type
-            elide: Text.ElideRight
-            color: "#f3f3e7"
-            style: Text.Raised
-            styleColor: "black"
-            font.capitalization: Font.Capitalize
-            opacity: 0.7;
-            fontSize: "small"
-        }
-
-        Label {
-            id: contentLabel
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: typeLabel.bottom
-                topMargin: units.gu(0.5)
-            }
-            text: {
-                var fields = [street, poBox, extension, locality, region, postalCode, country, addressFormat]
-                var parts = []
-                for (var k in fields) {
-                    if (fields[k]) parts.push(fields[k])
-                }
-                return parts.join("\n")
-            }
-            elide: Text.ElideRight
-            color: "#f3f3e7"
-            style: Text.Raised
-            styleColor: "black"
-            opacity: 0.9;
-            fontSize: "large"
-            wrapMode: Text.WordWrap
-            font.weight: Font.Light
-        }
-    }
-}

=== removed file 'Dash/People/Preview/Base.qml'
--- Dash/People/Preview/Base.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Preview/Base.qml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import "../../../Components/ListItems"
-
-Base {
-    property var model
-}

=== removed file 'Dash/People/Preview/Generic.qml'
--- Dash/People/Preview/Generic.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Preview/Generic.qml	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Base {
-    id: root
-
-    property string type
-
-    Item {
-        anchors {
-            left: parent.left
-            right: parent.right
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(4)
-        }
-        height: childrenRect.height + units.gu(2.5)
-
-        Label {
-            id: typeLabel
-            anchors {
-                top: parent.top
-                topMargin: units.gu(1)
-            }
-            text: switch (root.type) {
-                case "email":
-                case "address": type; break
-                case "imAccount": protocol; break
-                default: type
-            }
-            elide: Text.ElideRight
-            color: "#f3f3e7"
-            style: Text.Raised
-            styleColor: "black"
-            font.capitalization: Font.Capitalize
-            opacity: 0.7;
-            fontSize: "small"
-        }
-
-        Label {
-            id: contentLabel
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: typeLabel.bottom
-                topMargin: units.gu(0.5)
-            }
-            text: switch (root.type) {
-                case "email":
-                case "address":
-                case "imAccount": address; break
-                default: text
-            }
-            elide: Text.ElideRight
-            color: "#f3f3e7"
-            style: Text.Raised
-            styleColor: "black"
-            opacity: 0.9;
-            fontSize: "large"
-            wrapMode: Text.WordWrap
-            maximumLineCount: 2
-            font.weight: Font.Light
-        }
-    }
-}

=== removed file 'Dash/People/Preview/Phone.qml'
--- Dash/People/Preview/Phone.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Preview/Phone.qml	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../../Components/ListItems" as ListItems
-
-Base {
-    id: root
-    highlightWhenPressed: false
-
-    signal phoneClicked
-    signal textClicked
-
-    Row {
-        height: phoneButton.height
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        AbstractButton {
-            id: phoneButton
-            width: parent.width - units.gu(7)
-            height: Math.max(units.gu(8), phoneColumn.height + units.gu(2))
-            Column {
-                id: phoneColumn
-                spacing: units.gu(0.5)
-                anchors {
-                    top: parent.top
-                    topMargin: units.gu(1)
-                    left: parent.left
-                    leftMargin: units.gu(2)
-                    right: parent.right
-                }
-                Label {
-                    text: {
-                    var parts = []
-                        if (location) parts.push(location)
-                        if (type && type != "voice") parts.push(type)
-                        if (parts.length == 0) return "other"
-                        return parts.join(" ")
-                    }
-                    elide: Text.ElideRight
-                    color: "#f3f3e7"
-                    style: Text.Raised
-                    styleColor: "black"
-                    font.capitalization: Font.Capitalize
-                    opacity: 0.7;
-                    fontSize: "small"
-                }
-                Label {
-                    width: parent.width
-                    text: number
-                    elide: Text.ElideRight
-                    color: "#f3f3e7"
-                    style: Text.Raised
-                    styleColor: "black"
-                    opacity: 0.9;
-                    fontSize: "large"
-                    wrapMode: Text.WordWrap
-                    maximumLineCount: 2
-                    font.weight: Font.Light
-                }
-            }
-
-            ListItems.Highlight {
-                anchors.fill: parent
-                pressed: phoneButton.pressed
-            }
-
-            onClicked: phoneClicked()
-        }
-
-        AbstractButton {
-            id: textButton
-            width: units.gu(7)
-            height: parent.height
-
-            Image {
-                anchors.centerIn: parent
-                width: units.gu(4)
-                height: units.gu(4)
-                source: "../graphics/icon_write_text.png"
-                fillMode: Image.PreserveAspectFit
-            }
-
-            ListItems.Highlight {
-                anchors.fill: parent
-                pressed: textButton.pressed
-            }
-
-            onClicked: textClicked()
-        }
-    }
-}

=== removed file 'Dash/People/Preview/Status.qml'
--- Dash/People/Preview/Status.qml	2013-06-05 22:03:08 +0000
+++ Dash/People/Preview/Status.qml	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../../Components/Time.js" as Time
-
-Base {
-    id: root
-
-    Item {
-        anchors {
-            left: parent.left
-            right: parent.right
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(4)
-        }
-        height: childrenRect.height
-
-        Label {
-            id: typeLabel
-            anchors {
-                top: parent.top
-                topMargin: units.gu(1)
-            }
-            text: "Status"
-            elide: Text.ElideRight
-            color: "#f3f3e7"
-            style: Text.Raised
-            styleColor: "black"
-            font.capitalization: Font.Capitalize
-            opacity: 0.7;
-            fontSize: "small"
-        }
-
-        Label {
-            id: contentLabel
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: typeLabel.bottom
-                topMargin: units.gu(0.5)
-            }
-            text: root.model ? root.model.status : ""
-            elide: Text.ElideRight
-            color: "#f3f3e7"
-            style: Text.Raised
-            styleColor: "black"
-            opacity: 0.9;
-            fontSize: "large"
-            wrapMode: Text.WordWrap
-            maximumLineCount: 6
-            font.weight: Font.Light
-        }
-
-        Row {
-            anchors {
-                top: contentLabel.bottom
-                topMargin: units.gu(1)
-            }
-            height: statusText.height + units.gu(2.5)
-            spacing: units.gu(1)
-            Image {
-                width: units.gu(2)
-                height: units.gu(2)
-                fillMode: Image.PreserveAspectFit
-                source: root.model ? root.model.statusServiceIcon : ""
-            }
-            Label {
-                id: statusText
-                text: if (root.model) {
-                    var time = Time.readableFromNow(root.model.statusTime);
-                    return time ? time : root.model.statusTime;
-                } else return "";
-                elide: Text.ElideRight
-                color: "#f3f3e7"
-                style: Text.Raised
-                styleColor: "black"
-                opacity: 0.7;
-                fontSize: "small"
-            }
-        }
-    }
-}

=== removed directory 'Dash/People/graphics'
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
--- Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000
+++ Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-border.left: 54
-border.top: 60
-border.bottom: 60
-border.right: 54
-source: [e-mail]

=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/People/graphics/[e-mail]'
Binary files Dash/People/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/People/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== renamed file 'Dash/LensDelegateMapper.qml' => 'Dash/ScopeDelegateMapper.qml'
--- Dash/LensDelegateMapper.qml	2013-06-07 09:22:34 +0000
+++ Dash/ScopeDelegateMapper.qml	2013-06-19 20:05:35 +0000
@@ -17,19 +17,18 @@
 import QtQuick 2.0
 
 QtObject {
-    property var lensDelegateMapping: {"mockmusic.lens": "DashMusic.qml",
-                                       "applications.lens": "DashApps.qml",
-                                       "home.lens": "DashHome.qml",
-                                       "mockvideos.lens": "DashVideos.qml",
-                                       "people.lens": "DashPeople.qml",
+    property var scopeDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",
+                                       "applications.scope": "DashApps.qml",
+                                       "home.scope": "DashHome.qml",
+                                       "mockvideosmaster.scope": "DashVideos.qml"
                                       }
-    property string genericLens: "GenericLensView.qml"
+    property string genericScope: "GenericScopeView.qml"
 
-    function map(lensId) {
-        var customLens = lensDelegateMapping[lensId]
-        if (customLens != undefined) {
-            return customLens
+    function map(scopeId) {
+        var customScope = scopeDelegateMapping[scopeId]
+        if (customScope != undefined) {
+            return customScope
         }
-        return genericLens
+        return genericScope
     }
 }

=== renamed file 'Dash/LensView.qml' => 'Dash/ScopeView.qml'
--- Dash/LensView.qml	2013-06-05 22:03:08 +0000
+++ Dash/ScopeView.qml	2013-06-19 20:05:35 +0000
@@ -19,7 +19,7 @@
 import Unity 0.1
 
 FocusScope {
-    property Lens lens
+    property Scope scope
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent
     property ListModel searchHistory
@@ -29,17 +29,17 @@
     signal positionedAtBeginning
 
     // FIXME delay the search so that daemons have time to settle
-    onLensChanged: timer.restart()
+    onScopeChanged: timer.restart()
 
     Timer {
         id: timer
         interval: 2000
-        onTriggered: lens.searchQuery = ""
+        onTriggered: scope.searchQuery = ""
     }
 
     SortFilterProxyModel {
         id: categoryFilter
-        model: lens.categories
+        model: scope.categories
         dynamicSortFilter: true
         filterRole: Categories.RoleCount
         filterRegExp: /^0$/

=== modified file 'Dash/Video/VideosFilterGrid.qml'
--- Dash/Video/VideosFilterGrid.qml	2013-06-05 22:03:08 +0000
+++ Dash/Video/VideosFilterGrid.qml	2013-06-19 20:05:35 +0000
@@ -37,14 +37,14 @@
         objectName: "delegate" + index
         width: filtergrid.cellWidth
         height: filtergrid.cellHeight
-        text: model.column_4
+        text: model.column_5
         imageWidth: filtergrid.iconWidth
         imageHeight: filtergrid.iconHeight
         source: model.column_1
         fillMode: Image.PreserveAspectCrop
         onClicked: {
             var fileUri = model.column_0.replace(/^[^:]+:/, "")
-            var data = {fileUri: fileUri, nfoUri: model.column_5}
+            var data = {fileUri: fileUri, nfoUri: model.column_6}
             filtergrid.clicked(index, data, tile.y);
         }
     }

=== removed directory 'Dash/graphics/lensIcons'
=== removed file 'Dash/graphics/lensIcons/[e-mail]'
Binary files Dash/graphics/lensIcons/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/graphics/lensIcons/[e-mail]'
Binary files Dash/graphics/lensIcons/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/graphics/lensIcons/[e-mail]'
Binary files Dash/graphics/lensIcons/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/graphics/lensIcons/[e-mail]'
Binary files Dash/graphics/lensIcons/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dash/graphics/lensIcons/[e-mail]'
Binary files Dash/graphics/lensIcons/[e-mail]	2013-06-05 22:03:08 +0000 and Dash/graphics/lensIcons/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'Shell.qml'
--- Shell.qml	2013-06-19 18:10:57 +0000
+++ Shell.qml	2013-06-19 20:05:35 +0000
@@ -552,14 +552,14 @@
                 greeter.hide()
                 // Animate if moving between application and dash
                 if (!stages.shown) {
-                    dash.setCurrentLens("home.lens", true, false)
+                    dash.setCurrentScope("home.scope", true, false)
                 } else {
-                    dash.setCurrentLens("home.lens", false, false)
+                    dash.setCurrentScope("home.scope", false, false)
                 }
                 stages.hide();
             }
             onDash: {
-                dash.setCurrentLens("applications.lens", true, false)
+                dash.setCurrentScope("applications.scope", true, false)
                 stages.hide();
             }
             onLauncherApplicationSelected:{

=== modified file 'build_unity'
--- build_unity	2013-06-07 10:36:14 +0000
+++ build_unity	2013-06-19 20:05:35 +0000
@@ -6,11 +6,10 @@
 UPDATE=false
 CLEAN=false
 NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
-LENSES="applications mockmusic mockvideos"
 
 # verified working revisions
-LIBUNITY_REV=215
-UNITY_REV=3260
+LIBUNITY_REV=228
+UNITY_REV=3343
 HUD_REV=252
 
 usage() {
@@ -53,12 +52,12 @@
 
 branch_libunity() {
     echo "Branching libunity.."
-    bzr branch lp:libunity/phablet $TARGET_DIR/libunity || exit 8
+    bzr branch lp:libunity $TARGET_DIR/libunity || exit 8
 }
 
 branch_unity() {
     echo "Branching Unity.."
-    bzr branch lp:unity/phablet-mods $TARGET_DIR/unity || exit 9
+    bzr branch lp:unity $TARGET_DIR/unity || exit 9
 }
 
 branch_hud() {
@@ -92,7 +91,7 @@
     mkdir $TARGET_DIR/libunity/build
     cd $TARGET_DIR/libunity/build
 
-    ../autogen.sh --prefix $BUILD_DIR --disable-debug || exit 15
+    ../autogen.sh --prefix $BUILD_DIR --disable-debug --with-pygi-overrides-dir=$BUILD_DIR/gi-overrides || exit 15
 
     echo "Building libunity and installing in " $BUILD_DIR
     make -j$NUM_JOBS install || exit 16
@@ -136,14 +135,6 @@
 
 }
 
-link_lenses() {
-    echo "Linking system lenses.."
-    mkdir -p $BUILD_DIR/share/unity/lenses/
-    for LENS in $LENSES; do
-        [ -e $BUILD_DIR/share/unity/lenses/$LENS ] || ln -ivs /usr/share/unity/lenses/$LENS $BUILD_DIR/share/unity/lenses/$LENS
-    done
-}
-
 if $SETUP; then
     echo "Setting up environment for building Unity.."
     install_utils
@@ -163,6 +154,5 @@
     compile_libunity
     compile_unity_core
     compile_hud
-    link_lenses
 fi
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 22:03:08 +0000
+++ debian/changelog	2013-06-19 20:05:35 +0000
@@ -1,3 +1,9 @@
+unity8 (7.81.0) UNRELEASED; urgency=low
+
+  * New version with support for smart scopes.
+
+ -- Michał Sawicz <[e-mail]>  Fri, 14 Jun 2013 12:56:17 +0200
+
 unity8 (7.80.0) saucy; urgency=low
 
   * Rename to unity8.

=== modified file 'debian/control'
--- debian/control	2013-06-19 15:25:39 +0000
+++ debian/control	2013-06-19 20:05:35 +0000
@@ -11,7 +11,7 @@
                libgles2-mesa-dev[armhf],
                libhud-client2-dev,
                libpulse-dev,
-               libunity-core-6.0-dev,
+               libunity-core-6.0-dev (<< 7.80),
                libxcb1-dev,
                pkg-config,
                python3,
@@ -51,6 +51,8 @@
             indicators-client-plugin-network (>= 0.6.1),
             indicators-client-plugin-power (>= 0.6.1),
             indicators-client-plugin-sound (>= 0.6.1),
+            unity-scope-home,
+            unity-lens-applications,
 Description: Ubuntu QML shell
  The Ubuntu QML shell is the primary user interface for Ubuntu devices.
 

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ plugins/Unity/CMakeLists.txt	2013-06-19 20:05:35 +0000
@@ -13,11 +13,10 @@
 
 set(QMLPLUGIN_SRC
     ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
-    lens.cpp
-    lenses.cpp
+    scope.cpp
+    scopes.cpp
     categories.cpp
     categoryfilter.cpp
-    peoplepreviewdata.cpp
     plugin.cpp
     bottombarvisibilitycommunicatorshell.cpp
     launchermodel.cpp

=== modified file 'plugins/Unity/categories.cpp'
--- plugins/Unity/categories.cpp	2013-06-05 22:03:08 +0000
+++ plugins/Unity/categories.cpp	2013-06-19 20:05:35 +0000
@@ -24,7 +24,6 @@
 Categories::Categories(QObject* parent)
     : DeeListModel(parent)
     , m_resultModel(0)
-    , m_globalResultModel(0)
 {
     // FIXME: need to clean up unused filters on countChanged
     m_roles[Categories::RoleId] = "id";
@@ -33,9 +32,7 @@
     m_roles[Categories::RoleRenderer] = "renderer";
     m_roles[Categories::RoleHints] = "hints";
     m_roles[Categories::RoleResults] = "results";
-    m_roles[Categories::RoleGlobalResults] = "globalResults";
     m_roles[Categories::RoleCount] = "count";
-    m_roles[Categories::RoleGlobalCount] = "globalCount";
 
     // TODO This should not be needed but accumulatting the count changes
     // makes the visualization more stable and also makes crashes on fast
@@ -48,7 +45,6 @@
 Categories::~Categories()
 {
     qDeleteAll(m_filters);
-    qDeleteAll(m_globalFilters);
 }
 
 CategoryFilter*
@@ -66,21 +62,6 @@
     return m_filters[index];
 }
 
-CategoryFilter*
-Categories::getGlobalFilter(int index) const
-{
-    if (!m_globalFilters.contains(index)) {
-        CategoryFilter* filter = new CategoryFilter();
-        connect(filter, SIGNAL(countChanged()), this, SLOT(onGlobalCountChanged()));
-        filter->setModel(m_globalResultModel);
-        filter->setIndex(index);
-
-        m_globalFilters.insert(index, filter);
-    }
-
-    return m_globalFilters[index];
-}
-
 void
 Categories::setResultModel(DeeListModel* model)
 {
@@ -96,20 +77,6 @@
 }
 
 void
-Categories::setGlobalResultModel(DeeListModel* model)
-{
-    if (model != m_globalResultModel) {
-        m_globalResultModel = model;
-
-        Q_FOREACH(CategoryFilter* filter, m_globalFilters) {
-            filter->setModel(m_globalResultModel);
-        }
-
-        Q_EMIT globalResultModelChanged(m_globalResultModel);
-    }
-}
-
-void
 Categories::onCountChanged()
 {
     CategoryFilter* filter = qobject_cast<CategoryFilter*>(sender());
@@ -131,18 +98,6 @@
     m_timerFilters.clear();
 }
 
-void
-Categories::onGlobalCountChanged()
-{
-    CategoryFilter* filter = qobject_cast<CategoryFilter*>(sender());
-    if (filter) {
-        QModelIndex changedIndex = index(filter->index());
-        QVector<int> roles;
-        roles.append(Categories::RoleGlobalCount);
-        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
-    }
-}
-
 QHash<int, QByteArray>
 Categories::roleNames() const
 {
@@ -159,23 +114,18 @@
     if (role == RoleId) {
         return QVariant::fromValue(index.row());
     } else if (role == RoleName) {
-        return QVariant::fromValue(DeeListModel::data(index, 0));
+        return QVariant::fromValue(DeeListModel::data(index, 1)); //DISPLAY_NAME
     } else if (role == RoleIcon) {
-        return QVariant::fromValue(DeeListModel::data(index, 1));
+        return QVariant::fromValue(DeeListModel::data(index, 2)); //ICON_HINT
     } else if (role == RoleRenderer) {
-        return QVariant::fromValue(DeeListModel::data(index, 2));
+        return QVariant::fromValue(DeeListModel::data(index, 3)); //RENDERER_NAME
     } else if (role == RoleHints) {
-        return QVariant::fromValue(DeeListModel::data(index, 3));
+        return QVariant::fromValue(DeeListModel::data(index, 4)); //HINTS
     } else if (role == RoleResults) {
         return QVariant::fromValue(getFilter(index.row()));
-    } else if (role == RoleGlobalResults) {
-        return QVariant::fromValue(getGlobalFilter(index.row()));
     } else if (role == RoleCount) {
         CategoryFilter* filter = getFilter(index.row());
         return QVariant::fromValue(filter->rowCount());
-    } else if (role == RoleGlobalCount) {
-        QSortFilterProxyModel* filter = getGlobalFilter(index.row());
-        return QVariant::fromValue(filter->rowCount());
     } else {
         return QVariant();
     }

=== modified file 'plugins/Unity/categories.h'
--- plugins/Unity/categories.h	2013-06-05 22:03:08 +0000
+++ plugins/Unity/categories.h	2013-06-19 20:05:35 +0000
@@ -36,7 +36,6 @@
     Q_ENUMS(Roles)
 
     Q_PROPERTY(DeeListModel* resultModel READ resultModel WRITE setResultModel NOTIFY resultModelChanged)
-    Q_PROPERTY(DeeListModel* globalResultModel READ globalResultModel WRITE setResultModel NOTIFY globalResultModelChanged)
 
 public:
     explicit Categories(QObject* parent = 0);
@@ -49,9 +48,7 @@
         RoleRenderer,
         RoleHints,
         RoleResults,
-        RoleGlobalResults,
-        RoleCount,
-        RoleGlobalCount
+        RoleCount
     };
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
@@ -60,32 +57,25 @@
 
     /* getters */
     DeeListModel* resultModel() { return m_resultModel; }
-    DeeListModel* globalResultModel() { return m_globalResultModel; }
 
     /* setters */
     void setResultModel(DeeListModel*);
-    void setGlobalResultModel(DeeListModel*);
 
 Q_SIGNALS:
     void resultModelChanged(DeeListModel*);
-    void globalResultModelChanged(DeeListModel*);
 
 private Q_SLOTS:
     void onCountChanged();
-    void onGlobalCountChanged();
     void onEmitCountChanged();
 
 private:
     CategoryFilter* getFilter(int index) const;
-    CategoryFilter* getGlobalFilter(int index) const;
 
     QTimer m_timer;
     QSet<CategoryFilter*> m_timerFilters;
     QHash<int, QByteArray> m_roles;
     DeeListModel* m_resultModel;
-    DeeListModel* m_globalResultModel;
     mutable QMap<int, CategoryFilter*> m_filters;
-    mutable QMap<int, CategoryFilter*> m_globalFilters;
 };
 
 #endif // CATEGORIES_H

=== removed file 'plugins/Unity/peoplepreviewdata.cpp'
--- plugins/Unity/peoplepreviewdata.cpp	2013-06-05 22:03:08 +0000
+++ plugins/Unity/peoplepreviewdata.cpp	1970-01-01 00:00:00 +0000
@@ -1,438 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * Authors:
- *  Guenter Schwann <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "peoplepreviewdata.h"
-
-#include <QDebug>
-
-#include "lens.h"
-
-static void phoneAppend(QQmlListProperty<PeoplePhoneData> *property, PeoplePhoneData *val)
-{
-    Q_UNUSED(val);
-    Q_UNUSED(property);
-}
-static PeoplePhoneData *phoneAt(QQmlListProperty<PeoplePhoneData> *property, int index)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->phoneNumberList().at(index);
-}
-static int phoneCount(QQmlListProperty<PeoplePhoneData> *property)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->phoneNumberList().count();
-}
-static void phoneClear(QQmlListProperty<PeoplePhoneData> *property)
-{
-    Q_UNUSED(property);
-}
-
-static void emailAppend(QQmlListProperty<PeopleAddressData> *property, PeopleAddressData *val)
-{
-    Q_UNUSED(val);
-    Q_UNUSED(property);
-}
-static PeopleAddressData *emailAt(QQmlListProperty<PeopleAddressData> *property, int index)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->emailAddressesList().at(index);
-}
-static int emailCount(QQmlListProperty<PeopleAddressData> *property)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->emailAddressesList().count();
-}
-static void emailClear(QQmlListProperty<PeopleAddressData> *property)
-{
-    Q_UNUSED(property);
-}
-
-static void imAppend(QQmlListProperty<PeopleIMData> *property, PeopleIMData *val)
-{
-    Q_UNUSED(val);
-    Q_UNUSED(property);
-}
-static PeopleIMData *imAt(QQmlListProperty<PeopleIMData> *property, int index)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->imAccountsList().at(index);
-}
-static int imCount(QQmlListProperty<PeopleIMData> *property)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->imAccountsList().count();
-}
-static void imClear(QQmlListProperty<PeopleIMData> *property)
-{
-    Q_UNUSED(property);
-}
-
-static void addressAppend(QQmlListProperty<PeopleAddressData> *property, PeopleAddressData *val)
-{
-    Q_UNUSED(val);
-    Q_UNUSED(property);
-}
-static PeopleAddressData *addressAt(QQmlListProperty<PeopleAddressData> *property, int index)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->addressesList().at(index);
-}
-static int addressCount(QQmlListProperty<PeopleAddressData> *property)
-{
-    PeoplePreviewData *d = static_cast<PeoplePreviewData*>(property->data);
-    return d->addressesList().count();
-}
-static void addressClear(QQmlListProperty<PeopleAddressData> *property)
-{
-    Q_UNUSED(property);
-}
-
-
-using namespace unity;
-
-PeoplePreviewData::PeoplePreviewData(QObject *parent)
-:   QObject(parent)
-,   m_lens(0)
-,   m_ready(false)
-{
-}
-
-PeoplePreviewData::~PeoplePreviewData()
-{
-    clearData();
-}
-
-Lens *PeoplePreviewData::lens() const
-{
-    return m_lens;
-}
-
-void PeoplePreviewData::setLens(Lens *lens)
-{
-    if (lens == m_lens)
-        return;
-
-    setReady(false);
-
-    if (m_lensConnection.connected())
-       m_lensConnection.disconnect();
-
-    m_lens = lens;
-    m_lensConnection = m_lens->unityLens()->preview_ready.connect(
-                sigc::mem_fun(this, &PeoplePreviewData::setUnityPreview));
-    Q_EMIT lensChanged();
-
-    if (!m_uri.isEmpty() && !m_lens)
-        getPeoplePreview();
-}
-
-QString PeoplePreviewData::uri() const
-{
-    return m_uri;
-}
-
-void PeoplePreviewData::setUri(const QString &uri)
-{
-    if (uri == m_uri)
-        return;
-
-    setReady(false);
-
-    m_uri = uri;
-    Q_EMIT uriChanged();
-    if (!m_uri.isEmpty() && m_lens)
-        getPeoplePreview();
-}
-
-bool PeoplePreviewData::ready() const
-{
-    return m_ready;
-}
-
-void PeoplePreviewData::setReady(const bool &ready)
-{
-    if (ready == m_ready)
-        return;
-
-    m_ready = ready;
-    Q_EMIT readyChanged();
-}
-
-QString PeoplePreviewData::renderName() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->renderer_name());
-}
-
-QString PeoplePreviewData::title() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->title());
-}
-
-QString PeoplePreviewData::subTitle() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->subtitle());
-}
-
-QString PeoplePreviewData::description() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->description());
-}
-
-QString PeoplePreviewData::imageSource() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->image_source_uri());
-}
-
-QQmlListProperty<PeoplePhoneData> PeoplePreviewData::phoneNumbers()
-{
-    return QQmlListProperty<PeoplePhoneData> (this, this,
-                                              phoneAppend,
-                                              phoneCount,
-                                              phoneAt,
-                                              phoneClear);
-}
-
-QQmlListProperty<PeopleAddressData> PeoplePreviewData::emailAddresses()
-{
-    return QQmlListProperty<PeopleAddressData> (this, this,
-                                              emailAppend,
-                                              emailCount,
-                                              emailAt,
-                                              emailClear);
-}
-
-QQmlListProperty<PeopleIMData> PeoplePreviewData::imAccounts()
-{
-    return QQmlListProperty<PeopleIMData> (this, this,
-                                              imAppend,
-                                              imCount,
-                                              imAt,
-                                              imClear);
-}
-
-QString PeoplePreviewData::displayName() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->display_name());
-}
-
-QString PeoplePreviewData::status() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->status());
-}
-
-QString PeoplePreviewData::statusTime() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->status_time());
-}
-
-QString PeoplePreviewData::statusService() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->status_service());
-}
-
-QString PeoplePreviewData::statusServiceIcon() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    glib::Object<GIcon> icon = m_unityPreview->status_service_icon();
-    if (!icon)
-        return QLatin1String("");
-
-    return QString(g_icon_to_string(icon));
-}
-
-QString PeoplePreviewData::statusPostUri() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    return QString::fromStdString(m_unityPreview->status_post_uri());
-}
-
-QQmlListProperty<PeopleAddressData> PeoplePreviewData::addresses()
-{
-    return QQmlListProperty<PeopleAddressData> (this, this,
-                                              addressAppend,
-                                              addressCount,
-                                              addressAt,
-                                              addressClear);
-}
-
-QString PeoplePreviewData::avatar() const
-{
-    if (!m_unityPreview)
-        return QLatin1String("");
-
-    glib::Object<GIcon> avatar = m_unityPreview->avatar();
-    if (!avatar)
-        return QLatin1String("");
-
-    return QString(g_icon_to_string(avatar));
-}
-
-void PeoplePreviewData::getPeoplePreview()
-{
-    m_lens->unityLens()->Preview(m_uri.toStdString());
-}
-
-void PeoplePreviewData::setUnityPreview(std::string const& uri, dash::Preview::Ptr const& preview)
-{
-    if (uri != m_uri.toStdString())
-        return;
-
-    dash::PeoplePreview::Ptr peoplePtr = std::dynamic_pointer_cast<dash::PeoplePreview>(preview);
-    if (peoplePtr == nullptr) {
-        qWarning() << "Backend returned a dash::Preview that isn't a dash::PeoplePreview";
-        Q_EMIT error();
-        return;
-    }
-
-    clearData();
-    m_unityPreview = peoplePtr;
-    getPhoneData();
-    getEmailAddresses();
-    getImAccounts();
-    getAddresses();
-
-    Q_EMIT renderNameChanged();
-    Q_EMIT titleChanged();
-    Q_EMIT subTitleChanged();
-    Q_EMIT descriptionChanged();
-    Q_EMIT imageSourceChanged();
-    Q_EMIT phoneNumbersChanged();
-    Q_EMIT emailAddressesChanged();
-    Q_EMIT imAccountsChanged();
-    Q_EMIT displayNameChanged();
-    Q_EMIT statusChanged();
-    Q_EMIT statusTimeChanged();
-    Q_EMIT statusServiceChanged();
-    Q_EMIT addressesChanged();
-    Q_EMIT avatarChanged();
-
-    setReady(true);
-}
-
-void PeoplePreviewData::clearData()
-{
-    while (!m_phoneList.empty()) {
-        PeoplePhoneData *phone = m_phoneList.takeLast();
-        delete phone;
-    }
-    while (!m_emailList.empty()) {
-        PeopleAddressData *email = m_emailList.takeLast();
-        delete email;
-    }
-    while (!m_imList.empty()) {
-        PeopleIMData *im = m_imList.takeLast();
-        delete im;
-    }
-    while (!m_addressList.empty()) {
-        PeopleAddressData *address = m_addressList.takeLast();
-        delete address;
-    }
-}
-
-void PeoplePreviewData::getPhoneData()
-{
-    dash::PeoplePreview::PhonePtrList uPhoneList;
-    uPhoneList = m_unityPreview->GetPhone();
-
-    for (size_t i=0; i<uPhoneList.size(); ++i) {
-        PeoplePhoneData *phone = new PeoplePhoneData;
-        phone->m_type = QString::fromStdString(uPhoneList[i]->type);
-        phone->m_location = QString::fromStdString(uPhoneList[i]->location);
-        phone->m_number = QString::fromStdString(uPhoneList[i]->number);
-        m_phoneList.append(phone);
-    }
-}
-
-void PeoplePreviewData::getEmailAddresses()
-{
-    dash::PeoplePreview::EmailPtrList uEmailList;
-    uEmailList = m_unityPreview->GetEmail();
-
-    for (size_t i=0; i<uEmailList.size(); ++i) {
-        PeopleAddressData *email = new PeopleAddressData;
-        email->m_type = QString::fromStdString(uEmailList[i]->type);
-        email->m_address = QString::fromStdString(uEmailList[i]->address);
-        m_emailList.append(email);
-    }
-}
-
-void PeoplePreviewData::getImAccounts()
-{
-    dash::PeoplePreview::IMAccountPtrList uIMList;
-    uIMList = m_unityPreview->GetIMAccount();
-
-    for (size_t i=0; i<uIMList.size(); ++i) {
-        PeopleIMData *im = new PeopleIMData;
-        im->m_protocol = QString::fromStdString(uIMList[i]->protocol);
-        im->m_address = QString::fromStdString(uIMList[i]->address);
-        m_imList.append(im);
-    }
-}
-
-void PeoplePreviewData::getAddresses()
-{
-    dash::PeoplePreview::AddressPtrList uAddressList;
-    uAddressList = m_unityPreview->GetAddress();
-
-    for (size_t i=0; i<uAddressList.size(); ++i) {
-        PeopleAddressData *address = new PeopleAddressData;
-        address->m_type = QString::fromStdString(uAddressList[i]->type);
-        address->m_address = QString::fromStdString(uAddressList[i]->address);
-        address->m_poBox = QString::fromStdString(uAddressList[i]->po_box);
-        address->m_extension = QString::fromStdString(uAddressList[i]->extension);
-        address->m_street = QString::fromStdString(uAddressList[i]->street);
-        address->m_locality = QString::fromStdString(uAddressList[i]->locality);
-        address->m_region = QString::fromStdString(uAddressList[i]->region);
-        address->m_postalCode = QString::fromStdString(uAddressList[i]->postal_code);
-        address->m_country = QString::fromStdString(uAddressList[i]->country);
-        address->m_addressFormat = QString::fromStdString(uAddressList[i]->address_format);
-        m_addressList.append(address);
-    }
-}

=== removed file 'plugins/Unity/peoplepreviewdata.h'
--- plugins/Unity/peoplepreviewdata.h	2013-06-05 22:03:08 +0000
+++ plugins/Unity/peoplepreviewdata.h	1970-01-01 00:00:00 +0000
@@ -1,251 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * Authors:
- *  Guenter Schwann <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PEOPLEPREVIEWDATA_H
-#define PEOPLEPREVIEWDATA_H
-
-#include <QList>
-#include <QObject>
-#include <qqmllist.h>
-#include <QString>
-
-// libunity-core
-#include <UnityCore/PeoplePreview.h>
-
-#include <sigc++/connection.h>
-
-class Lens;
-
-/*!
- * \brief The PeoplePhoneData class stores the data for one phone number
- */
-class PeoplePhoneData : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString type READ type NOTIFY typeChanged)
-    Q_PROPERTY(QString location READ location NOTIFY locationChanged)
-    Q_PROPERTY(QString number READ number NOTIFY numberChanged)
-
-Q_SIGNALS:
-    void typeChanged();
-    void locationChanged();
-    void numberChanged();
-
-public:
-    explicit PeoplePhoneData(QObject *parent = 0) : QObject(parent) {}
-    QString type() const { return m_type; }
-    QString location() const { return m_location; }
-    QString number() const { return m_number; }
-
-private:
-    QString m_type;
-    QString m_location;
-    QString m_number;
-    friend class PeoplePreviewData;
-};
-
-/*!
- * \brief The PeopleAddressData class stores the data for one single post/email address
- */
-class PeopleAddressData : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString type READ type NOTIFY typeChanged)
-    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
-    Q_PROPERTY(QString poBox READ poBox NOTIFY poBoxChanged)
-    Q_PROPERTY(QString extension READ extension NOTIFY extensionChanged)
-    Q_PROPERTY(QString street READ street NOTIFY streetChanged)
-    Q_PROPERTY(QString locality READ locality NOTIFY localityChanged)
-    Q_PROPERTY(QString region READ region NOTIFY regionChanged)
-    Q_PROPERTY(QString postalCode READ postalCode NOTIFY postalCodeChanged)
-    Q_PROPERTY(QString country READ country NOTIFY countryChanged)
-    Q_PROPERTY(QString addressFormat READ addressFormat NOTIFY addressFormatChanged)
-
-Q_SIGNALS:
-    void typeChanged();
-    void addressChanged();
-    void poBoxChanged();
-    void extensionChanged();
-    void streetChanged();
-    void localityChanged();
-    void regionChanged();
-    void postalCodeChanged();
-    void countryChanged();
-    void addressFormatChanged();
-
-public:
-    explicit PeopleAddressData(QObject *parent = 0) : QObject(parent) {}
-    QString type() const { return m_type; }
-    QString address() const { return m_address; }
-    QString poBox() const { return m_poBox; }
-    QString extension() const { return m_extension; }
-    QString street() const { return m_street; }
-    QString locality() const { return m_locality; }
-    QString region() const { return m_region; }
-    QString postalCode() const { return m_postalCode; }
-    QString country() const { return m_country; }
-    QString addressFormat() const { return m_addressFormat; }
-
-private:
-    QString m_type;
-    QString m_address;
-    QString m_poBox;
-    QString m_extension;
-    QString m_street;
-    QString m_locality;
-    QString m_region;
-    QString m_postalCode;
-    QString m_country;
-    QString m_addressFormat;
-    friend class PeoplePreviewData;
-};
-
-/*!
- * \brief The PeopleIMData class stores the data for one single post/email address
- */
-class PeopleIMData : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString protocol READ protocol NOTIFY protocolChanged)
-    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
-
-Q_SIGNALS:
-    void protocolChanged();
-    void addressChanged();
-
-public:
-    explicit PeopleIMData(QObject *parent = 0) : QObject(parent) {}
-    QString protocol() const { return m_protocol; }
-    QString address() const { return m_address; }
-
-private:
-    QString m_protocol;
-    QString m_address;
-    friend class PeoplePreviewData;
-};
-
-
-/*!
- * \brief The PeoplePreviewData class providing information for one person
- */
-class PeoplePreviewData : public QObject
-{
-    Q_OBJECT
-
-    // These properties need to be set from QML
-    Q_PROPERTY(Lens* lens READ lens WRITE setLens NOTIFY lensChanged)
-    Q_PROPERTY(QString uri READ uri WRITE setUri NOTIFY uriChanged)
-    // Read only properties containing general Preview information
-    Q_PROPERTY(bool ready READ ready NOTIFY readyChanged)
-    Q_PROPERTY(QString renderName READ renderName NOTIFY renderNameChanged)
-    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
-    Q_PROPERTY(QString subTitle READ subTitle NOTIFY subTitleChanged)
-    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
-    Q_PROPERTY(QString imageSource READ imageSource NOTIFY imageSourceChanged)
-    // Read only properties containing PeoplePreview specific information
-    Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
-    Q_PROPERTY(QQmlListProperty<PeopleAddressData> emailAddresses READ emailAddresses NOTIFY emailAddressesChanged)
-    Q_PROPERTY(QQmlListProperty<PeoplePhoneData> phoneNumbers READ phoneNumbers NOTIFY phoneNumbersChanged)
-    Q_PROPERTY(QQmlListProperty<PeopleIMData> imAccounts READ imAccounts NOTIFY imAccountsChanged)
-    Q_PROPERTY(QString status READ status NOTIFY statusChanged)
-    Q_PROPERTY(QString statusTime READ statusTime NOTIFY statusTimeChanged)
-    Q_PROPERTY(QString statusService READ statusService NOTIFY statusServiceChanged)
-    Q_PROPERTY(QString statusServiceIcon READ statusServiceIcon NOTIFY statusServiceIconChanged)
-    Q_PROPERTY(QString statusPostUri READ statusPostUri NOTIFY statusPostUriChanged)
-    Q_PROPERTY(QQmlListProperty<PeopleAddressData> addresses READ addresses NOTIFY addressesChanged)
-    Q_PROPERTY(QString avatar READ avatar NOTIFY avatarChanged)
-
-public:
-    PeoplePreviewData(QObject *parent = 0);
-    ~PeoplePreviewData();
-
-    void setUnityPeoplePreview(const unity::dash::Preview::Ptr& preview);
-    void setLens(Lens *lens);
-    void setUri(const QString &uri);
-
-    Lens *lens() const;
-    QString uri() const;
-    bool ready() const;
-    QString renderName() const;
-    QString title() const;
-    QString subTitle() const;
-    QString description() const;
-    QString imageSource() const;
-    QString displayName() const;
-    QQmlListProperty<PeoplePhoneData> phoneNumbers();
-    QQmlListProperty<PeopleAddressData> emailAddresses();
-    QQmlListProperty<PeopleIMData> imAccounts();
-    QString status() const;
-    QString statusTime() const;
-    QString statusService() const;
-    QString statusServiceIcon() const;
-    QString statusPostUri() const;
-    QQmlListProperty<PeopleAddressData> addresses();
-    QString avatar() const;
-
-    QList<PeoplePhoneData*> &phoneNumberList() { return m_phoneList; }
-    QList<PeopleAddressData*> &emailAddressesList() { return m_emailList; }
-    QList<PeopleIMData*> &imAccountsList() { return m_imList; }
-    QList<PeopleAddressData*> &addressesList() { return m_addressList; }
-
-Q_SIGNALS:
-    void lensChanged();
-    void uriChanged();
-    void readyChanged();
-    void renderNameChanged();
-    void titleChanged();
-    void subTitleChanged();
-    void descriptionChanged();
-    void imageSourceChanged();
-    void displayNameChanged();
-    void phoneNumbersChanged();
-    void emailAddressesChanged();
-    void imAccountsChanged();
-    void statusChanged();
-    void statusTimeChanged();
-    void statusServiceChanged();
-    void statusServiceIconChanged();
-    void statusPostUriChanged();
-    void addressesChanged();
-    void avatarChanged();
-    void error();
-
-private:
-    void setReady(const bool &ready);
-    void getPeoplePreview();
-    void setUnityPreview(std::string const& uri, unity::dash::Preview::Ptr const& preview);
-    void clearData();
-    void getPhoneData();
-    void getEmailAddresses();
-    void getImAccounts();
-    void getAddresses();
-
-    Lens *m_lens;
-    sigc::connection m_lensConnection;
-    QString m_uri;
-    bool m_ready;
-    unity::dash::PeoplePreview::Ptr m_unityPreview;
-
-    QList<PeoplePhoneData*> m_phoneList;
-    QList<PeopleAddressData*> m_addressList;
-    QList<PeopleIMData*> m_imList;
-    QList<PeopleAddressData*> m_emailList;
-};
-
-#endif // PEOPLEPREVIEWDATA_H

=== modified file 'plugins/Unity/plugin.cpp'
--- plugins/Unity/plugin.cpp	2013-06-05 22:03:08 +0000
+++ plugins/Unity/plugin.cpp	2013-06-19 20:05:35 +0000
@@ -24,11 +24,10 @@
 #include "plugin.h"
 
 // local
-#include "lens.h"
-#include "lenses.h"
+#include "scope.h"
+#include "scopes.h"
 #include "categories.h"
 #include "categoryfilter.h"
-#include "peoplepreviewdata.h"
 #include "bottombarvisibilitycommunicatorshell.h"
 #include "launchermodel.h"
 
@@ -41,15 +40,11 @@
 void UnityPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Unity"));
-    qmlRegisterType<Lens>(uri, 0, 1, "Lens");
-    qmlRegisterType<Lenses>(uri, 0, 1, "Lenses");
+    qmlRegisterType<Scope>(uri, 0, 1, "Scope");
+    qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
     qmlRegisterType<Categories>(uri, 0, 1, "Categories");
     qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
     qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
-    qmlRegisterType<PeoplePreviewData>(uri, 0, 1, "PeoplePreviewData");
-    qmlRegisterType<PeoplePhoneData>(uri, 0, 1, "PeoplePhoneData");
-    qmlRegisterType<PeopleAddressData>(uri, 0, 1, "PeopleAddressData");
-    qmlRegisterType<PeopleIMData>(uri, 0, 1, "PeopleIMData");
     qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
     qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
     qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");

=== renamed file 'plugins/Unity/lens.cpp' => 'plugins/Unity/scope.cpp'
--- plugins/Unity/lens.cpp	2013-06-05 22:03:08 +0000
+++ plugins/Unity/scope.cpp	2013-06-19 20:05:35 +0000
@@ -18,7 +18,7 @@
  */
 
 // Self
-#include "lens.h"
+#include "scope.h"
 #include "categories.h"
 
 // Qt
@@ -28,113 +28,76 @@
 
 #include <libintl.h>
 
-Lens::Lens(QObject *parent) :
+Scope::Scope(QObject *parent) :
     QObject(parent)
 {
     m_results = new DeeListModel(this);
-    m_globalResults = new DeeListModel(this);
     m_categories = new Categories(this);
 
     m_categories->setResultModel(m_results);
-    m_categories->setGlobalResultModel(m_globalResults);
-}
-
-QString Lens::id() const
-{
-    return QString::fromStdString(m_unityLens->id());
-}
-
-QString Lens::dbusName() const
-{
-    return QString::fromStdString(m_unityLens->dbus_name());
-}
-
-QString Lens::dbusPath() const
-{
-    return QString::fromStdString(m_unityLens->dbus_path());
-}
-
-QString Lens::name() const
-{
-    return QString::fromStdString(m_unityLens->name());
-}
-
-QString Lens::iconHint() const
-{
-    return QString::fromStdString(m_unityLens->icon_hint());
-}
-
-QString Lens::description() const
-{
-    return QString::fromStdString(m_unityLens->description());
-}
-
-QString Lens::searchHint() const
-{
-    return QString::fromStdString(m_unityLens->search_hint());
-}
-
-bool Lens::visible() const
-{
-    return m_unityLens->visible();
-}
-
-bool Lens::searchInGlobal() const
-{
-    return m_unityLens->search_in_global();
-}
-
-QString Lens::shortcut() const
-{
-    return QString::fromStdString(m_unityLens->shortcut());
-}
-
-bool Lens::connected() const
-{
-    return m_unityLens->connected();
-}
-
-DeeListModel* Lens::results() const
+}
+
+QString Scope::id() const
+{
+    return QString::fromStdString(m_unityScope->id());
+}
+
+QString Scope::name() const
+{
+    return QString::fromStdString(m_unityScope->name());
+}
+
+QString Scope::iconHint() const
+{
+    return QString::fromStdString(m_unityScope->icon_hint());
+}
+
+QString Scope::description() const
+{
+    return QString::fromStdString(m_unityScope->description());
+}
+
+QString Scope::searchHint() const
+{
+    return QString::fromStdString(m_unityScope->search_hint());
+}
+
+bool Scope::visible() const
+{
+    return m_unityScope->visible();
+}
+
+QString Scope::shortcut() const
+{
+    return QString::fromStdString(m_unityScope->shortcut());
+}
+
+bool Scope::connected() const
+{
+    return m_unityScope->connected();
+}
+
+DeeListModel* Scope::results() const
 {
     return m_results;
 }
 
-DeeListModel* Lens::globalResults() const
-{
-    return m_globalResults;
-}
-
-Categories* Lens::categories() const
+Categories* Scope::categories() const
 {
     return m_categories;
 }
 
-Lens::ViewType Lens::viewType() const
-{
-    return (Lens::ViewType) m_unityLens->view_type();
-}
-
-QString Lens::searchQuery() const
+QString Scope::searchQuery() const
 {
     return m_searchQuery;
 }
 
-QString Lens::globalSearchQuery() const
-{
-    return m_globalSearchQuery;
-}
-
-QString Lens::noResultsHint() const
+QString Scope::noResultsHint() const
 {
     return m_noResultsHint;
 }
 
-void Lens::setViewType(const Lens::ViewType& viewType)
-{
-    m_unityLens->view_type = (unity::dash::ViewType) viewType;
-}
-
-void Lens::setSearchQuery(const QString& search_query)
+void Scope::setSearchQuery(const QString& search_query)
 {
     /* Checking for m_searchQuery.isNull() which returns true only when the string
        has never been set is necessary because when search_query is the empty
@@ -143,48 +106,37 @@
     */
     if (m_searchQuery.isNull() || search_query != m_searchQuery) {
         m_searchQuery = search_query;
-        m_unityLens->Search(search_query.toStdString(), sigc::mem_fun(this, &Lens::searchFinished));
+        m_unityScope->Search(search_query.toStdString(), sigc::mem_fun(this, &Scope::searchFinished));
         Q_EMIT searchQueryChanged();
     }
 }
 
-void Lens::setGlobalSearchQuery(const QString& search_query)
-{
-    /* Checking for m_globalSearchQuery.isNull() which returns true only when the string
-       has never been set is necessary because when search_query is the empty
-       string ("") and m_globalSearchQuery is the null string,
-       search_query != m_globalSearchQuery is still true.
-    */
-    if (m_globalSearchQuery.isNull() || search_query != m_globalSearchQuery) {
-        m_globalSearchQuery = search_query;
-        m_unityLens->GlobalSearch(search_query.toStdString(), sigc::mem_fun(this, &Lens::globalSearchFinished));
-        Q_EMIT globalSearchQueryChanged();
-    }
-}
-
-void Lens::setNoResultsHint(const QString& hint) {
+void Scope::setNoResultsHint(const QString& hint) {
     if (hint != m_noResultsHint) {
         m_noResultsHint = hint;
         Q_EMIT noResultsHintChanged();
     }
 }
 
-void Lens::activate(const QString& uri)
+void Scope::activate(const QString& /*uri*/)
 {
-    m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());
+    // TODO:
+    // we need to create unity::dash::LocalResult (see UnityCore/Result.h) and pass it to Activate;
+    // this requires entire row from the model, so we need row index rather than uri.
+    // m_unityScope->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData());
 }
 
-void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
+void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)
 {
     if (type == unity::dash::NOT_HANDLED) {
-        fallbackActivate(QString::fromStdString(uri));
+        fallbackActivate(QString::fromStdString(result.uri));
     }
 }
 
-void Lens::fallbackActivate(const QString& uri)
+void Scope::fallbackActivate(const QString& uri)
 {
     /* FIXME: stripping all content before the first column because for some
-              reason the lenses give uri with junk content at their beginning.
+              reason the scopes give uri with junk content at their beginning.
     */
     QString tweakedUri = uri;
     int firstColumnAt = tweakedUri.indexOf(":");
@@ -215,118 +167,101 @@
     QDesktopServices::openUrl(url);
 }
 
-void Lens::setUnityLens(const unity::dash::Lens::Ptr& lens)
+void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)
 {
-    m_unityLens = lens;
-
-    if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {
-        m_results->setModel(m_unityLens->results()->model());
-    } else {
-        m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
-    }
-    if (QString::fromStdString(m_unityLens->global_results()->swarm_name) == QString(":local")) {
-        m_globalResults->setModel(m_unityLens->global_results()->model());
-    } else {
-        m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
-    }
-    if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {
-        m_categories->setModel(m_unityLens->categories()->model());
-    } else {
-        m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+    m_unityScope = scope;
+
+    if (QString::fromStdString(m_unityScope->results()->swarm_name) == QString(":local")) {
+        m_results->setModel(m_unityScope->results()->model());
+    } else {
+        m_results->setName(QString::fromStdString(m_unityScope->results()->swarm_name));
+    }
+
+    if (QString::fromStdString(m_unityScope->categories()->swarm_name) == QString(":local")) {
+        m_categories->setModel(m_unityScope->categories()->model());
+    } else {
+        m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
     }
 
     /* Property change signals */
-    m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));
-    m_unityLens->dbus_name.changed.connect(sigc::mem_fun(this, &Lens::dbusNameChanged));
-    m_unityLens->dbus_path.changed.connect(sigc::mem_fun(this, &Lens::dbusPathChanged));
-    m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));
-    m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));
-    m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));
-    m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));
-    m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));
-    m_unityLens->search_in_global.changed.connect(sigc::mem_fun(this, &Lens::searchInGlobalChanged));
-    m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));
-    m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));
-    m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));
-    m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));
-    m_unityLens->global_results.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsChanged));
-    m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));
-    m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));
-    m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));
-    m_unityLens->view_type.changed.connect(sigc::mem_fun(this, &Lens::onViewTypeChanged));
-
+    m_unityScope->id.changed.connect(sigc::mem_fun(this, &Scope::idChanged));
+    m_unityScope->name.changed.connect(sigc::mem_fun(this, &Scope::nameChanged));
+    m_unityScope->icon_hint.changed.connect(sigc::mem_fun(this, &Scope::iconHintChanged));
+    m_unityScope->description.changed.connect(sigc::mem_fun(this, &Scope::descriptionChanged));
+    m_unityScope->search_hint.changed.connect(sigc::mem_fun(this, &Scope::searchHintChanged));
+    m_unityScope->visible.changed.connect(sigc::mem_fun(this, &Scope::visibleChanged));
+    m_unityScope->shortcut.changed.connect(sigc::mem_fun(this, &Scope::shortcutChanged));
+    m_unityScope->connected.changed.connect(sigc::mem_fun(this, &Scope::connectedChanged));
+    m_unityScope->results.changed.connect(sigc::mem_fun(this, &Scope::onResultsChanged));
+    m_unityScope->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Scope::onResultsSwarmNameChanged));
+    m_unityScope->results()->model.changed.connect(sigc::mem_fun(this, &Scope::onResultsModelChanged));
+    m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesModelChanged));
+    m_unityScope->categories.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesChanged));
+    m_unityScope->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesSwarmNameChanged));
     /* Signals forwarding */
-    connect(this, SIGNAL(searchFinished(unity::dash::Lens::Hints const &, unity::glib::Error const &)), SLOT(onSearchFinished(unity::dash::Lens::Hints const &)));
+    connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));
 
     /* FIXME: signal should be forwarded instead of calling the handler directly */
-    m_unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated));
+    m_unityScope->activated.connect(sigc::mem_fun(this, &Scope::onActivated));
 
-    /* Synchronize local states with m_unityLens right now and whenever
-       m_unityLens becomes connected */
+    /* Synchronize local states with m_unityScope right now and whenever
+       m_unityScope becomes connected */
     /* FIXME: should emit change notification signals for all properties */
     connect(this, SIGNAL(connectedChanged(bool)), SLOT(synchronizeStates()));
     synchronizeStates();
 }
 
-unity::dash::Lens::Ptr Lens::unityLens() const
+unity::dash::Scope::Ptr Scope::unityScope() const
 {
-    return m_unityLens;
+    return m_unityScope;
 }
 
-void Lens::synchronizeStates()
+void Scope::synchronizeStates()
 {
     if (connected()) {
-        /* Forward local states to m_unityLens */
+        /* Forward local states to m_unityScope */
         if (!m_searchQuery.isNull()) {
-            m_unityLens->Search(m_searchQuery.toStdString());
-        }
-        if (!m_globalSearchQuery.isNull()) {
-            m_unityLens->GlobalSearch(m_globalSearchQuery.toStdString());
+            m_unityScope->Search(m_searchQuery.toStdString());
         }
     }
 }
 
-void Lens::onResultsSwarmNameChanged(const std::string& /* swarm_name */)
-{
-    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
-}
-
-void Lens::onResultsChanged(const unity::dash::Results::Ptr& /* results */)
-{
-    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
-}
-
-void Lens::onGlobalResultsSwarmNameChanged(const std::string& /* swarm_name */)
-{
-    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
-}
-
-void Lens::onGlobalResultsChanged(const unity::dash::Results::Ptr& /* global_results */)
-{
-    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
-}
-
-void Lens::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)
-{
-    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
-}
-
-void Lens::onCategoriesChanged(const unity::dash::Categories::Ptr& /* categories */)
-{
-    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
-}
-
-void Lens::onViewTypeChanged(unity::dash::ViewType viewType)
-{
-    Q_EMIT viewTypeChanged( (Lens::ViewType) viewType);
-}
-
-void Lens::onSearchFinished(unity::dash::Lens::Hints const &hints)
+void Scope::onResultsSwarmNameChanged(const std::string& /* swarm_name */)
+{
+    m_results->setName(QString::fromStdString(m_unityScope->results()->swarm_name));
+}
+
+void Scope::onResultsChanged(const unity::dash::Results::Ptr& /* results */)
+{
+    m_results->setName(QString::fromStdString(m_unityScope->results()->swarm_name));
+}
+
+void Scope::onResultsModelChanged(unity::glib::Object<DeeModel> /* model */)
+{
+    m_results->setModel(m_unityScope->results()->model());
+}
+
+void Scope::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)
+{
+    m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
+}
+
+void Scope::onCategoriesChanged(const unity::dash::Categories::Ptr& /* categories */)
+{
+    m_categories->setName(QString::fromStdString(m_unityScope->categories()->swarm_name));
+}
+
+void Scope::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)
+{
+    m_categories->setModel(model);
+}
+
+void Scope::onSearchFinished(const std::string& /* query */, unity::glib::HintsMap const &hints)
 {
     QString hint;
 
-    if (!m_unityLens->results()->count()) {
-        unity::dash::Lens::Hints::const_iterator it = hints.find("no-results-hint");
+    if (!m_unityScope->results()->count()) {
+        unity::glib::HintsMap::const_iterator it = hints.find("no-results-hint");
         if (it != hints.end()) {
             hint = QString::fromStdString(it->second.GetString());
         } else {

=== renamed file 'plugins/Unity/lens.h' => 'plugins/Unity/scope.h'
--- plugins/Unity/lens.h	2013-06-05 22:03:08 +0000
+++ plugins/Unity/scope.h	2013-06-19 20:05:35 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LENS_H
-#define LENS_H
+#ifndef SCOPE_H
+#define SCOPE_H
 
 // Qt
 #include <QObject>
@@ -26,76 +26,56 @@
 #include <QMetaType>
 
 // libunity-core
-#include <UnityCore/Lens.h>
+#include <UnityCore/Scope.h>
+#include <UnityCore/Results.h>
 
 // dee-qt
 #include "deelistmodel.h"
 
 class Categories;
 
-class Lens : public QObject
+class Scope : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(ViewType)
 
     Q_PROPERTY(QString id READ id NOTIFY idChanged)
-    Q_PROPERTY(QString dbusName READ dbusName NOTIFY dbusNameChanged)
-    Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
     Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
     Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
     Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
-    Q_PROPERTY(bool searchInGlobal READ searchInGlobal NOTIFY searchInGlobalChanged)
     Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
     Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
     Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
-    Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)
     Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
-    Q_PROPERTY(ViewType viewType READ viewType WRITE setViewType NOTIFY viewTypeChanged)
 
     Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
-    Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)
     Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
 
 public:
-    explicit Lens(QObject *parent = 0);
-
-    enum ViewType {
-        Hidden,
-        HomeView,
-        LensView
-    };
+    explicit Scope(QObject *parent = 0);
 
     /* getters */
     QString id() const;
-    QString dbusName() const;
-    QString dbusPath() const;
     QString name() const;
     QString iconHint() const;
     QString description() const;
     QString searchHint() const;
     bool visible() const;
-    bool searchInGlobal() const;
     QString shortcut() const;
     bool connected() const;
     DeeListModel* results() const;
-    DeeListModel* globalResults() const;
     Categories* categories() const;
-    ViewType viewType() const;
     QString searchQuery() const;
-    QString globalSearchQuery() const;
     QString noResultsHint() const;
 
     /* setters */
-    void setViewType(const ViewType& viewType);
     void setSearchQuery(const QString& search_query);
-    void setGlobalSearchQuery(const QString& search_query);
     void setNoResultsHint(const QString& hint);
 
     Q_INVOKABLE void activate(const QString& uri);
-    void setUnityLens(const unity::dash::Lens::Ptr& lens);
-    unity::dash::Lens::Ptr unityLens() const;
+    void setUnityScope(const unity::dash::Scope::Ptr& scope);
+    unity::dash::Scope::Ptr unityScope() const;
 
 Q_SIGNALS:
     void idChanged(const std::string&);
@@ -106,44 +86,36 @@
     void descriptionChanged(const std::string&);
     void searchHintChanged(const std::string&);
     void visibleChanged(bool);
-    void searchInGlobalChanged(bool);
     void shortcutChanged(const std::string&);
     void connectedChanged(bool);
     void resultsChanged();
-    void globalResultsChanged();
     void categoriesChanged();
-    void viewTypeChanged(ViewType);
-    void searchFinished(unity::dash::Lens::Hints const&, unity::glib::Error const&);
-    void globalSearchFinished(unity::dash::Lens::Hints const&, unity::glib::Error const&);
+    void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);
     void searchQueryChanged();
-    void globalSearchQueryChanged();
     void noResultsHintChanged();
 
 private Q_SLOTS:
     void synchronizeStates();
-    void onSearchFinished(unity::dash::Lens::Hints const &);
+    void onSearchFinished(const std::string &, unity::glib::HintsMap const &);
 
 private:
     void onResultsSwarmNameChanged(const std::string&);
     void onResultsChanged(const unity::dash::Results::Ptr&);
-    void onGlobalResultsSwarmNameChanged(const std::string&);
-    void onGlobalResultsChanged(const unity::dash::Results::Ptr&);
+    void onResultsModelChanged(unity::glib::Object<DeeModel>);
     void onCategoriesSwarmNameChanged(const std::string&);
+    void onCategoriesModelChanged(unity::glib::Object<DeeModel>);
     void onCategoriesChanged(const unity::dash::Categories::Ptr&);
-    void onViewTypeChanged(unity::dash::ViewType);
 
-    void onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&);
+    void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);
     void fallbackActivate(const QString& uri);
 
-    unity::dash::Lens::Ptr m_unityLens;
+    unity::dash::Scope::Ptr m_unityScope;
     DeeListModel* m_results;
-    DeeListModel* m_globalResults;
     Categories* m_categories;
     QString m_searchQuery;
-    QString m_globalSearchQuery;
     QString m_noResultsHint;
 };
 
-Q_DECLARE_METATYPE(Lens*)
+Q_DECLARE_METATYPE(Scope*)
 
-#endif // LENS_H
+#endif // SCOPE_H

=== renamed file 'plugins/Unity/lenses.cpp' => 'plugins/Unity/scopes.cpp'
--- plugins/Unity/lenses.cpp	2013-06-05 22:03:08 +0000
+++ plugins/Unity/scopes.cpp	2013-06-19 20:05:35 +0000
@@ -18,49 +18,44 @@
  */
 
 // Self
-#include "lenses.h"
+#include "scopes.h"
 
 // Local
-#include "lens.h"
+#include "scope.h"
 
 // Qt
 #include <QDebug>
 #include <QtCore/QStringList>
 #include <QtGui/QKeySequence>
 
-// libunity-core
-#include <UnityCore/FilesystemLenses.h>
-#include <UnityCore/HomeLens.h>
-
-Lenses::Lenses(QObject *parent)
+Scopes::Scopes(QObject *parent)
     : QAbstractListModel(parent)
-    , m_unityLenses(std::make_shared<unity::dash::FilesystemLenses>())
-    , m_homeLens(std::make_shared<unity::dash::HomeLens>(QString::fromUtf8(dgettext("unity", "Home")).toStdString(),
-                                                         QString::fromUtf8(dgettext("unity", "Home screen")).toStdString(),
-                                                         QString::fromUtf8(dgettext("unity", "Search")).toStdString()))
+    , m_unityScopes(std::make_shared<unity::dash::GSettingsScopes>())
     , m_loaded(false)
 {
-    m_roles[Lenses::RoleLens] = "lens";
-    m_roles[Lenses::RoleId] = "id";
-    m_roles[Lenses::RoleVisible] = "visible";
+    m_roles[Scopes::RoleScope] = "scope";
+    m_roles[Scopes::RoleId] = "id";
+    m_roles[Scopes::RoleVisible] = "visible";
 
-    m_homeLens->AddLenses(m_unityLenses);
-    std::dynamic_pointer_cast<unity::dash::FilesystemLenses>(m_unityLenses)->lenses_loaded.connect(sigc::mem_fun(this, &Lenses::onLensesLoaded));
+    m_unityScopes->scope_added.connect(sigc::mem_fun(this, &Scopes::onScopeAdded));
+    m_unityScopes->scope_removed.connect(sigc::mem_fun(this, &Scopes::onScopeRemoved));
+    m_unityScopes->scopes_reordered.connect(sigc::mem_fun(this, &Scopes::onScopesReordered));
+    m_unityScopes->LoadScopes();
 }
 
-QHash<int, QByteArray> Lenses::roleNames() const
+QHash<int, QByteArray> Scopes::roleNames() const
 {
     return m_roles;
 }
 
-int Lenses::rowCount(const QModelIndex& parent) const
+int Scopes::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent)
 
-    return m_lenses.count();
+    return m_scopes.count();
 }
 
-QVariant Lenses::data(const QModelIndex& index, int role) const
+QVariant Scopes::data(const QModelIndex& index, int role) const
 {
     Q_UNUSED(role)
 
@@ -68,115 +63,114 @@
         return QVariant();
     }
 
-    Lens* lens = m_lenses.at(index.row());
+    Scope* scope = m_scopes.at(index.row());
 
-    if (role == Lenses::RoleLens) {
-        return QVariant::fromValue(lens);
-    } else if (role == Lenses::RoleId) {
-        return QVariant::fromValue(lens->id());
-    } else if (role == Lenses::RoleVisible) {
-        return QVariant::fromValue(lens->visible());
+    if (role == Scopes::RoleScope) {
+        return QVariant::fromValue(scope);
+    } else if (role == Scopes::RoleId) {
+        return QVariant::fromValue(scope->id());
+    } else if (role == Scopes::RoleVisible) {
+        return QVariant::fromValue(scope->visible());
     } else {
         return QVariant();
     }
 }
 
-QVariant Lenses::get(int row) const
+QVariant Scopes::get(int row) const
 {
     return data(QAbstractListModel::index(row), 0);
 }
 
-QVariant Lenses::get(const QString& lens_id) const
+QVariant Scopes::get(const QString& scope_id) const
 {
-    Q_FOREACH(Lens* lens, m_lenses) {
-        if (lens->id() == lens_id) {
-            return QVariant::fromValue(lens);
+    Q_FOREACH(Scope* scope, m_scopes) {
+        if (scope->id() == scope_id) {
+            return QVariant::fromValue(scope);
         }
     }
 
     return QVariant();
 }
 
-bool Lenses::loaded() const
+bool Scopes::loaded() const
 {
     return m_loaded;
 }
 
-void Lenses::onLensAdded(const unity::dash::Lens::Ptr& lens)
+void Scopes::onScopeAdded(const unity::dash::Scope::Ptr& scope, int /*position*/)
 {
-    int index = m_lenses.count();
+    int index = m_scopes.count();
     beginInsertRows(QModelIndex(), index, index);
-    addUnityLens(lens);
+    addUnityScope(scope);
     endInsertRows();
-}
-
-void Lenses::onLensesLoaded()
-{
-    /* FIXME: this is temporary code that is required on mobile to order
-       the lenses according to the design.
-    */
-    QStringList staticLenses;
-    staticLenses << "mockmusic.lens" << "people.lens" << "home.lens" << "applications.lens" << "mockvideos.lens";
-
-    // not all the lenses are guaranteed to go into the model (only if their UnitCore counterparts exist);
-    // so build up a list of the valid ones, then add them later.
-    QList<unity::dash::Lens::Ptr> added_lenses;
-
-    // add statically ordered lenses
-    Q_FOREACH(QString lensId, staticLenses) {
-        if (lensId == "home.lens") {
-            added_lenses << m_homeLens;
-        } else {
-            unity::dash::Lens::Ptr lens = m_unityLenses->GetLens(lensId.toStdString());
-            if (lens != NULL) {
-                added_lenses << lens;
-            }
-        }
-    }
-
-    // add remaining lenses
-    unity::dash::Lenses::LensList lensesList = m_unityLenses->GetLenses();
-    for(auto it = lensesList.begin(); it != lensesList.end(); ++it) {
-        unity::dash::Lens::Ptr lens = (*it);
-        if (!staticLenses.contains(QString::fromStdString(lens->id))) {
-            added_lenses << lens;
-        }
-    }
-
-    if (added_lenses.count() > 0) {
-        int index = rowCount();
-        beginInsertRows(QModelIndex(), index, index+added_lenses.count()-1);
-        Q_FOREACH(unity::dash::Lens::Ptr lens, added_lenses) {
-            addUnityLens(lens);
-        }
-        endInsertRows();
-    }
-
+
+    // FIXME: do only once after all loaded?
     m_loaded = true;
     Q_EMIT loadedChanged(m_loaded);
-
-    // listen to dynamically added lenses
-    m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
-}
-
-void Lenses::onLensPropertyChanged()
-{
-    QModelIndex lensIndex = index(m_lenses.indexOf(qobject_cast<Lens*>(sender())));
-    Q_EMIT dataChanged(lensIndex, lensIndex);
-}
-
-void Lenses::addUnityLens(const unity::dash::Lens::Ptr& unity_lens)
-{
-    Lens* lens = new Lens(this);
-    lens->setUnityLens(unity_lens);
+}
+
+void Scopes::onScopesLoaded()
+{
+}
+
+void Scopes::onScopeRemoved(const unity::dash::Scope::Ptr& scope)
+{
+    auto id = QString::fromStdString(scope->id);
+    auto index = findScopeById(id);
+    if (index >= 0) {
+        beginRemoveRows(QModelIndex(), index, index);
+        removeUnityScope(index);
+        endRemoveRows();
+
+        Q_EMIT scopeRemoved(id, index);
+    }
+}
+
+void Scopes::onScopesReordered(const unity::dash::Scopes::ScopeList& scopes)
+{
+    // FIXME Should use beginMoveRows()/endMoveRows() to not recreate the UI for every scope.
+    beginResetModel();
+
+    // remove existing scopes
+    for (auto i=m_scopes.count()-1; i>=0; i--) {
+        removeUnityScope(i);
+    }
+
+    // re-create scopes
+    for (uint i=0; i<scopes.size(); i++) {
+        addUnityScope(scopes[i]);
+    }
+    endResetModel();
+}
+
+void Scopes::onScopePropertyChanged()
+{
+    QModelIndex scopeIndex = index(m_scopes.indexOf(qobject_cast<Scope*>(sender())));
+    Q_EMIT dataChanged(scopeIndex, scopeIndex);
+}
+
+void Scopes::addUnityScope(const unity::dash::Scope::Ptr& unity_scope)
+{
+    Scope* scope = new Scope(this);
+    scope->setUnityScope(unity_scope);
     /* DOCME */
-    QObject::connect(lens, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));
-    m_lenses.append(lens);
-}
-
-void Lenses::removeUnityLens(int index)
-{
-    Lens* lens = m_lenses.takeAt(index);
-
-    delete lens;
+    QObject::connect(scope, SIGNAL(visibleChanged(bool)), this, SLOT(onScopePropertyChanged()));
+    m_scopes.append(scope);
+}
+
+void Scopes::removeUnityScope(int index)
+{
+    Scope* scope = m_scopes.takeAt(index);
+
+    delete scope;
+}
+
+int Scopes::findScopeById(const QString& scope_id)
+{
+    for (int i=0; i<m_scopes.count(); i++) {
+        if (m_scopes[i]->id() == scope_id) {
+            return i;
+        }
+    }
+    return -1;
 }

=== renamed file 'plugins/Unity/lenses.h' => 'plugins/Unity/scopes.h'
--- plugins/Unity/lenses.h	2013-06-05 22:03:08 +0000
+++ plugins/Unity/scopes.h	2013-06-19 20:05:35 +0000
@@ -17,29 +17,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LENSES_H
-#define LENSES_H
+#ifndef SCOPES_H
+#define SCOPES_H
 
 // Qt
 #include <QAbstractListModel>
 #include <QList>
 
 // libunity-core
-#include <UnityCore/Lens.h>
-#include <UnityCore/HomeLens.h>
+#include <UnityCore/Scope.h>
+#include <UnityCore/GSettingsScopes.h>
 
 namespace unity
 {
 namespace dash
 {
-class Lenses;
+class Scopes;
 }
 }
 
 class Hotkey;
-class Lens;
+class Scope;
 
-class Lenses : public QAbstractListModel
+class Scopes : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -48,11 +48,11 @@
     Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
 
 public:
-    explicit Lenses(QObject *parent = 0);
-    ~Lenses() = default;
+    explicit Scopes(QObject *parent = 0);
+    ~Scopes() = default;
 
     enum Roles {
-        RoleLens,
+        RoleScope,
         RoleId,
         RoleVisible
     };
@@ -61,30 +61,34 @@
     Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
     Q_INVOKABLE QVariant get(int row) const;
-    Q_INVOKABLE QVariant get(const QString& lens_id) const;
+    Q_INVOKABLE QVariant get(const QString& scope_id) const;
 
     QHash<int, QByteArray> roleNames() const;
 
     bool loaded() const;
 
 Q_SIGNALS:
-    void activateLensRequested(const QString& lens_id);
+    void activateScopeRequested(const QString& scope_id);
     void loadedChanged(bool loaded);
+    void scopeRemoved(const QString& scope_id, int index);
 
 private Q_SLOTS:
-    void onLensAdded(const unity::dash::Lens::Ptr& lens);
-    void onLensesLoaded();
-    void onLensPropertyChanged();
+    void onScopesLoaded();
+    void onScopeAdded(const unity::dash::Scope::Ptr& scope, int position);
+    void onScopeRemoved(const unity::dash::Scope::Ptr& scope);
+    void onScopesReordered(const unity::dash::Scopes::ScopeList& scopes);
+    void onScopePropertyChanged();
 
 private:
-    unity::dash::Lenses::Ptr m_unityLenses;
-    unity::dash::HomeLens::Ptr m_homeLens;
-    QList<Lens*> m_lenses;
+    unity::dash::GSettingsScopesReader::Ptr m_scopesReader;
+    unity::dash::Scopes::Ptr m_unityScopes;
+    QList<Scope*> m_scopes;
     QHash<int, QByteArray> m_roles;
     bool m_loaded;
 
-    void addUnityLens(const unity::dash::Lens::Ptr& unity_lens);
-    void removeUnityLens(int index);
+    void addUnityScope(const unity::dash::Scope::Ptr& unity_scope);
+    void removeUnityScope(int index);
+    int findScopeById(const QString& scope_id);
 };
 
-#endif // LENSES_H
+#endif // SCOPES_H

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2013-06-19 15:07:15 +0000
+++ po/unity8.pot	2013-06-19 20:05:35 +0000
@@ -109,27 +109,19 @@
 msgid "Apps"
 msgstr ""
 
+#: Dash/DashHome.qml:40
+msgid "Frequent Apps"
+msgstr ""
+
 #: Dash/DashHome.qml:43
-msgid "Frequent Apps"
+msgid "Recent Music"
 msgstr ""
 
 #: Dash/DashHome.qml:46
-msgid "Favourite People"
-msgstr ""
-
-#: Dash/DashHome.qml:49
-msgid "People Recently in Touch"
-msgstr ""
-
-#: Dash/DashHome.qml:52
-msgid "Recent Music"
-msgstr ""
-
-#: Dash/DashHome.qml:55
 msgid "Videos Popular Online"
 msgstr ""
 
-#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
+#: Dash/DashHome.qml:175
 msgid "Home"
 msgstr ""
 
@@ -153,26 +145,6 @@
 msgid "Music"
 msgstr ""
 
-#: Dash/DashPeople.qml:31
-msgid "Favourites"
-msgstr ""
-
-#: Dash/DashPeople.qml:32
-msgid "Recently in touch"
-msgstr ""
-
-#: Dash/DashPeople.qml:33
-msgid "New Contacts"
-msgstr ""
-
-#: Dash/DashPeople.qml:34
-msgid "A-Z"
-msgstr ""
-
-#: Dash/DashPeople.qml:123
-msgid "People"
-msgstr ""
-
 #: Dash/DashVideos.qml:31
 msgid "Popular Online"
 msgstr ""
@@ -234,16 +206,17 @@
 msgid "Flight mode"
 msgstr ""
 
-#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
+#: Panel/SearchIndicator.qml:26
 msgid "Search"
 msgstr ""
 
-#: plugins/Unity/lens.cpp:333
+#: plugins/Unity/scope.cpp:268
 msgid "Sorry, there is nothing that matches your search."
 msgstr ""
 
-#: plugins/Unity/lenses.cpp:39
-msgid "Home screen"
+#: Shell.qml:380
+#, qt-format
+msgid "Please enter %1:"
 msgstr ""
 
 #: Shell.qml:380

=== modified file 'tests/autopilot/unity8/tests/helpers.py'
--- tests/autopilot/unity8/tests/helpers.py	2013-06-05 22:03:08 +0000
+++ tests/autopilot/unity8/tests/helpers.py	2013-06-19 20:05:35 +0000
@@ -71,7 +71,7 @@
             self.touch.drag(start_x, start_y, stop_x, stop_y)
 
         # Because the shell loads up lots of stuff, unlocking the greeter can
-        # be a bit stuttery while lenses are still consuming all resources.
+        # be a bit stuttery while scopes are still consuming all resources.
         # Give it another (max retries) chance
         try:
             self.assertThat(greeter.created, Eventually(Equals(False)))

=== modified file 'tests/autopilot/unity8/tests/testhud.py'
--- tests/autopilot/unity8/tests/testhud.py	2013-06-11 15:45:45 +0000
+++ tests/autopilot/unity8/tests/testhud.py	2013-06-19 20:05:35 +0000
@@ -73,7 +73,7 @@
         super(TestHud, self).setUp("%sx%s" % (self.app_width / divisor, self.app_height / divisor), "%s" % (self.grid_unit_px / divisor))
 
         dash = self.main_window.get_dash()
-        self.assertThat(dash.showLensOnLoaded, Eventually(Equals(""), timeout=30))
+        self.assertThat(dash.showScopeOnLoaded, Eventually(Equals(""), timeout=30))
 
     def test_show_hud(self):
         hud = self.main_window.get_hud()

=== modified file 'tests/autopilot/unity8/tests/testlockscreen.py'
--- tests/autopilot/unity8/tests/testlockscreen.py	2013-06-12 07:59:03 +0000
+++ tests/autopilot/unity8/tests/testlockscreen.py	2013-06-19 20:05:35 +0000
@@ -71,7 +71,7 @@
         super(TestLockscreens, self).setUp("%sx%s" % (self.app_width / divisor, self.app_height / divisor), "%s" % (self.grid_unit_px / divisor))
 
         dash = self.main_window.get_dash()
-        self.assertThat(dash.showLensOnLoaded, Eventually(Equals(""), timeout=30))
+        self.assertThat(dash.showScopeOnLoaded, Eventually(Equals(""), timeout=30))
 
     def test_unlock(self):
         self.unlock_greeter()

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-06-19 18:10:57 +0000
+++ tests/qmltests/CMakeLists.txt	2013-06-19 20:05:35 +0000
@@ -41,13 +41,11 @@
 add_qml_test(Dash DashBar IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Dash DashContent IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Dash DashPreview)
-add_qml_test(Dash GenericLensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Dash LensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
-add_qml_test(Dash PeoplePreview)
+add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
+add_qml_test(Dash ScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
 add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
                                            ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
-add_qml_test(Dash/People PeopleFilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Greeter Lockscreen IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
                              PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
 add_qml_test(Greeter Tablet IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks

=== removed directory 'tests/qmltests/Dash/People'
=== removed file 'tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml'
--- tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import ".."
-import "../.."
-import "../../../../Dash/People"
-import Ubuntu.Components 0.1
-import Unity.Test 0.1 as UT
-
-Item {
-    id: root
-    width: units.gu(120)
-    height: units.gu(40)
-
-    PeopleFilterGrid {
-        id: peopleFilterGrid
-        anchors.fill: parent
-        model: mockModel
-    }
-
-    SignalSpy {
-        id: signalSpy
-        target: peopleFilterGrid
-        signalName: "clicked"
-    }
-
-    ListModel {
-        id: mockModel
-
-        ListElement {
-            column_0: 'user://001'
-            column_1: "gtk-apply"
-            column_2: ""
-            column_3: ""
-            column_4: "User 1"
-            column_5: "Text 1"
-        }
-
-        ListElement {
-            column_0: 'user://002'
-            column_1: "gtk-apply"
-            column_2: ""
-            column_3: ""
-            column_4: "User 2"
-            column_5: "Text 2"
-        }
-
-        ListElement {
-            column_0: 'user://003'
-            column_1: "gtk-apply"
-            column_2: ""
-            column_3: ""
-            column_4: "User 3"
-            column_5: "Text 3"
-        }
-
-        ListElement {
-            column_0: 'user://004'
-            column_1: "gtk-apply"
-            column_2: ""
-            column_3: ""
-            column_4: "User 4"
-            column_5: "Text 4"
-        }
-
-        ListElement {
-            column_0: 'user://005'
-            column_1: "gtk-apply"
-            column_2: ""
-            column_3: ""
-            column_4: "User 5"
-            column_5: "Text 5"
-        }
-
-    }
-
-    UT.UnityTestCase {
-        id: testCase
-        name: "DashPeopleFilterGrid"
-        when: windowShown
-
-        function init() {
-        }
-
-        function test_clickCell_data() {
-            return [
-                {
-                    x: peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth/2,
-                    y: peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight/2,
-                    index: 0,
-                    uri: "user://001"
-                },
-                {
-                    x: 2*peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth+peopleFilterGrid.cellWidth/2,
-                    y: peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight/2,
-                    index: 1,
-                    uri: "user://002"
-                },
-                {
-                    x: 3*peopleFilterGrid.minimumHorizontalSpacing+2*peopleFilterGrid.cellWidth+peopleFilterGrid.cellWidth/2,
-                    y: peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight/2,
-                    index: 2,
-                    uri: "user://003"
-                },
-                {
-                    x: peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth/2,
-                    y: 2*peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight+peopleFilterGrid.cellHeight/2,
-                    index: 3,
-                    uri: "user://004"
-                },
-                {
-                    x: 2*peopleFilterGrid.minimumHorizontalSpacing+peopleFilterGrid.cellWidth+peopleFilterGrid.cellWidth/2,
-                    y: 2*peopleFilterGrid.verticalSpacing+peopleFilterGrid.cellHeight+peopleFilterGrid.cellHeight/2,
-                    index: 4,
-                    uri: "user://005"
-                },
-            ]
-        }
-
-        function test_columns() {
-            compare(peopleFilterGrid.columns,3)
-        }
-
-        function test_clickCell(data) {
-            tryCompare(peopleFilterGrid, "flicking", false)
-            tryCompare(peopleFilterGrid, "moving", false)
-            signalSpy.clear()
-            wait(peopleFilterGrid.pressDelay > 0 ? peopleFilterGrid.pressDelay : 5)
-            mouseClick(peopleFilterGrid, data.x, data.y)
-            tryCompare(peopleFilterGrid, "flicking", false)
-            tryCompare(peopleFilterGrid, "moving", false)
-            compare(signalSpy.count, 1)
-            compare(signalSpy.signalArguments.length, 1, "signalArguments.length != 1")
-            compare(signalSpy.signalArguments[0][0], data.index)
-            compare(signalSpy.signalArguments[0][1]["uri"], data.uri)
-        }
-
-    }
-}

=== renamed file 'tests/qmltests/Dash/qml/FakeLensView.qml' => 'tests/qmltests/Dash/qml/FakeScopeView.qml'
--- tests/qmltests/Dash/qml/FakeLensView.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/qml/FakeScopeView.qml	2013-06-19 20:05:35 +0000
@@ -18,8 +18,8 @@
 import Unity 0.1
 
 FocusScope {
-    id: fakeLensView
-    property Lens lens : null
+    id: fakeScopeView
+    property Scope scope : null
     property bool isCurrent : false
 
     property ListModel searchHistory
@@ -31,18 +31,18 @@
     property alias backColor : back.color
 
     onEndReached: {
-        if (shell != undefined && shell.lensStatus != undefined) {
-            shell.lensStatus[lens.id].endReached++;
+        if (shell != undefined && shell.scopeStatus != undefined) {
+            shell.scopeStatus[scope.id].endReached++;
         }
     }
     onMovementStarted: {
-        if (shell != undefined && shell.lensStatus != undefined) {
-            shell.lensStatus[lens.id].movementStarted++;
+        if (shell != undefined && shell.scopeStatus != undefined) {
+            shell.scopeStatus[scope.id].movementStarted++;
         }
     }
     onPositionedAtBeginning: {
-        if (shell != undefined && shell.lensStatus != undefined) {
-            shell.lensStatus[lens.id].positionedAtBeginning++;
+        if (shell != undefined && shell.scopeStatus != undefined) {
+            shell.scopeStatus[scope.id].positionedAtBeginning++;
         }
     }
 
@@ -68,7 +68,7 @@
     ListView {
         id: listView
         anchors.fill: parent
-        model: lens ? lens.categories : null
+        model: scope ? scope.categories : null
         orientation: ListView.Vertical
 
         delegate:  Column {

=== renamed file 'tests/qmltests/Dash/qml/fake_generic_lensView.qml' => 'tests/qmltests/Dash/qml/fake_generic_scopeView.qml'
--- tests/qmltests/Dash/qml/fake_generic_lensView.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/qml/fake_generic_scopeView.qml	2013-06-19 20:05:35 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.0
 
-FakeLensView {
-    id: fake_generic_lensView
-    objectName: "fake_generic_lensView"
+FakeScopeView {
+    id: fake_generic_scopeView
+    objectName: "fake_generic_scopeView"
 
     backColor: "#D0D0D0"
 }

=== renamed file 'tests/qmltests/Dash/qml/fake_lensView1.qml' => 'tests/qmltests/Dash/qml/fake_scopeView1.qml'
--- tests/qmltests/Dash/qml/fake_lensView1.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/qml/fake_scopeView1.qml	2013-06-19 20:05:35 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.0
 
-FakeLensView {
-    id: fake_lensView1
-    objectName: "fake_lensView1"
+FakeScopeView {
+    id: fake_scopeView1
+    objectName: "fake_scopeView1"
 
     backColor: "#909090"
 }

=== renamed file 'tests/qmltests/Dash/qml/fake_lensView2.qml' => 'tests/qmltests/Dash/qml/fake_scopeView2.qml'
--- tests/qmltests/Dash/qml/fake_lensView2.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/qml/fake_scopeView2.qml	2013-06-19 20:05:35 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.0
 
-FakeLensView {
-    id: fake_lensView2
-    objectName: "fake_lensView2"
+FakeScopeView {
+    id: fake_scopeView2
+    objectName: "fake_scopeView2"
 
     backColor: "#A0A0A0"
 }

=== renamed file 'tests/qmltests/Dash/qml/fake_lensView3.qml' => 'tests/qmltests/Dash/qml/fake_scopeView3.qml'
--- tests/qmltests/Dash/qml/fake_lensView3.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/qml/fake_scopeView3.qml	2013-06-19 20:05:35 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.0
 
-FakeLensView {
-    id: fake_lensView3
-    objectName: "fake_lensView3"
+FakeScopeView {
+    id: fake_scopeView3
+    objectName: "fake_scopeView3"
 
     backColor: "#B0B0B0"
 }

=== renamed file 'tests/qmltests/Dash/qml/fake_lensView4.qml' => 'tests/qmltests/Dash/qml/fake_scopeView4.qml'
--- tests/qmltests/Dash/qml/fake_lensView4.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/qml/fake_scopeView4.qml	2013-06-19 20:05:35 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.0
 
-FakeLensView {
-    id: fake_lensView4
-    objectName: "fake_lensView4"
+FakeScopeView {
+    id: fake_scopeView4
+    objectName: "fake_scopeView4"
 
     backColor: "#C0C0C0"
 }

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2013-06-19 20:05:35 +0000
@@ -30,79 +30,79 @@
     Dash {
         id: dash
         anchors.fill: parent
-        showLensOnLoaded: "MockLens2"
+        showScopeOnLoaded: "MockScope2"
     }
 
-    LensDelegateMapper {
-        id: lensDelegateMapper
-        lensDelegateMapping: {
-            "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
-            "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
-            "MockLens3": "../tests/qmltests/Dash/qml/fake_lensView3.qml",
-            "MockLens4": "../tests/qmltests/Dash/qml/fake_lensView4.qml"
+    ScopeDelegateMapper {
+        id: scopeDelegateMapper
+        scopeDelegateMapping: {
+            "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
+            "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
+            "MockScope3": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
+            "MockScope4": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
         }
-        genericLens: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
+        genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
     }
 
     UT.UnityTestCase {
         name: "Dash"
         when: windowShown
 
-        property var lenses
+        property var scopes
 
         Component.onCompleted: {
             var dashContent = findChild(dash, "dashContent");
-            dashContent.lensMapper = lensDelegateMapper;
-            lenses = dashContent.lenses;
+            dashContent.scopeMapper = scopeDelegateMapper;
+            scopes = dashContent.scopes;
         }
 
         function init() {
-            // clear and reload the lenses.
-            lenses.clear();
+            // clear and reload the scopes.
+            scopes.clear();
             var dashContentList = findChild(dash, "dashContentList");
             verify(dashContentList != undefined);
             tryCompare(dashContentList, "count", 0);
-            lenses.load();
+            scopes.load();
         }
 
-        function get_lens_data() {
+        function get_scope_data() {
             return [
-                        { tag: "MockLens1", visualIndex: 0, shouldBeVisible: true },
-                        { tag: "MockLens2", visualIndex: -1, shouldBeVisible: false },
-                        { tag: "MockLens3", visualIndex: 1, shouldBeVisible: true },
-                        { tag: "MockLens4", visualIndex: 2, shouldBeVisible: true },
-                        { tag: "MockLens5", visualIndex: 3, shouldBeVisible: true },
+                        { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },
+                        { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },
+                        { tag: "MockScope3", visualIndex: 1, shouldBeVisible: true },
+                        { tag: "MockScope4", visualIndex: 2, shouldBeVisible: true },
+                        { tag: "MockScope5", visualIndex: 3, shouldBeVisible: true },
             ]
         }
 
-        function test_set_current_lens_data() {
-            return get_lens_data()
+        function test_set_current_scope_data() {
+            return get_scope_data()
         }
 
-        function test_set_current_lens(data) {
-            // wait for lenses to load
-            tryCompare(lenses, "loaded", true);
+        function test_set_current_scope(data) {
+            // wait for scopes to load
+            tryCompare(scopes, "loaded", true);
 
             var dashbar = findChild(dash, "dashbar");
             verify(dashbar != undefined)
             var dashContent = findChild(dash, "dashContent");
             var current_index = dashContent.currentIndex;
 
-            dash.setCurrentLens(data.tag, true /* animate */, false /* reset */);
+            dash.setCurrentScope(data.tag, true /* animate */, false /* reset */);
             compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
             compare(dashbar.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
         }
 
-        function test_show_lens_on_load_data() {
-            return get_lens_data()
+        function test_show_scope_on_load_data() {
+            return get_scope_data()
         }
 
-        function test_show_lens_on_load(data) {
+        function test_show_scope_on_load(data) {
             if (data.shouldBeVisible == false) {
                 console.log("Not testing " + data.tag + ": not visible");
                 return;
             }
-            dash.showLensOnLoaded = data.tag
+            dash.showScopeOnLoaded = data.tag
 
             var dashContentList = findChild(dash, "dashContentList");
             verify(dashContentList != undefined);
@@ -110,7 +110,7 @@
         }
 
         function test_dash_bar_set_index_connection_data() {
-            return get_lens_data()
+            return get_scope_data()
         }
 
         function test_dash_bar_set_index_connection(data) {
@@ -118,8 +118,8 @@
                 console.log("Not testing " + data.tag + ": not visible");
                 return;
             }
-            // wait for lenses to load
-            tryCompare(lenses, "loaded", true);
+            // wait for scopes to load
+            tryCompare(scopes, "loaded", true);
 
             var dashbar = findChild(dash, "dashbar");
             verify(dashbar != undefined)

=== modified file 'tests/qmltests/Dash/tst_DashBar.qml'
--- tests/qmltests/Dash/tst_DashBar.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/Dash/tst_DashBar.qml	2013-06-19 20:05:35 +0000
@@ -34,12 +34,12 @@
             right: parent.right
             bottom: parent.bottom
         }
-        model: lenses
+        model: scopes
         onItemSelected: currentIndex = index
     }
 
-    Lenses {
-        id: lenses
+    Scopes {
+        id: scopes
     }
 
     SignalSpy {
@@ -50,7 +50,7 @@
 
     UT.UnityTestCase {
         name: "DashBar"
-        when: lenses.loaded
+        when: scopes.loaded
 
         property alias model: dashBar.model
         property alias currentIndex: dashBar.currentIndex

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2013-06-11 10:36:55 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2013-06-19 20:05:35 +0000
@@ -28,60 +28,60 @@
 
     property ListModel searchHistory: ListModel {}
 
-    property var lensStatus: {
-        'MockLens1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
-        'MockLens2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
-        'MockLens3': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
-        'MockLens4': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
-        'MockLens5': { 'movementStarted': 0, 'positionedAtBeginning': 0 }
+    property var scopeStatus: {
+        'MockScope1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
+        'MockScope2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
+        'MockScope3': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
+        'MockScope4': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
+        'MockScope5': { 'movementStarted': 0, 'positionedAtBeginning': 0 }
     }
 
-    Lenses {
-        id: lensesModel
+    Scopes {
+        id: scopesModel
     }
 
     DashContent {
         id: dashContent
         anchors.fill: parent
 
-        model: lensesModel
-        lenses : lensesModel
+        model: scopesModel
+        scopes : scopesModel
 
-        lensMapper : lensDelegateMapper
+        scopeMapper : scopeDelegateMapper
     }
 
-    LensDelegateMapper {
-        id: lensDelegateMapper
-        lensDelegateMapping: {
-            "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
-            "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
-            "MockLens3": "../tests/qmltests/Dash/qml/fake_lensView3.qml",
-            "MockLens4": "../tests/qmltests/Dash/qml/fake_lensView4.qml"
+    ScopeDelegateMapper {
+        id: scopeDelegateMapper
+        scopeDelegateMapping: {
+            "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
+            "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
+            "MockScope3": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
+            "MockScope4": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
         }
-        genericLens: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
+        genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
     }
 
-    function clear_lens_status() {
-        lensStatus["MockLens1"].movementStarted = 0;
-        lensStatus["MockLens1"].positionedAtBeginning = 0;
-
-        lensStatus["MockLens2"].movementStarted = 0;
-        lensStatus["MockLens2"].positionedAtBeginning = 0;
-
-        lensStatus["MockLens3"].movementStarted = 0;
-        lensStatus["MockLens3"].positionedAtBeginning = 0;
-
-        lensStatus["MockLens4"].movementStarted = 0;
-        lensStatus["MockLens4"].positionedAtBeginning = 0;
-
-        lensStatus["MockLens5"].movementStarted = 0;
-        lensStatus["MockLens5"].positionedAtBeginning = 0;
+    function clear_scope_status() {
+        scopeStatus["MockScope1"].movementStarted = 0;
+        scopeStatus["MockScope1"].positionedAtBeginning = 0;
+
+        scopeStatus["MockScope2"].movementStarted = 0;
+        scopeStatus["MockScope2"].positionedAtBeginning = 0;
+
+        scopeStatus["MockScope3"].movementStarted = 0;
+        scopeStatus["MockScope3"].positionedAtBeginning = 0;
+
+        scopeStatus["MockScope4"].movementStarted = 0;
+        scopeStatus["MockScope4"].positionedAtBeginning = 0;
+
+        scopeStatus["MockScope5"].movementStarted = 0;
+        scopeStatus["MockScope5"].positionedAtBeginning = 0;
     }
 
     SignalSpy {
-        id: lensLoadedSpy
+        id: scopeLoadedSpy
         target: dashContent
-        signalName: "lensLoaded"
+        signalName: "scopeLoaded"
     }
 
     SignalSpy {
@@ -101,78 +101,81 @@
         when: windowShown
 
         function init() {
-            lensLoadedSpy.clear();
+            scopeLoadedSpy.clear();
             movementStartedSpy.clear();
             contentEndReachedSpy.clear()
-            clear_lens_status();
+            clear_scope_status();
 
-            // clear, wait for dahs to empty and load lenses.
+            // clear, wait for dahs to empty and load scopes.
             var dashContentList = findChild(dashContent, "dashContentList");
             verify(dashContentList != undefined)
-            lensesModel.clear();
+            scopesModel.clear();
             tryCompare(dashContentList, "count", 0);
-            lensesModel.load();
+            scopesModel.load();
         }
 
         function test_movement_started_signal() {
-            dashContent.setCurrentLensAtIndex(3, true, false);
+            dashContent.setCurrentScopeAtIndex(3, true, false);
 
             var dashContentList = findChild(dashContent, "dashContentList");
             verify(dashContentList != undefined)
-            tryCompare(lensLoadedSpy, "count", 5);
+
+            tryCompare(scopeLoadedSpy, "count", 5);
 
             dashContentList.movementStarted();
+
             compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");
-            compare(lensStatus["MockLens1"].movementStarted, 1, "MockLens1 should have emitted movementStarted signal when content list did.");
-            compare(lensStatus["MockLens2"].movementStarted, 1, "MockLens2 should have emitted movementStarted signal when content list did.");
-            compare(lensStatus["MockLens3"].movementStarted, 1, "MockLens3 should have emitted movementStarted signal when content list did.");
-            compare(lensStatus["MockLens4"].movementStarted, 1, "MockLens4 should have emitted movementStarted signal when content list did.");
-            compare(lensStatus["MockLens5"].movementStarted, 1, "MockLens5 should have emitted movementStarted signal when content list did.");
+            compare(scopeStatus["MockScope1"].movementStarted, 1, "MockScope1 should have emitted movementStarted signal when content list did.");
+            compare(scopeStatus["MockScope2"].movementStarted, 1, "MockScope2 should have emitted movementStarted signal when content list did.");
+            compare(scopeStatus["MockScope3"].movementStarted, 1, "MockScope3 should have emitted movementStarted signal when content list did.");
+            compare(scopeStatus["MockScope4"].movementStarted, 1, "MockScope4 should have emitted movementStarted signal when content list did.");
+            compare(scopeStatus["MockScope5"].movementStarted, 1, "MockScope5 should have emitted movementStarted signal when content list did.");
         }
 
         function test_positioned_at_beginning_signal() {
-            dashContent.setCurrentLensAtIndex(3, true, false);
+            dashContent.setCurrentScopeAtIndex(3, true, false);
 
-            tryCompare(lensLoadedSpy, "count", 5);
+            tryCompare(scopeLoadedSpy, "count", 5);
 
             dashContent.positionedAtBeginning();
-            compare(lensStatus["MockLens1"].positionedAtBeginning, 1, "MockLens1 should have emitted positionedAtBeginning signal when DashContent did.");
-            compare(lensStatus["MockLens2"].positionedAtBeginning, 1, "MockLens2 should have emitted positionedAtBeginning signal when DashContent did.");
-            compare(lensStatus["MockLens3"].positionedAtBeginning, 1, "MockLens3 should have emitted positionedAtBeginning signal when DashContent did.");
-            compare(lensStatus["MockLens4"].positionedAtBeginning, 1, "MockLens4 should have emitted positionedAtBeginning signal when DashContent did.");
-            compare(lensStatus["MockLens5"].positionedAtBeginning, 1, "MockLens5 should have emitted positionedAtBeginning signal when DashContent did.");
+            compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");
+            compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");
+            compare(scopeStatus["MockScope3"].positionedAtBeginning, 1, "MockScope3 should have emitted positionedAtBeginning signal when DashContent did.");
+            compare(scopeStatus["MockScope4"].positionedAtBeginning, 1, "MockScope4 should have emitted positionedAtBeginning signal when DashContent did.");
+            compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");
         }
 
-        function test_lens_loaded() {
-            tryCompare(lensLoadedSpy, "count", 5);
+        function test_scope_loaded() {
+            tryCompare(scopeLoadedSpy, "count", 5);
         }
 
         function test_content_end_reached() {
             var dashContentList = findChild(dashContent, "dashContentList");
             verify(dashContentList != undefined);
-            tryCompare(lensLoadedSpy, "count", 5);
 
-            dashContent.setCurrentLensAtIndex(0, true, false);
+            tryCompare(scopeLoadedSpy, "count", 5);
+            dashContent.setCurrentScopeAtIndex(0, true, false);
             dashContentList.currentItem.item.endReached();
 
             compare(contentEndReachedSpy.count, 1);
         }
 
-        // This tests that setting the current lens index will end up at the correct index even if
-        // the lenses are loaded asynchrounsly.
-        function test_set_current_lens_index_async() {
-            verify(lensesModel.loaded == false);
+        // This tests that setting the current scope index will end up at the correct index even if
+        // the scopes are loaded asynchrounsly.
+        function test_set_current_scope_index_async() {
+            verify(scopesModel.loaded == false);
 
             // next index is 1 if current is -1, otherwise it's current + 1
             var next_index = ((dashContent.currentIndex == -1 ? 0 : dashContent.currentIndex) + 1) % 5
 
-            dashContent.setCurrentLensAtIndex(next_index, true, false);
+            dashContent.setCurrentScopeAtIndex(next_index, true, false);
             tryCompare(dashContent, "currentIndex", next_index);
-            verify(lensesModel.loaded == true);
+            verify(scopesModel.loaded == true);
 
-            // test greater than lens count.
-            dashContent.setCurrentLensAtIndex(lensesModel.count, true, false);
-            compare(dashContent.currentIndex, 4);
+            // test greater than scope count.
+            var currentScopeIndex = dashContent.currentIndex;
+            dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false);
+            compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
         }
 
         function get_current_item_object_name() {
@@ -187,18 +190,18 @@
             return "";
         }
 
-        function test_lens_mapping_data() {
+        function test_scope_mapping_data() {
             return [
-                {tag: "index0", index: 0, objectName: "fake_lensView1"},
-                {tag: "index1", index: 1, objectName: "fake_lensView2"},
-                {tag: "index2", index: 2, objectName: "fake_lensView3"},
-                {tag: "index3", index: 3, objectName: "fake_lensView4"},
-                {tag: "index4", index: 4, objectName: "fake_generic_lensView"}
+                {tag: "index0", index: 0, objectName: "fake_scopeView1"},
+                {tag: "index1", index: 1, objectName: "fake_scopeView2"},
+                {tag: "index2", index: 2, objectName: "fake_scopeView3"},
+                {tag: "index3", index: 3, objectName: "fake_scopeView4"},
+                {tag: "index4", index: 4, objectName: "fake_generic_scopeView"}
             ]
         }
 
-        function test_lens_mapping(data) {
-            dashContent.setCurrentLensAtIndex(data.index, true, false);
+        function test_scope_mapping(data) {
+            dashContent.setCurrentScopeAtIndex(data.index, true, false);
             tryCompareFunction(get_current_item_object_name, data.objectName)
         }
 

=== modified file 'tests/qmltests/Dash/tst_FilterGrids.qml'
--- tests/qmltests/Dash/tst_FilterGrids.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/Dash/tst_FilterGrids.qml	2013-06-19 20:05:35 +0000
@@ -108,7 +108,6 @@
         function test_clicked_signal_data() {
             return [
                 {tag: "VideosFilterGrid", component: "Video/VideosFilterGrid.qml"},
-                {tag: "PeopleFilterGrid", component: "People/PeopleFilterGrid.qml"},
                 {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"},
                 {tag: "ApplicationsFilterGrid", component: "Apps/ApplicationsFilterGrid.qml"}
             ]

=== renamed file 'tests/qmltests/Dash/tst_GenericLensView.qml' => 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericLensView.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2013-06-19 20:05:35 +0000
@@ -26,27 +26,27 @@
     width: units.gu(120)
     height: units.gu(80)
 
-    Lenses {
-        id: lenses
+    Scopes {
+        id: scopes
     }
 
-    GenericLensView {
-        id: genericLensView
+    GenericScopeView {
+        id: genericScopeView
         anchors.fill: parent
 
         UT.UnityTestCase {
-            name: "GenericLensView"
-            when: lenses.loaded
+            name: "GenericScopeView"
+            when: scopes.loaded
 
             function init() {
-                genericLensView.lens = lenses.get(0)
+                genericScopeView.scope = scopes.get(0)
             }
 
             function test_isCurrent() {
-                var pageHeader = findChild(genericLensView, "pageHeader");
-                genericLensView.isCurrent = true
+                var pageHeader = findChild(genericScopeView, "pageHeader");
+                genericScopeView.isCurrent = true
                 pageHeader.searchQuery = "test"
-                genericLensView.isCurrent = false
+                genericScopeView.isCurrent = false
                 tryCompare(pageHeader, "searchQuery", "")
             }
         }