Unity

Merge lp://qastaging/~stolowski/unity/phablet-new-libunity into lp://qastaging/unity/phablet

  1. phablet-new-libunity
  2. Merge into phablet
Proposed by Paweł Stołowski
Status: Superseded
Proposed branch: lp://qastaging/~stolowski/unity/phablet-new-libunity
Merge into: lp://qastaging/unity/phablet
Diff against target: 1966 lines (+308/-1072)
15 files modified
Dash/Dash.qml (+1/-1)
Dash/DashContent.qml (+2/-2)
Dash/GenericLensView.qml (+27/-2)
build_unity (+9/-7)
plugins/Unity/CMakeLists.txt (+2/-3)
plugins/Unity/categories.cpp (+20/-13)
plugins/Unity/categories.h (+8/-8)
plugins/Unity/peoplepreviewdata.cpp (+0/-438)
plugins/Unity/peoplepreviewdata.h (+0/-251)
plugins/Unity/plugin.cpp (+5/-9)
plugins/Unity/scope.cpp (+135/-186)
plugins/Unity/scope.h (+18/-32)
plugins/Unity/scopes.cpp (+60/-100)
plugins/Unity/scopes.h (+19/-18)
tests/qmltests/plugins/Unity/fake_lens.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~stolowski/unity/phablet-new-libunity
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+167717@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-06-06.

Commit message

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

Description of the change

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.

To post a comment you must log in.
lp://qastaging/~stolowski/unity/phablet-new-libunity updated
689. By Paweł Stołowski

Merged trunk.

Unmerged revisions

689. By Paweł Stołowski

Merged trunk.

688. By Paweł Stołowski

Removed mock-setup C++ code. All this is now set up by demo-assets gsettings schema override.

687. By Paweł Stołowski

Minor fixes.

686. By Paweł Stołowski

Renamed lens/lenses files to scope/scopes.

685. By Paweł Stołowski

Renamed Lens/Lenses to Scope/Scopes.

684. By Paweł Stołowski

Some cleanups.

683. By Paweł Stołowski

Merged main branch.

682. By Paweł Stołowski

Removed some commented code.

681. By Paweł Stołowski

Implemented a quick hack to get some gicons working, and fallback to base icons for annotated ones. Proper global solution needs to be implemented.

680. By Paweł Stołowski

First cut at port to new UnityCore and libunity 7.0.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches