Merge lp:~mterry/ubuntu-system-settings/default-wallpaper into lp:ubuntu-system-settings
Status: | Merged |
---|---|
Approved by: | Michael Terry |
Approved revision: | 1669 |
Merged at revision: | 1721 |
Proposed branch: | lp:~mterry/ubuntu-system-settings/default-wallpaper |
Merge into: | lp:ubuntu-system-settings |
Diff against target: |
322 lines (+100/-42) 6 files modified
debian/control (+1/-0) plugins/background/MainPage.qml (+2/-19) plugins/background/Preview.qml (+1/-2) plugins/background/background.cpp (+90/-20) plugins/background/background.h (+6/-0) plugins/cellular/Components/SimEditor.qml (+0/-1) |
To merge this branch: | bzr merge lp:~mterry/ubuntu-system-settings/default-wallpaper |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Approve | |
Jonas G. Drange (community) | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+297632@code.launchpad.net |
Commit message
Use standard default wallpaper instead of unity8's custom one.
Depend on ubuntu-wallpapers, pulling in typical alternate wallpapers too.
And handle such system wallpapers better, by making a copy in case they go away.
Description of the change
And in addition to the above changes, I fixed a couple grey button gradients that I noticed still remained. I couldn't resist.
Regarding making copies of the system wallpapers... I felt this was necessary on Touch because when we upgrade to xenial, for example, the read-only system image will switch from ubuntu-
Thus, unlike a normal system upgrade situation on classic Desktop, your system wallpaper can actually disappear. We *could* solve this by growing the installed set of wallpapers every release (i.e. have touch's xenial seed include ubuntu-
Instead, I've opted for making a personal copy whenever a system wallpaper is chosen. We delete any copies that are unnecessary (i.e. still on the system) when they are switched away from. And we expose them as custom wallpapers that can be removed once they are no longer on the system (i.e. the user upgraded from vivid to xenial).
Related branches:
- https:/
- https:/
Silo 23 has all three branches for easier testing.
Oooh, had a thought regarding the system- wallpaper- copy issue. What about this:
- When switching wallpapers, if the old wallpaper is still on the system and we also keep a copy, delete the copy. This keeps us from keeping copies of all the wallpapers, if the user tries them all out.
- If we have a copy of a system wallpaper, but it is no longer on the system, treat that wallpaper as a custom wallpaper. That way, the user can delete it.
Thus we have at most one undeleteable wallpaper copy per user. The disadvantage is that it is harder to get back a wallpaper you used to like after we upgrade distros. But that's always true in that case.
Unless I hear otherwise, I'll work on this approach.