Merge lp://qastaging/~gordallott/unity/hud into lp://qastaging/unity
Proposed by
Gord Allott
Status: | Superseded | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~gordallott/unity/hud | ||||||||||||||||
Merge into: | lp://qastaging/unity | ||||||||||||||||
Diff against target: |
4111 lines (+3217/-162) 36 files modified
CMakeLists.txt (+2/-2) UnityCore/CMakeLists.txt (+2/-0) UnityCore/GLibDBusProxy.cpp (+0/-1) UnityCore/Hud.cpp (+239/-0) UnityCore/Hud.h (+127/-0) manual-tests/Hud.txt (+57/-0) plugins/unityshell/src/DashController.cpp (+5/-3) plugins/unityshell/src/DashStyle.cpp (+1/-0) plugins/unityshell/src/HudButton.cpp (+182/-0) plugins/unityshell/src/HudButton.h (+76/-0) plugins/unityshell/src/HudController.cpp (+364/-0) plugins/unityshell/src/HudController.h (+113/-0) plugins/unityshell/src/HudIcon.cpp (+91/-0) plugins/unityshell/src/HudIcon.h (+69/-0) plugins/unityshell/src/HudSearchBar.cpp (+404/-0) plugins/unityshell/src/HudSearchBar.h (+116/-0) plugins/unityshell/src/HudView.cpp (+377/-0) plugins/unityshell/src/HudView.h (+115/-0) plugins/unityshell/src/IconTexture.cpp (+23/-10) plugins/unityshell/src/Launcher.cpp (+44/-26) plugins/unityshell/src/Launcher.h (+2/-2) plugins/unityshell/src/PanelMenuView.cpp (+2/-2) plugins/unityshell/src/PanelView.cpp (+2/-2) plugins/unityshell/src/PlacesHomeView.cpp (+1/-1) plugins/unityshell/src/UBusMessages.h (+7/-3) plugins/unityshell/src/WindowButtons.cpp (+21/-13) plugins/unityshell/src/unityshell.cpp (+77/-39) plugins/unityshell/src/unityshell.h (+8/-1) plugins/unityshell/unityshell.xml.in (+46/-41) standalone-clients/CMakeLists.txt (+33/-0) standalone-clients/StandaloneHud.cpp (+170/-0) tests/CMakeLists.txt (+13/-10) tests/test_hud.cpp (+104/-0) tests/test_service_hud.c (+268/-0) tests/test_service_hud.h (+46/-0) tests/test_service_main.c (+10/-6) |
||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/hud | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michal Hruby (community) | Needs Information | ||
Review via email:
|
This proposal has been superseded by a proposal from 2012-01-25.
To post a comment you must log in.
50 - self->owner_ ->connected. emit();
Why is this needed?