unity-2d

Merge lp://qastaging/~3v1n0/unity-2d/unity-core-indicators-revisited into lp://qastaging/unity-2d

unity-core-indicators-revisited
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2011-08-09

Status:	Superseded
Proposed branch:	lp://qastaging/~3v1n0/unity-2d/unity-core-indicators-revisited
Merge into:	lp://qastaging/unity-2d
Prerequisite:	lp://qastaging/~3v1n0/unity-2d/secondary-activate-support-v2
Diff against target:	316 lines (+100/-25) 9 files modified libunity-2d-private/src/CMakeLists.txt (+1/-1) libunity-2d-private/src/indicatorsmanager.cpp (+11/-0) libunity-2d-private/src/indicatorsmanager.h (+4/-1) libunity-2d-private/src/indicatorswidget.cpp (+46/-14) libunity-2d-private/src/indicatorswidget.h (+11/-6) panel/applets/appname/menubarwidget.cpp (+17/-0) panel/applets/appname/menubarwidget.h (+1/-0) panel/applets/indicator/indicatorapplet.cpp (+6/-3) panel/applets/indicator/indicatorapplet.h (+3/-0)
To merge this branch:	bzr merge lp://qastaging/~3v1n0/unity-2d/unity-core-indicators-revisited
Related bugs:	Link a bug report
Related blueprints:	Desktop DX Indicators Review (Undefined)

Reviewer	Date Requested	Status
Florian Boucault (community)		Approve on 2011-09-08
Aurélien Gâteau (community)	2011-08-09	Needs Fixing on 2011-08-11
Review via email: mp+70819@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2011-09-08.

Description of the change

To implement the Desktop DX Indicators Review blueprint [1] and to implement the system indicators ordering requested by design team [2], I've redesigned the way the indicators work in unity.

This need to change both unity-panel-service, UnityCore and unity-2d-panel, and basically it works by making the panel-service to compute a "priority" for each indicator entry and then making the panel to show the indicator entries in the correct order.

This needs the UnityCore code available in the lp:~3v1n0/unity/indicators-redesign branch.

More informations are available in the unity merge request:
https://code.launchpad.net/~3v1n0/unity/indicators-redesign/+merge/70818

[1] https://blueprints.launchpad.net/ubuntu/+spec/desktop-dx-o-indicators-review
[2] https://wiki.ubuntu.com/MenuBar#System_status_menus_.28system_indicators.29

PS: Unfortunately I will go in holiday on August 11th, so I hope you could review it quickly to allow me to fix the eventual issues.

Revision history for this message

Aurélien Gâteau (agateau) wrote on 2011-08-11:

Hi, thanks for your work!

I am a bit stuck on your MR right now as libunity does not build here => no build of unity => can't try it.

In the meantime, you can already fix coding style issues:
- braces for single lines if
- opening braces on the same line as the opening line
- camelCase for all vars and methods

Check the CODING file for more info.

review: Needs Fixing

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2011-08-11:

I'm sorry, but as I wrote in the merge request I just left for my holidays,
so I won't be able to fix the coding style until August 24th, I hope you
could do that for me... :(

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2011-08-29:

> In the meantime, you can already fix coding style issues:
> - braces for single lines if
> - opening braces on the same line as the opening line
> - camelCase for all vars and methods
>
> Check the CODING file for more info.

Ok, I've fixed the coding style and I hope that now is conform to specs, I also merged the code with the upstream changes. The relative UnityCore branch (updated too) should be compilable now, so I guess you'll be able to test unity-2d as well.

Revision history for this message

Florian Boucault (fboucault) wrote on 2011-09-08:

I believe it's good to go now. Just waiting for the API changes in the backend to land.

review: Approve

Revision history for this message

Bob The Builder (bobthebuilder-deactivatedaccount) wrote on 2011-09-08:

No proposals found for merge of lp:~3v1n0/unity-2d/secondary-activate-support-v2 into lp:unity-2d.

lp://qastaging/~3v1n0/unity-2d/unity-core-indicators-revisited updated on 2011-09-09

643. By Marco Trevisan (Treviño) on 2011-09-09: Merging with upstream.
644. By Marco Trevisan (Treviño) on 2011-09-09: Merging indicator removal support branch.