Merge lp://qastaging/~unity-team/unity/more-dash-fixes-2011-02-24 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: | 888 | ||||
Proposed branch: | lp://qastaging/~unity-team/unity/more-dash-fixes-2011-02-24 | ||||
Merge into: | lp://qastaging/unity | ||||
Diff against target: |
848 lines (+237/-103) 21 files modified
src/DeviceLauncherIcon.cpp (+5/-32) src/IconTexture.cpp (+2/-1) src/LauncherIcon.cpp (+22/-8) src/PanelIndicatorObjectEntryView.cpp (+4/-4) src/PanelStyle.cpp (+14/-3) src/PanelStyle.h (+2/-0) src/PlaceEntry.h (+2/-0) src/PlaceEntryHome.cpp (+10/-2) src/PlaceEntryHome.h (+2/-0) src/PlaceEntryRemote.cpp (+20/-2) src/PlaceEntryRemote.h (+2/-0) src/PlacesGroup.cpp (+11/-9) src/PlacesGroup.h (+3/-0) src/PlacesResultsController.cpp (+2/-1) src/PlacesResultsController.h (+2/-1) src/PlacesResultsView.cpp (+2/-0) src/PlacesSearchBar.cpp (+89/-23) src/PlacesSearchBar.h (+16/-5) src/PlacesView.cpp (+11/-5) src/StaticCairoText.cpp (+15/-6) src/StaticCairoText.h (+1/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/more-dash-fixes-2011-02-24 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gord Allott | Pending | ||
Review via email:
|
Description of the change
- You'll need nux trunk
- Bugs linked
- Lots and lots of other stuff, this is branch 2/4 for the A3 release so, yeah, somethings still don't work :)
To post a comment you must log in.
Awesome, totally didn't realise that this branch was all about the features :) This is what should work:
- Groups have icons
- Search hint behind text entry
- text entry has big text
- you don't get the "Search for foo" thing anymore when a search fails (this is temporary)
- everything paints properly