Merge lp://qastaging/~unity-team/unity/panel-fixes into lp://qastaging/unity
Proposed by
Neil J. Patel
Status: | Merged | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Gord Allott | ||||||||||||||||||||||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||||||||||||||||||||||
Merged at revision: | 867 | ||||||||||||||||||||||||||||||||
Proposed branch: | lp://qastaging/~unity-team/unity/panel-fixes | ||||||||||||||||||||||||||||||||
Merge into: | lp://qastaging/unity | ||||||||||||||||||||||||||||||||
Diff against target: |
1855 lines (+1043/-202) 21 files modified
CMakeLists.txt (+1/-1) com.canonical.Unity.gschema.xml (+7/-0) services/panel-service.c (+11/-2) src/PanelHomeButton.cpp (+11/-7) src/PanelHomeButton.h (+0/-1) src/PanelIndicatorObjectEntryView.cpp (+62/-22) src/PanelIndicatorObjectView.cpp (+7/-3) src/PanelMenuView.cpp (+49/-36) src/PanelMenuView.h (+1/-0) src/PanelStyle.cpp (+274/-0) src/PanelStyle.h (+79/-0) src/PanelTray.cpp (+231/-0) src/PanelTray.h (+73/-0) src/PanelView.cpp (+126/-43) src/PanelView.h (+20/-3) src/WindowButtons.cpp (+27/-71) src/unityshell.cpp (+34/-7) src/unityshell.h (+8/-0) tests/CMakeLists.txt (+4/-0) tests/TestPanel.cpp (+2/-2) unityshell.xml.in (+16/-4) |
||||||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/panel-fixes | ||||||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gord Allott | Pending | ||
Review via email: mp+50109@code.qastaging.launchpad.net |
Description of the change
All bugs linked, the only thing different is that I added an option to change panel opacity :)
I had to change the GSettings schemas, so you'll need to make sure that they are installed correctly locally and your exporting XDG_DATA_
*update* Install latest libunity-misc too.
To post a comment you must log in.
You have a few conflict markers there, and also you copied Mirco's email in the
header blocks :-)