Merge lp://qastaging/~unity-team/unity/dash-niceness-2011-03-24 into lp://qastaging/unity
Proposed by
Neil J. Patel
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 1018 | ||||||||
| Proposed branch: | lp://qastaging/~unity-team/unity/dash-niceness-2011-03-24 | ||||||||
| Merge into: | lp://qastaging/unity | ||||||||
| Diff against target: |
1428 lines (+729/-51) (has conflicts) 25 files modified
src/IconLoader.cpp (+36/-13) src/IconLoader.h (+7/-3) src/IconTexture.cpp (+5/-0) src/PanelMenuView.cpp (+7/-0) src/PanelMenuView.h (+1/-0) src/PlaceEntry.h (+2/-0) src/PlaceEntryHome.cpp (+25/-1) src/PlaceEntryHome.h (+6/-0) src/PlaceEntryRemote.cpp (+13/-1) src/PlacesEmptyView.cpp (+88/-0) src/PlacesEmptyView.h (+55/-0) src/PlacesGroupController.cpp (+51/-0) src/PlacesGroupController.h (+2/-0) src/PlacesSearchBar.cpp (+15/-10) src/PlacesSearchBar.h (+4/-1) src/PlacesSearchBarSpinner.cpp (+183/-0) src/PlacesSearchBarSpinner.h (+72/-0) src/PlacesSimpleTile.cpp (+0/-11) src/PlacesStyle.cpp (+22/-0) src/PlacesStyle.h (+4/-0) src/PlacesView.cpp (+92/-7) src/PlacesView.h (+14/-0) src/StaticCairoText.cpp (+12/-4) src/StaticCairoText.h (+4/-0) tests/CMakeLists.txt (+9/-0) Text conflict in tests/CMakeLists.txt |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/dash-niceness-2011-03-24 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jay Taoko (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Lots of dash fixes, bugs linked where I could find them, off the top of my head:
- Shows no-results stuff for the individual places
- Shows a spinner during search (this will go into timeoutmode if you don't ahve very latest place daemons and libunity)
- Protects against pressing enter before we have all the restuls, but if you get impatient it activates whatever is there
- Fixes blur!
Some other stuff, have fun :)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Approved