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

[Iain Lane]

Inline the setUpImages() function as it's only called from one place.

Inline setUpImages(), otherwise the function call doesn't do anything.

No, I don't know why this helps. QML :(

Unmerged revisions

=== added file 'debian/ubuntu-system-settings.postrm'
--- debian/ubuntu-system-settings.postrm	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-settings.postrm	2014-06-06 09:36:48 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ] ; then
+    rm -rf /var/lib/lightdm-data/*/ubuntu-system-settings/
+fi
+
+#DEBHELPER#
+exit 0

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2014-02-18 14:18:27 +0000
+++ plugins/background/MainPage.qml	2014-06-06 09:36:48 +0000
@@ -248,30 +248,28 @@
     }
 
     function setUpImages() {
-        var mostRecent = (systemSettingsSettings.backgroundSetLast === "home") ?
-                    testHomeImage : testWelcomeImage;
-        var leastRecent = (mostRecent === testHomeImage) ?
-                    testWelcomeImage : testHomeImage;
-
-        if (systemSettingsSettings.backgroundDuplicate) { //same
-            /* save value of least recently changed to restore later */
-            systemSettingsSettings.backgroundPreviouslySetValue =
-                    leastRecent.source;
-            /* copy most recently changed to least recently changed */
-            leastRecent.update(mostRecent.source);
-        } else { // different
-            /* restore least recently changed to previous value */
-            leastRecent.update(
-                    systemSettingsSettings.backgroundPreviouslySetValue);
-        }
     }
 
     GSettings {
         id: systemSettingsSettings
         schema.id: "com.ubuntu.touch.system-settings"
         onChanged: {
-            if (key == "backgroundDuplicate")
-                setUpImages();
+            if (key == "backgroundDuplicate") {
+                var mostRecent = (backgroundSetLast === "home")
+                    ? testHomeImage : testWelcomeImage;
+                var leastRecent = (mostRecent === testHomeImage) ?
+                    testWelcomeImage : testHomeImage;
+
+                if (backgroundDuplicate) { //same
+                    /* save value of least recently changed to restore later */
+                    backgroundPreviouslySetValue = leastRecent.source;
+                    /* copy most recently changed to least recently changed */
+                    leastRecent.update(mostRecent.source);
+                } else { // different
+                    /* restore least recently changed to previous value */
+                    leastRecent.update(backgroundPreviouslySetValue);
+                }
+            }
         }
         Component.onCompleted: {
             if (systemSettingsSettings.backgroundDuplicate)

=== modified file 'plugins/background/background.cpp'
--- plugins/background/background.cpp	2014-02-18 14:18:27 +0000
+++ plugins/background/background.cpp	2014-06-06 09:36:48 +0000
@@ -89,10 +89,10 @@
 void Background::updateCustomBackgrounds()
 {
     m_customBackgrounds.clear();
-    QString customPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation)+"/Pictures";
-    QDir dir(customPath);
-    dir.setFilter(QDir::Files | QDir::NoSymLinks);
-    QFileInfoList tmpList = dir.entryInfoList();
+    QFileInfoList tmpList;
+    tmpList << getCustomBackgroundFolder().entryInfoList(QDir::Files | QDir::NoSymLinks);
+    if (getCustomBackgroundFolder() != getContentHubFolder())
+        tmpList << getContentHubFolder().entryInfoList(QDir::Files | QDir::NoSymLinks);
     if (!tmpList.isEmpty())
     {
         foreach (QFileInfo f, tmpList)
@@ -101,6 +101,54 @@
     Q_EMIT customBackgroundsChanged();
 }
 
+QUrl Background::prepareBackgroundFile(const QUrl &url, bool shareWithGreeter)
+{
+    QUrl prepared = url;
+
+    if (getCustomBackgroundFolder() != getContentHubFolder() &&
+        url.path().startsWith(getContentHubFolder().path()))
+    {
+        QDir backgroundFolder = getCustomBackgroundFolder();
+        QUrl newPath = QUrl::fromLocalFile(backgroundFolder.path() + "/" + url.fileName());
+
+        if (QFile(newPath.path()).exists())
+        {
+            // The file already exists in the shared greeter data folder...
+            // Likely we just pulled the same file from ContentHub again.
+            // We don't want to show both versions in the picker grid, so just
+            // promote it to greeter location so we still just have one copy.
+            if (QFile(newPath.path()).remove())
+                shareWithGreeter = true;
+        }
+
+        // Move file from local ContentHub dump to shared greeter data folder
+        if (shareWithGreeter &&
+            QDir::root().mkpath(backgroundFolder.path()) &&
+            QFile::rename(url.path(), newPath.path()))
+        {
+            updateCustomBackgrounds();
+            prepared = newPath;
+        }
+    }
+
+    return prepared;
+}
+
+QDir Background::getCustomBackgroundFolder()
+{
+    // We want a location we can share with the greeter
+    QString dataDir(qgetenv("XDG_GREETER_DATA_DIR"));
+    if (dataDir.isEmpty())
+        return getContentHubFolder();
+    else
+        return dataDir + "/ubuntu-system-settings/Pictures";
+}
+
+QDir Background::getContentHubFolder()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/Pictures";
+}
+
 QStringList Background::ubuntuArt()
 {
     return m_ubuntuArt;
@@ -132,7 +180,7 @@
     if (file.isEmpty() || file.isNull())
         return;
 
-    if (!file.contains(QStandardPaths::writableLocation(QStandardPaths::DataLocation)))
+    if (!file.contains(getCustomBackgroundFolder().path()) && !file.contains(getContentHubFolder().path()))
         return;
 
     QUrl fileUri(file);

=== modified file 'plugins/background/background.h'
--- plugins/background/background.h	2014-02-18 14:18:27 +0000
+++ plugins/background/background.h	2014-06-06 09:36:48 +0000
@@ -24,6 +24,7 @@
 #include "accountsservice.h"
 
 #include <QDBusInterface>
+#include <QDir>
 #include <QObject>
 #include <QProcess>
 #include <QUrl>
@@ -49,6 +50,7 @@
     ~Background();
     QString backgroundFile();
     void setBackgroundFile(QUrl backgroundFile);
+    Q_INVOKABLE QUrl prepareBackgroundFile(const QUrl &url, bool shareWithGreeter);
     Q_INVOKABLE bool fileExists(const QString &file);
     Q_INVOKABLE void rmFile(const QString &file);
     QStringList customBackgrounds();
@@ -70,6 +72,8 @@
     void updateUbuntuArt();
     QString m_backgroundFile;
     QString getBackgroundFile();
+    QDir getCustomBackgroundFolder();
+    QDir getContentHubFolder();
 };
 
 #endif // BACKGROUND_H

=== modified file 'plugins/background/utilities.js'
--- plugins/background/utilities.js	2013-12-06 19:20:15 +0000
+++ plugins/background/utilities.js	2014-06-06 09:36:48 +0000
@@ -34,14 +34,16 @@
 }
 
 function updateWelcome(uri) {
-    backgroundPanel.backgroundFile = uri;
+    backgroundPanel.backgroundFile = backgroundPanel.prepareBackgroundFile(uri, true);
 }
 
 function updateHome(uri) {
-    background.pictureUri = uri;
+    background.pictureUri = backgroundPanel.prepareBackgroundFile(uri, false);
 }
 
 function updateBoth(uri) {
+    // multiple prepares on a uri is fine
+    uri = backgroundPanel.prepareBackgroundFile(uri, true);
     updateWelcome(uri);
     updateHome(uri);
 }