Merge lp:~laney/ubuntu-system-settings/as-background-fixes into lp:ubuntu-system-settings
Status: | Merged |
---|---|
Approved by: | Łukasz Zemczak |
Approved revision: | 475 |
Merged at revision: | 467 |
Proposed branch: | lp:~laney/ubuntu-system-settings/as-background-fixes |
Merge into: | lp:ubuntu-system-settings |
Diff against target: |
185 lines (+70/-14) 2 files modified
plugins/background/MainPage.qml (+61/-12) plugins/background/background.cpp (+9/-2) |
To merge this branch: | bzr merge lp:~laney/ubuntu-system-settings/as-background-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Łukasz Zemczak | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
[background] Correctly set the background in accountsservice. Make it update in the UI. Fix the "same/different" toggle. Update the reset button to reset the greeter background too, and to set the toggle back to "same".
Description of the change
Fix setting the greeter background.
We didn't maintain this code once the UI was hidden and it bitrotted (incorrect changes were added).
Correctly set the background in AS. Make it update in the UI. Fix the "same/different" toggle. Update the reset button to reset the greeter background too, and to set the toggle back to "same".
I didn't unhide this UI yet as it should be tested by others a bit first. Also we should decide what to do about the buttons. Probably get rid of "Change" and move the reset one underneath the OptionSelector?
PASSED: Continuous integration, rev:473 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/478/ jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- saucy-amd64- ci/478
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/ubuntu- system- settings- ci/478/ rebuild
http://