Merge lp:~mterry/ubuntu-system-settings/default-wallpaper into lp:ubuntu-system-settings

[Michael Terry]

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.

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-wallpapers-vivid to ubuntu-wallpapers-xenial.

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-wallpapers-vivid). But that will quickly become gross.

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://code.launchpad.net/~mterry/unity8/default-wallpaper/+merge/297636
- https://code.launchpad.net/~mterry/unity-system-compositor/default-wallpaper/+merge/297791

Silo 23 has all three branches for easier testing.

[Michael Terry (mterry)]

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.

[lp:~mterry/ubuntu-system-settings/default-wallpaper]

1666. By Michael Terry on 2016-06-30

Merge from trunk

1667. By Michael Terry on 2016-06-30

Only keep around copies of system wallpapers that we need to

[Michael Terry (mterry)]

OK, done. The steps in my comment above are implemented.

[lp:~mterry/ubuntu-system-settings/default-wallpaper]

1668. By Michael Terry on 2016-07-05

Guard against double-entries in grid list

1669. By Michael Terry on 2016-07-05

Fix typo

[Jonas G. Drange (jonas-drange)]

Looks good, works well. Thank you

review: Approve

[Jonas G. Drange (jonas-drange)]

I've confirmed autopilot tests pass, but I still like a CI run, so I've started one.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1669
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/131/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1308
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/292
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1308
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1174
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1174
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1174
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1154/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1154
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1154/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/131/rebuild

review: Approve (continuous-integration)

[lp:~mterry/ubuntu-system-settings/default-wallpaper]

1670. By Michael Terry on 2016-09-12

Fix blurriness in wallpaper preview

=== modified file 'debian/control'
--- debian/control	2016-08-24 13:50:53 +0000
+++ debian/control	2016-09-12 15:33:02 +0000
@@ -104,6 +104,7 @@
          libsystemsettings1 (= ${binary:Version}),
          system-image-dbus (>= 3.1),
          ubuntu-keyboard-data (>= 0.99.trunk.phablet2+15.04.20150421),
+         ubuntu-wallpapers,
          urfkill,
 # for the session-migration script (python3 itself also for the push helper)
          python3,
 
=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2015-11-13 21:14:07 +0000
+++ plugins/background/MainPage.qml	2016-09-12 15:33:02 +0000
@@ -36,18 +36,7 @@
 
     signal save (string uri)
 
-    /* TODO: For now hardcoded paths, later we'll use GSettings */
-    /* TODO: fix bug where rotating in uss will change default
-    background to tablet_back… thus losing track of phone_back… */
-    property string defaultBackground:
-        mainPage.width >= units.gu(60) ?
-            "/usr/share/unity8/graphics/tablet_background.jpg" :
-            "/usr/share/unity8/graphics/phone_background.jpg"
-
-    /* If there is no uri then use the default */
-    property string welcomeBackground: (backgroundPanel.backgroundFile === "file:") ?
-                                           "file:///usr/share/unity8/graphics/phone_background.jpg" :
-                                           backgroundPanel.backgroundFile
+    readonly property string welcomeBackground: backgroundPanel.backgroundFile
 
     property var activeTransfer
 
@@ -88,13 +77,7 @@
                 anchors.left: parent.left
                 anchors.right: parent.right
                 columns: 3
-                bgmodel: {
-                    // Make a shallow copy
-                    var backgrounds = backgroundPanel.ubuntuArt.slice(0)
-                    if (backgroundPanel.fileExists(defaultBackground))
-                        backgrounds.push(Qt.resolvedUrl(defaultBackground))
-                    return backgrounds
-                }
+                bgmodel: backgroundPanel.ubuntuArt
                 backgroundPanel: backgroundPanel
                 title: i18n.tr("Ubuntu Art")
                 current: welcomeBackground
 
=== modified file 'plugins/background/Preview.qml'
--- plugins/background/Preview.qml	2015-08-10 13:31:45 +0000
+++ plugins/background/Preview.qml	2016-09-12 15:33:02 +0000
@@ -73,7 +73,7 @@
         anchors.fill: parent
         source: uri
         sourceSize.height: height
-        sourceSize.width: width
+        sourceSize.width: 0
         fillMode: Image.PreserveAspectCrop
     }
 
@@ -100,7 +100,6 @@
                 text: preview.imported ?
                     i18n.tr("Remove image") : i18n.tr("Cancel")
                 width: (previewButtons.width-units.gu(2)*4)/2
-                gradient: UbuntuColors.greyGradient
                 onClicked: preview.state = "cancelled"
             }
             Button {
 
=== modified file 'plugins/background/background.cpp'
--- plugins/background/background.cpp	2014-07-08 09:18:09 +0000
+++ plugins/background/background.cpp	2016-09-12 15:33:02 +0000
@@ -27,6 +27,8 @@
 #include <unistd.h>
 #include <QDebug>
 
+#define SYSTEM_BACKGROUND_DIR "/usr/share/backgrounds"
+
 Background::Background(QObject *parent) :
     QObject(parent)
 {
@@ -43,11 +45,12 @@
     QVariant answer = m_accountsService.getUserProperty(
                 "org.freedesktop.Accounts.User",
                 "BackgroundFile");
-
-    if (answer.isValid())
-        return answer.toString();
-
-    return QString();
+    QString filename = answer.toString();
+
+    if (filename.isEmpty() || !QFile::exists(filename))
+        return defaultBackgroundFile();
+    else
+        return filename;
 }
 
 void Background::setBackgroundFile(QUrl backgroundFile)
@@ -58,10 +61,21 @@
     if (backgroundFile.url() == m_backgroundFile)
         return;
 
+    QString oldBackgroundFile = m_backgroundFile;
+
     m_backgroundFile = backgroundFile.url();
     m_accountsService.customSetUserProperty("SetBackgroundFile",
                                             backgroundFile.path());
     Q_EMIT backgroundFileChanged();
+
+    // If old background was a system copy that we still have on the system,
+    // delete our copy.  We don't need it anymore.
+    if (oldBackgroundFile.contains(getCopiedSystemBackgroundFolder().path())) {
+        QString fileName = QUrl(oldBackgroundFile).fileName();
+        if (QFile::exists(SYSTEM_BACKGROUND_DIR "/" + fileName)) {
+            rmFile(oldBackgroundFile);
+        }
+    }
 }
 
 void Background::slotChanged()
@@ -91,8 +105,23 @@
     m_customBackgrounds.clear();
     QFileInfoList tmpList;
     tmpList << getCustomBackgroundFolder().entryInfoList(QDir::Files | QDir::NoSymLinks);
-    if (getCustomBackgroundFolder() != getContentHubFolder())
+    if (getCustomBackgroundFolder() != getContentHubFolder()) {
         tmpList << getContentHubFolder().entryInfoList(QDir::Files | QDir::NoSymLinks);
+
+        // If any of our copied system backgrounds are no longer on the system,
+        // treat them as custom backgrounds.  This would only likely happen if
+        // a user was using a background from vivid-wallpapers and we upgraded
+        // to xenial-wallpapers.  In this case, we want the old paper to show
+        // as a custom background, so that the user can delete it when done
+        // with it.
+        // So scan the copied backgrounds.
+        QFileInfoList copyList = getCopiedSystemBackgroundFolder().entryInfoList(QDir::Files | QDir::NoSymLinks);
+        QDir systemDir = QDir(SYSTEM_BACKGROUND_DIR);
+        foreach (QFileInfo f, copyList) {
+            if (!systemDir.exists(f.fileName()))
+                tmpList << f;
+        }
+    }
     if (!tmpList.isEmpty())
     {
         foreach (QFileInfo f, tmpList)
@@ -106,9 +135,18 @@
     QUrl prepared = url;
 
     if (getCustomBackgroundFolder() != getContentHubFolder() &&
-        url.path().startsWith(getContentHubFolder().path()))
+        !url.path().startsWith(getCustomBackgroundFolder().path()) &&
+        url != QUrl::fromLocalFile(defaultBackgroundFile()))
     {
-        QDir backgroundFolder = getCustomBackgroundFolder();
+        QDir backgroundFolder;
+        bool moveFile = false;
+        if (url.path().startsWith(getContentHubFolder().path())) {
+            backgroundFolder = getCustomBackgroundFolder();
+            moveFile = true;
+        } else {
+            backgroundFolder = getCopiedSystemBackgroundFolder();
+        }
+
         QUrl newPath = QUrl::fromLocalFile(backgroundFolder.path() + "/" + url.fileName());
 
         if (QFile(newPath.path()).exists())
@@ -123,11 +161,17 @@
 
         // Move file from local ContentHub dump to shared greeter data folder
         if (shareWithGreeter &&
-            QDir::root().mkpath(backgroundFolder.path()) &&
-            QFile::rename(url.path(), newPath.path()))
+            QDir::root().mkpath(backgroundFolder.path()))
         {
-            updateCustomBackgrounds();
-            prepared = newPath;
+            if ((moveFile && QFile::rename(url.path(), newPath.path())) ||
+                (!moveFile && (link(url.path().toUtf8().data(),
+                                     newPath.path().toUtf8().data()) == 0 ||
+                               QFile::copy(url.path(), newPath.path()))))
+            {
+                updateUbuntuArt();
+                updateCustomBackgrounds();
+                prepared = newPath;
+            }
         }
     }
 
@@ -144,6 +188,11 @@
         return dataDir + "/ubuntu-system-settings/Pictures";
 }
 
+QDir Background::getCopiedSystemBackgroundFolder()
+{
+    return getCustomBackgroundFolder().path() + "/System";
+}
+
 QDir Background::getContentHubFolder()
 {
     return QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/Pictures";
@@ -153,26 +202,37 @@
 {
     return m_ubuntuArt;
 }
+
 void Background::updateUbuntuArt()
 {
-
     QString envDir(qgetenv("SYSTEM_SETTINGS_UBUNTU_ART_DIR"));
     QDir dir;
+    QDir copiedBackgroundDir;
 
-    if (envDir != "")
+    if (envDir != "") {
         dir = QDir(envDir);
-    else
-        dir = QDir("/usr/share/backgrounds/");
+        copiedBackgroundDir = dir;
+    } else {
+        dir = QDir(SYSTEM_BACKGROUND_DIR);
+        copiedBackgroundDir = getCopiedSystemBackgroundFolder();
+    }
 
+    m_ubuntuArt.clear();
 
     dir.setFilter(QDir::Files | QDir::NoSymLinks);
     dir.setSorting(QDir::Name);
     QFileInfoList tmpList = dir.entryInfoList();
     foreach (QFileInfo f, tmpList)
     {
-        if (f.fileName() != "warty-final-ubuntu.png")
-            m_ubuntuArt.append(QUrl::fromLocalFile(f.absoluteFilePath()).toString());
+        QString absPath = f.absoluteFilePath();
+
+        // Prefer copied versions.
+        if (copiedBackgroundDir.exists(f.fileName()))
+            absPath = copiedBackgroundDir.absoluteFilePath(f.fileName());
+        
+        m_ubuntuArt.append(QUrl::fromLocalFile(absPath).toString());
     }
+
     Q_EMIT ubuntuArtChanged();
 }
 
@@ -189,7 +249,9 @@
     if (file.isEmpty() || file.isNull())
         return;
 
-    if (!file.contains(getCustomBackgroundFolder().path()) && !file.contains(getContentHubFolder().path()))
+    if (!file.contains(getCustomBackgroundFolder().path()) &&
+        !file.contains(getCopiedSystemBackgroundFolder().path()) &&
+        !file.contains(getContentHubFolder().path()))
         return;
 
     QUrl fileUri(file);
@@ -199,10 +261,18 @@
     QFile filePath(fileUri.path());
     if (filePath.exists())
     {
-        if (filePath.remove())
+        if (filePath.remove()) {
+            updateUbuntuArt();
             updateCustomBackgrounds();
+        }
     }
 }
 
+QString Background::defaultBackgroundFile() const
+{
+    /* TODO: For now hardcoded path, later we'll use GSettings */
+    return SYSTEM_BACKGROUND_DIR "/warty-final-ubuntu.png";
+}
+
 Background::~Background() {
 }
 
=== modified file 'plugins/background/background.h'
--- plugins/background/background.h	2015-03-16 13:51:36 +0000
+++ plugins/background/background.h	2016-09-12 15:33:02 +0000
@@ -45,6 +45,10 @@
                 READ ubuntuArt
                 NOTIFY ubuntuArtChanged )
 
+    Q_PROPERTY( QString defaultBackgroundFile
+                READ defaultBackgroundFile
+                CONSTANT )
+
 public:
     explicit Background(QObject *parent = 0);
     ~Background();
@@ -55,6 +59,7 @@
     Q_INVOKABLE void rmFile(const QString &file);
     QStringList customBackgrounds();
     QStringList ubuntuArt();
+    QString defaultBackgroundFile() const;
 
 public Q_SLOTS:
     void slotChanged();
@@ -73,6 +78,7 @@
     QString m_backgroundFile;
     QString getBackgroundFile();
     QDir getCustomBackgroundFolder();
+    QDir getCopiedSystemBackgroundFolder();
     QDir getContentHubFolder();
 };
 
 
=== modified file 'plugins/cellular/Components/SimEditor.qml'
--- plugins/cellular/Components/SimEditor.qml	2015-08-10 13:31:45 +0000
+++ plugins/cellular/Components/SimEditor.qml	2016-09-12 15:33:02 +0000
@@ -200,7 +200,6 @@
             Button {
                 id: cancel
                 objectName: "cancelRename"
-                gradient: UbuntuColors.greyGradient
                 text: i18n.tr("Cancel")
                 width: (editor.width / 2) - units.gu(1)
                 onClicked: {