Merge lp://qastaging/~agateau/unity-2d/unity-core into lp://qastaging/unity-2d/3.0
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~agateau/unity-2d/unity-core |
Merge into: | lp://qastaging/unity-2d/3.0 |
Diff against target: |
4445 lines (+1465/-2159) 57 files modified
CMakeLists.txt (+5/-0) debian/control (+5/-4) debian/unity-2d-panel.install (+0/-2) launcher/app/CMakeLists.txt (+0/-2) launcher/app/launcher.cpp (+5/-21) libunity-2d-private/Unity2d/CMakeLists.txt (+1/-7) 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/-4) libunity-2d-private/src/debug.cpp (+23/-0) libunity-2d-private/src/debug_p.h (+6/-0) libunity-2d-private/src/unity2dapplication.cpp (+48/-0) libunity-2d-private/src/unity2dapplication.h (+7/-0) libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp (+1/-0) libunity-2d-private/tests/mouseareademo.cpp (+1/-0) panel/CMakeLists.txt (+3/-5) panel/app/CMakeLists.txt (+3/-1) panel/app/main.cpp (+5/-17) panel/app/panelmanager.cpp (+32/-46) panel/app/panelmanager.h (+4/-0) panel/app/unity2dstyle.cpp (+0/-98) panel/app/unity2dstyle.h (+0/-44) panel/applets/CMakeLists.txt (+10/-30) 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 (+79/-279) panel/applets/appname/menubarwidget.h (+24/-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 (+179/-0) panel/applets/common/indicatorsmanager.h (+70/-0) panel/applets/common/indicatorwidget.cpp (+53/-0) panel/applets/common/indicatorwidget.h (+51/-0) panel/applets/common/panelstyle.cpp (+176/-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/-510) 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) places/app/CMakeLists.txt (+0/-2) places/app/places.cpp (+3/-19) spread/app/CMakeLists.txt (+0/-4) spread/app/spread.cpp (+3/-21) |
To merge this branch: | bzr merge lp://qastaging/~agateau/unity-2d/unity-core |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey (community) | Needs Information | ||
Florian Boucault | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2011-07-25.
Commit message
[panel] Refactor to make use of indicator-
Description of the change
This branch is an heavy refactor of unity-2d-panel to use the new indicator-
[1] This branch is based on the gtk3 branch I created but which I did not propose for merge because support for indicators is disabled on it (at the time I did the work on this branch, indicators were gtk2-only).
Unmerged revisions
- 687. By Aurélien Gâteau
-
[panel] Make sure indicators are present on hotplugged monitor
IndicatorsManager should not be shared among panels, otherwise when a new
monitor is plugged after unity-2d-panel startup, we don't get any indicators as
no on_object_added() signal is emitted. - 686. By Aurélien Gâteau
-
Sync with unity-2d/4.0
- 685. By Aurélien Gâteau
-
[panel] Empty commit to close bugs
- 684. By Aurélien Gâteau
-
Merge unity-2d/4.0 in
- 683. By Aurélien Gâteau
-
Sync with gtk3
- 682. By Aurélien Gâteau
-
Remove forgotten FIXME comment
- 681. By Aurélien Gâteau
-
[build] Fix build with libunity-core 4.4
UnityCore.h has been removed
- 680. By Aurélien Gâteau
-
Synced with gtk3 branch
- 679. By Aurélien Gâteau
-
Cleanup
- 678. By Aurélien Gâteau
-
Merged gtk3 branch
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.