Merge lp://qastaging/~didrocks/unity/misc-launcher-fixes into lp://qastaging/~sao/unity/show_launcher_in_navmode
Proposed by
Didier Roche-Tolomelli
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~didrocks/unity/misc-launcher-fixes |
| Merge into: | lp://qastaging/~sao/unity/show_launcher_in_navmode |
| Diff against target: |
3199 lines (+1093/-967) 35 files modified
src/Launcher.cpp (+33/-18) src/Launcher.h (+5/-3) src/LauncherController.cpp (+7/-8) src/LauncherIcon.cpp (+1/-1) src/PlaceEntry.h (+58/-35) src/PlaceEntryHome.cpp (+69/-87) src/PlaceEntryHome.h (+6/-15) src/PlaceEntryRemote.cpp (+339/-28) src/PlaceEntryRemote.h (+12/-5) src/PlacesController.cpp (+6/-2) src/PlacesGroup.cpp (+27/-85) src/PlacesGroup.h (+10/-31) src/PlacesGroupController.cpp (+127/-0) src/PlacesGroupController.h (+54/-0) src/PlacesResultsController.cpp (+56/-143) src/PlacesResultsController.h (+19/-25) src/PlacesResultsView.cpp (+15/-115) src/PlacesResultsView.h (+2/-23) src/PlacesSearchBar.cpp (+4/-1) src/PlacesSearchBar.h (+3/-0) src/PlacesSimpleTile.cpp (+23/-14) src/PlacesSimpleTile.h (+15/-30) src/PlacesTile.cpp (+71/-100) src/PlacesTile.h (+13/-59) src/PlacesView.cpp (+56/-114) src/PlacesView.h (+8/-11) src/QuicklistView.cpp (+18/-4) src/QuicklistView.h (+3/-0) src/StaticCairoText.cpp (+2/-0) src/UBusMessages.h (+4/-0) src/unityshell.cpp (+15/-5) tests/CMakeLists.txt (+4/-0) tests/TestPlacesBackend.cpp (+3/-0) tests/TestPlacesGroup.cpp (+2/-3) tests/TestPlacesResults.cpp (+3/-2) |
| To merge this branch: | bzr merge lp://qastaging/~didrocks/unity/misc-launcher-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-02-28.
Description of the change
This branch clean some hardcoded duplicated values and simplify the super key
code. Also, now Super + Shift != Super for keynum:
Super + keynum -> activate existing instances (ignore Shift modifier in some
weird keyboard layout like French ones :))
Super + Shift + keynum -> open a new instance
It also merge some fixes on alt + F1 from Oliver's that I retouched slightly
It's still hackish on the keynav stuff, some refactoring will be needed.
Also there are some crash fixes, like invalid CompWindow lost in track
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
