Merge lp:~laney/ubuntu-system-settings/reset-background into lp:ubuntu-system-settings

[Iain Lane]

[background] Support resetting to default

I wanted to show that we can start adding reset support to plugins now.

It's a little bit hard to test this because content hub is broken when you launch from the command line and the reset plugin is hidden by default. I suggest you hack reset.settings to make it shown by default.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/690/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3807
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5746
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4630

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/690/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

setting as rejected since the panel got refactored since the changes were submitted

Unmerged revisions

505. By Iain Lane on 2014-03-10

Reset support for the background plugin

504. By Iain Lane on 2014-03-10

merge trunk

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2014-02-18 14:18:27 +0000
+++ plugins/background/MainPage.qml	2014-03-10 17:28:22 +0000
@@ -41,6 +41,15 @@
     property real thumbWidth: mainPage.width * 0.43
     property real thumbHeight: mainPage.height * 0.4
 
+    function reset() {
+        background.schema.reset("pictureUri")
+        // We can't get the default value in Qt
+        backgroundPanel.backgroundFile = background.pictureUri
+        systemSettingsSettings.schema.reset("backgroundDuplicate")
+        systemSettingsSettings.schema.reset("previouslySetValue")
+        systemSettingsSettings.schema.reset("backgroundDuplicate")
+    }
+
     UbuntuBackgroundPanel {
         id: backgroundPanel