Unity

Merge lp://qastaging/~unity-team/unity/panel-fixes into lp://qastaging/unity

panel-fixes
Merge into trunk

Proposed by Neil J. Patel on 2011-02-17

Status:

Merged

Approved by:

Gord Allott on 2011-02-17

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:

Bug #596879: Add systray support	High	Fix Released
Bug #655140: [systray] Some panel icon dies, leaves white box	Critical	Fix Released
Bug #663524: Top Panel does not respect GTK theme	Medium	Fix Released
Bug #685830: Update Unity-Panel Style implementation	Medium	Fix Released
Bug #690714: Navigating between menus briefly gives focus back to applications	Low	Fix Released
Bug #701663: Add keyboard shortcut for the panel	Medium	Fix Released
Bug #703555: Do not switch to fallback menu on mouse-over	Wishlist	Fix Released
Bug #705536: Unity allows you to Quit itself	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gord Allott		2011-02-17	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_DIRS=$your_prefix/share:/usr/local/share:/usr/share (or whatever makes sense for your system :)

*update* Install latest libunity-misc too.

Revision history for this message

Tim Penhey (thumper) wrote on 2011-02-17:

You have a few conflict markers there, and also you copied Mirco's email in the
header blocks :-)

Revision history for this message

Neil J. Patel (njpatel) wrote on 2011-02-17:

Fixed conflicts. Mirco's name is because I merged a branch of his with the initial implementation of style object but, yeah, I forgot to add my own name when I updated it :)