Merge lp://staging/~fboucault/unity/phablet-use_icon_theme into lp://staging/unity/phablet
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~fboucault/unity/phablet-use_icon_theme |
| Merge into: | lp://staging/unity/phablet |
| Diff against target: |
548 lines (+56/-51) 15 files modified
Applications/applications.js (+4/-4) Bottombar/HudButton.qml (+3/-3) Components/PageHeader.qml (+8/-8) Components/RatingStars.qml (+13/-4) Dash/Apps/ApplicationsFilterGrid.qml (+2/-2) Dash/People/Preview/Phone.qml (+3/-3) Hud/SearchBar.qml (+6/-6) Hud/ToolBar.qml (+5/-5) Hud/ToolBarIcon.qml (+3/-2) Launcher/Launcher.qml (+1/-3) Launcher/LauncherShortcuts.qml (+2/-3) Panel/Menus/Overview/FlightModeWidget.qml (+2/-2) Panel/Menus/Overview/VolumeWidget.qml (+4/-4) Shell.qml (+0/-1) tests/qmltests/Launcher/tst_Launcher.qml (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~fboucault/unity/phablet-use_icon_theme |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | Needs Information | ||
|
Review via email:
|
|||
Commit message
Use icons from the ubuntu-mobile theme and the recently introduced Icon class from SDK.
Dash and Launcher: use application icons from theme and removed local icons graphics/
Dash People Preview:
- use star from theme
- use messages icon from theme
- removed facebook & twitter icons that are provided by the lens right now
Dash Video Preview: use stars from theme.
Dash search: use icons from theme.
HUD: use icons from theme.
PageHeader: use cross from icon theme.
Panel device menu: use volume icons from theme.
Indicators device menu: use flight mode icon from theme.
Removed old unused icons from Panel/graphics.
| Florian Boucault (fboucault) wrote | # |
Unmerged revisions
- 520. By Florian Boucault
-
Merged with trunk
- 519. By Florian Boucault
-
Removed remaining conflicting file.
- 518. By Florian Boucault
-
Merged trunk
- 517. By Florian Boucault
-
Removed useless import.
- 516. By Florian Boucault
-
Dash: always use application icons from the theme.
- 515. By Florian Boucault
-
Colorize HUD button.
- 514. By Florian Boucault
-
Removed all app icons.
- 513. By Florian Boucault
-
Merged trunk
- 512. By Florian Boucault
-
Readded telephony icon to allow for merge with trunk
- 511. By Florian Boucault
-
Make use of new SDK's Icon class.
The icons necessary for that to work are in the latest revision of lp:ubuntu-themes