Merge lp://qastaging/~agateau/unity-2d/unity-core into lp://qastaging/unity-2d
Proposed by
Aurélien Gâteau
Status: | Merged |
---|---|
Approved by: | Florian Boucault |
Approved revision: | 687 |
Merged at revision: | 609 |
Proposed branch: | lp://qastaging/~agateau/unity-2d/unity-core |
Merge into: | lp://qastaging/unity-2d |
Diff against target: |
4163 lines (+1408/-2079) 48 files modified
CMakeLists.txt (+3/-3) debian/control (+5/-4) debian/unity-2d-panel.install (+0/-2) libunity-2d-private/Unity2d/CMakeLists.txt (+1/-1) libunity-2d-private/Unity2d/launcherapplication.cpp (+3/-5) libunity-2d-private/Unity2d/plugin.cpp (+0/-4) libunity-2d-private/Unity2d/screeninfo.cpp (+1/-3) libunity-2d-private/Unity2d/windowinfo.cpp (+1/-3) libunity-2d-private/Unity2d/workspacesinfo.cpp (+1/-3) libunity-2d-private/src/CMakeLists.txt (+1/-0) libunity-2d-private/src/debug.cpp (+23/-0) libunity-2d-private/src/debug_p.h (+6/-0) libunity-2d-private/src/unity2dapplication.cpp (+18/-0) panel/CMakeLists.txt (+3/-5) panel/app/CMakeLists.txt (+3/-1) panel/app/main.cpp (+4/-2) panel/app/panelmanager.cpp (+33/-46) panel/app/panelmanager.h (+2/-0) panel/app/unity2dstyle.cpp (+0/-98) panel/app/unity2dstyle.h (+0/-44) panel/applets/CMakeLists.txt (+10/-26) panel/applets/appname/appnameapplet.cpp (+5/-10) panel/applets/appname/appnameapplet.h (+3/-1) panel/applets/appname/com.canonical.AppMenu.Registrar.xml (+0/-82) panel/applets/appname/menubarwidget.cpp (+78/-279) panel/applets/appname/menubarwidget.h (+25/-66) panel/applets/appname/registrar.cpp (+0/-138) panel/applets/appname/registrar.h (+0/-85) panel/applets/common/fakecairo.h (+125/-0) panel/applets/common/indicatorentrywidget.cpp (+388/-0) panel/applets/common/indicatorentrywidget.h (+81/-0) panel/applets/common/indicatorsmanager.cpp (+176/-0) panel/applets/common/indicatorsmanager.h (+70/-0) panel/applets/common/indicatorwidget.cpp (+53/-0) panel/applets/common/indicatorwidget.h (+52/-0) panel/applets/common/panelstyle.cpp (+175/-0) panel/applets/common/panelstyle.h (+59/-0) panel/applets/indicator-config.h.in (+0/-7) panel/applets/indicator/abstractindicator.cpp (+0/-43) panel/applets/indicator/abstractindicator.h (+0/-53) panel/applets/indicator/datetimeindicator.cpp (+0/-94) panel/applets/indicator/datetimeindicator.h (+0/-53) panel/applets/indicator/indicator.c (+0/-525) panel/applets/indicator/indicator.h (+0/-45) panel/applets/indicator/indicatorapplet.cpp (+0/-114) panel/applets/indicator/indicatorapplet.h (+0/-60) panel/applets/indicator/indicatorservicemanager.cpp (+0/-120) panel/applets/indicator/indicatorservicemanager.h (+0/-54) |
To merge this branch: | bzr merge lp://qastaging/~agateau/unity-2d/unity-core |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey | Pending | ||
Florian Boucault | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2011-07-25.
Commit message
[panel] Refactor panel to use the unity-panel-service shared with Unity 3D.
Description of the change
This branch is an heavy refactor of unity-2d-panel to use the new unity-panel-service provided by Unity 3D. It has been developed on Oneiric and most likely will not build and work properly on Natty as it depends on GTK3 and UnityCore, a new library provided by Unity 3D.
To post a comment you must log in.
Hi Aurélien,
I notice you have a GConnector class. It covers a very similar area to Neil's /code.launchpad .net/~njpatel/ unity/nicer- glib-signals/ +merge/ 67439
latest work -
https:/
I also notice you aren't using namespaces for your top level classes - like
the GConnector. Have you considered using one?
A slight niggle, <string> is in the C++ standard library, not the STL (they
don't say we work for pedantical for nothing).
Redeclaring nux::Color is a dangerous thing. Slightly convoluted due to the
actual nux Color being nux::color::Color, which is then used in the nux
namespace. That is probably the only reason you are not getting linker errors
with this.