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

[Iain Lane]

Read the user's background from GSettings

Read the background from GSettings.

There's a slightly ugly way of dealing with image loading failures, but it's pretty small so I think we can live with it.

On the device we don't appear to use GSettings (yet?) for the background, so this doesn't work there. Try it on the desktop.

Should I depend on gsettings-desktop-schemas too for org.gnome.desktop.background?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/39

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

> Should I depend on gsettings-desktop-schemas too for org.gnome.desktop.background?

yes please

(not commenting on the other parts yet because I'm trying to wrap my head about the connections/signal stuff used there, would be good if Alberto or Ken could comment on that)

[lp:~laney/ubuntu-system-settings/background-gsettings]

76. By Iain Lane on 2013-06-28

Don't use Connections - just update from onStatusChanged directly

77. By Iain Lane on 2013-06-28

Depend on gsettings-desktop-schemas

[Iain Lane (laney)]

On Fri, Jun 28, 2013 at 10:46:48AM -0000, Sebastien Bacher wrote:
> > Should I depend on gsettings-desktop-schemas too for org.gnome.desktop.background?
>
> yes please

Done.

>
> (not commenting on the other parts yet because I'm trying to wrap my head about the connections/signal stuff used there, would be good if Alberto or Ken could comment on that)

I just got rid of the Connections thing as it was unnecessary - should
be simpler now.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/40

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Love to see something using gsettings-qt!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-06-20 12:44:52 +0000
+++ debian/control	2013-06-28 10:58:30 +0000
@@ -21,6 +21,8 @@
 Architecture: i386 amd64 armhf
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         gsettings-desktop-schemas,
+         qtdeclarative5-gsettings1.0,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          libsystemsettings1 (= ${binary:Version}),
 Recommends: ubuntu-mobile-icons,
 
=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2013-06-20 13:17:10 +0000
+++ plugins/background/MainPage.qml	2013-06-28 10:58:30 +0000
@@ -19,6 +19,7 @@
 */
 
 import QtQuick 2.0
+import GSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import SystemSettings 1.0
@@ -28,6 +29,11 @@
     id: mainPage
     title: i18n.tr("Background")
 
+    GSettings {
+        id: background
+        schema: "org.gnome.desktop.background"
+    }
+
     Label {
         id: welcomeLabel
 
@@ -75,12 +81,33 @@
             right: parent.right
          }
 
-        source: "aeg.jpg"
+        Component.onCompleted: updateImage()
 
         onClicked: pageStack.push(Utilities.createAlbumPage(
                                       i18n.tr("Home screen")))
     }
 
+    /* We don't have a good way of doing this after passing an invalid image to
+       SwappableImage, so test the image is valid /before/ showing it and show a
+       fallback if it isn't. */
+    function updateImage() {
+        // TODO: Doesn't yet fade when the background is changed, but probably
+        // not a huge issue. Will resolve itself when we switch to the SDK's
+        // CrossFadeImage
+        if (testImage.status == Image.Ready) {
+            homeImage.source = testImage.source
+        } else if (testImage.status == Image.Error) {
+            homeImage.source = "aeg.jpg"
+        }
+    }
+
+    Image {
+        id: testImage
+        source: background.pictureUri
+        visible: false
+        onStatusChanged: updateImage()
+    }
+
 
     ListItem.ThinDivider {
         id: topDivider