Merge lp:~saviq/unity8/revert-background into lp:unity8

[Michał Sawicz]

Revert revision 161 that causes issues with invalid background.

The background fallback isn't working and causes autopilot failures. See bug #1208868 for some details.

[Albert Astals Cid (aacid)]

Tested and the problem is gone for me, let's see what the CI machines say

review: Approve (functional)

[Gerry Boland (gerboland)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/unity8-ci/511/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/512
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/512/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1941
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1941/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1655

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/511/rebuild

review: Approve (continuous-integration)

=== modified file 'Components/CrossFadeImage.qml'
--- Components/CrossFadeImage.qml	2013-07-24 15:27:11 +0000
+++ Components/CrossFadeImage.qml	2013-08-06 15:23:36 +0000
@@ -85,7 +85,7 @@
     Connections {
         target: __nextImage
         onStatusChanged: {
-            if (__nextImage.status == Image.Ready || __nextImage.status == Image.Error) {
+            if (__nextImage.status == Image.Ready) {
                  swapImages();
              }
         }
@@ -96,7 +96,6 @@
         anchors.fill: parent
         cache: false
         asynchronous: true
-        fillMode: Image.PreserveAspectCrop
         z: 1
     }
 
@@ -105,7 +104,6 @@
         anchors.fill: parent
         cache: false
         asynchronous: true
-        fillMode: Image.PreserveAspectCrop
         z: 0
     }
 

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-08-02 16:16:31 +0000
+++ Greeter/GreeterContent.qml	2013-08-06 15:23:36 +0000
@@ -37,6 +37,7 @@
 
         source: shell.background
         anchors.fill: parent
+        crossFade: false
         fadeInFirst: false
     }
 

=== modified file 'Shell.qml'
--- Shell.qml	2013-08-02 19:10:00 +0000
+++ Shell.qml	2013-08-06 15:23:36 +0000
@@ -15,7 +15,6 @@
  */
 
 import QtQuick 2.0
-import GSettings 1.0
 import Ubuntu.Application 0.1
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
@@ -42,8 +41,8 @@
     height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
 
     property real edgeSize: units.gu(2)
-    property url defaultBackground: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
-    property url background: backgroundSettings.pictureUri
+    property url default_background: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
+    property url background: default_background
     readonly property real panelHeight: panel.panelHeight
 
     property bool dashShown: dash.shown
@@ -116,11 +115,6 @@
         }
     }
 
-    GSettings {
-        id: backgroundSettings
-        schema.id: "org.gnome.desktop.background"
-    }
-
     VolumeControl {
         id: volumeControl
     }
@@ -145,16 +139,12 @@
         // through the translucent parts of the shell surface.
         visible: !fullyCovered && !applicationSurfaceShouldBeSeen
 
-        CrossFadeImage {
+        Image {
             id: backgroundImage
-            objectName: "backgroundImage"
             source: shell.background
+            sourceSize.width: parent.width
+            sourceSize.height: parent.height
             anchors.fill: parent
-            onStatusChanged: {
-                if (status == Image.Error) {
-                    backgroundSettings.pictureUri = shell.defaultBackground
-                }
-            }
         }
 
         Rectangle {
@@ -199,6 +189,7 @@
         }
     }
 
+
     Item {
         id: stagesOuterContainer
 
@@ -263,6 +254,7 @@
                 ignoreUnknownSignals: true
             }
 
+
             Stage {
                 id: mainStage
 
@@ -438,7 +430,7 @@
         onUnlocked: greeter.hide()
         onSelected: {
             var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
-            shell.background = bgPath ? bgPath : defaultBackground
+            shell.background = bgPath ? bgPath : default_background
         }
 
         onLeftTeaserPressedChanged: {

=== modified file 'debian/control'
--- debian/control	2013-08-02 16:16:31 +0000
+++ debian/control	2013-08-06 15:23:36 +0000
@@ -56,10 +56,8 @@
 
 Package: unity8
 Architecture: any
-Depends: gsettings-desktop-schemas,
-         qmenumodel-qml,
+Depends: qmenumodel-qml,
          qtdeclarative5-dee-plugin,
-         qtdeclarative5-gsettings1.0,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
          qtdeclarative5-xmllistmodel-plugin,

=== removed directory 'tests/data/unity/backgrounds'
=== removed file 'tests/data/unity/backgrounds/blue.png'
Binary files tests/data/unity/backgrounds/blue.png	2013-07-26 10:48:37 +0000 and tests/data/unity/backgrounds/blue.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tests/data/unity/backgrounds/red.png'
Binary files tests/data/unity/backgrounds/red.png	2013-07-26 10:48:37 +0000 and tests/data/unity/backgrounds/red.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2013-07-26 11:10:55 +0000
+++ tests/mocks/CMakeLists.txt	2013-08-06 15:23:36 +0000
@@ -1,4 +1,3 @@
-add_subdirectory(GSettings)
 add_subdirectory(libusermetrics)
 add_subdirectory(LightDM)
 add_subdirectory(QMenuModel)

=== removed directory 'tests/mocks/GSettings'
=== removed file 'tests/mocks/GSettings/CMakeLists.txt'
--- tests/mocks/GSettings/CMakeLists.txt	2013-07-25 16:41:29 +0000
+++ tests/mocks/GSettings/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-
-include(FindPkgConfig)
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Quick REQUIRED)
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${Qt5Core_INCLUDE_DIRS}
-  ${Qt5Quick_INCLUDE_DIRS}
-)
-
-add_definitions(-DQT_NO_KEYWORDS)
-
-set(GSettingsQML_SOURCES
-  fake_gsettings.cpp
-  plugin.cpp
-)
-
-add_library(FakeGSettingsQml MODULE ${GSettingsQML_SOURCES})
-target_link_libraries(FakeGSettingsQml
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-)
-
-qt5_use_modules(FakeGSettingsQml Qml)
-
-# copy qmldir file into build directory for shadow builds
-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-    )

=== removed file 'tests/mocks/GSettings/fake_gsettings.cpp'
--- tests/mocks/GSettings/fake_gsettings.cpp	2013-07-26 13:27:28 +0000
+++ tests/mocks/GSettings/fake_gsettings.cpp	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "fake_gsettings.h"
-
-#include <QList>
-
-GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;
-
-GSettingsControllerQml::GSettingsControllerQml() {
-}
-
-GSettingsControllerQml::~GSettingsControllerQml() {
-    s_controllerInstance = 0;
-}
-
-GSettingsControllerQml* GSettingsControllerQml::instance()  {
-    if(!s_controllerInstance) {
-        s_controllerInstance = new GSettingsControllerQml();
-    }
-    return s_controllerInstance;
-}
-
-void GSettingsControllerQml::registerSettingsObject(GSettingsQml *obj) {
-    m_registeredGSettings.append(obj);
-}
-
-void GSettingsControllerQml::unRegisterSettingsObject(GSettingsQml *obj) {
-    m_registeredGSettings.removeOne(obj);
-}
-
-void GSettingsControllerQml::setPictureUri(const QString &str) {
-    Q_FOREACH (GSettingsQml *obj, m_registeredGSettings) {
-        obj->setPictureUri(str);
-    }
-}
-
-GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
-}
-
-QByteArray GSettingsSchemaQml::id() const {
-    return m_id;
-}
-
-void GSettingsSchemaQml::setId(const QByteArray &id) {
-    if (m_id.isEmpty()) {
-        qWarning("GSettings.schema.id may only be set on construction");
-        return;
-    }
-
-    m_id = id;
-}
-
-QByteArray GSettingsSchemaQml::path() const {
-    return m_path;
-}
-
-void GSettingsSchemaQml::setPath(const QByteArray &path) {
-    if (m_path.isEmpty()) {
-        qWarning("GSettings.schema.path may only be set on construction");
-        return;
-    }
-
-    m_path = path;
-}
-
-GSettingsQml::GSettingsQml(QObject *parent): QObject(parent) {
-    m_schema = new GSettingsSchemaQml(this);
-    GSettingsControllerQml::instance()->registerSettingsObject(this);
-}
-
-GSettingsQml::~GSettingsQml() {
-    GSettingsControllerQml::instance()->unRegisterSettingsObject(this);
-}
-
-GSettingsSchemaQml * GSettingsQml::schema() const {
-    return m_schema;
-}
-
-QString GSettingsQml::pictureUri() const {
-    return m_pictureUri;
-}
-
-void GSettingsQml::setPictureUri(const QString &str) {
-    if (str != m_pictureUri) {
-        m_pictureUri = str;
-        Q_EMIT pictureUriChanged(m_pictureUri);
-    }
-}

=== removed file 'tests/mocks/GSettings/fake_gsettings.h'
--- tests/mocks/GSettings/fake_gsettings.h	2013-07-26 13:28:08 +0000
+++ tests/mocks/GSettings/fake_gsettings.h	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FAKE_GSETTINGS_H
-#define FAKE_GSETTINGS_H
-
-#include <QList>
-#include <QtQml>
-
-class GSettingsSchemaQml: public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QByteArray id READ id WRITE setId)
-
-public:
-    GSettingsSchemaQml(QObject *parent = NULL);
-
-    QByteArray id() const;
-    void setId(const QByteArray &id);
-
-    QByteArray path() const;
-    void setPath(const QByteArray &path);
-
-private:
-    QByteArray m_id;
-    QByteArray m_path;
-};
-
-class GSettingsQml: public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(GSettingsSchemaQml* schema READ schema NOTIFY schemaChanged)
-    Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)
-
-public:
-    GSettingsQml(QObject *parent = NULL);
-    ~GSettingsQml();
-
-    GSettingsSchemaQml * schema() const;
-    QString pictureUri() const;
-
-    void setPictureUri(const QString &str);
-
-Q_SIGNALS:
-    void schemaChanged();
-    void pictureUriChanged(const QString&);
-
-private:
-    GSettingsSchemaQml* m_schema;
-
-    QString m_pictureUri;
-
-    friend class GSettingsSchemaQml;
-};
-
-class GSettingsControllerQml: public QObject
-{
-    Q_OBJECT
-
-public:
-    static GSettingsControllerQml* instance();
-    ~GSettingsControllerQml();
-
-    void registerSettingsObject(GSettingsQml *obj);
-    void unRegisterSettingsObject(GSettingsQml *obj);
-    Q_INVOKABLE void setPictureUri(const QString &str);
-
-private:
-    GSettingsControllerQml();
-
-    static GSettingsControllerQml* s_controllerInstance;
-    QList<GSettingsQml *> m_registeredGSettings;
-};
-
-#endif // FAKE_GSETTINGS_H

=== removed file 'tests/mocks/GSettings/plugin.cpp'
--- tests/mocks/GSettings/plugin.cpp	2013-07-25 17:06:05 +0000
+++ tests/mocks/GSettings/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "plugin.h"
-#include "fake_gsettings.h"
-
-#include <QtQml>
-
-static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
-{
-    return GSettingsControllerQml::instance();
-}
-
-void FakeGSettingsQmlPlugin::registerTypes(const char *uri)
-{
-    qmlRegisterSingletonType<GSettingsControllerQml>(uri, 1, 0, "GSettingsController", controllerProvider);
-    qmlRegisterType<GSettingsQml>(uri, 1, 0, "GSettings");
-    qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",
-                                                   "GSettingsSchema can only be used inside of a GSettings component");
-}

=== removed file 'tests/mocks/GSettings/plugin.h'
--- tests/mocks/GSettings/plugin.h	2013-07-25 16:41:29 +0000
+++ tests/mocks/GSettings/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PLUGIN_H
-#define PLUGIN_H
-
-#include <QtQml/QQmlExtensionPlugin>
-
-class FakeGSettingsQmlPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif // PLUGIN_H

=== removed file 'tests/mocks/GSettings/qmldir'
--- tests/mocks/GSettings/qmldir	2013-07-25 09:21:51 +0000
+++ tests/mocks/GSettings/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module GSettings
-plugin FakeGSettingsQml

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-07-26 11:10:55 +0000
+++ tests/qmltests/CMakeLists.txt	2013-08-06 15:23:36 +0000
@@ -26,7 +26,7 @@
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 set(qmltest_DEFAULT_PROPERTIES "")
 
-add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
+add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                      ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 add_manual_qml_test(Components DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Components DraggingArea)

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2013-08-02 16:16:31 +0000
+++ tests/qmltests/tst_Shell.qml	2013-08-06 15:23:36 +0000
@@ -19,7 +19,6 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import GSettings 1.0
 import Ubuntu.Application 0.1
 import Unity.Test 0.1 as UT
 
@@ -278,18 +277,5 @@
                 }
             } while (!isStill);
         }
-
-        function test_wallpaper_data() {
-            return [
-                {tag: "red", url: "tests/data/unity/backgrounds/red.png"},
-                {tag: "blue", url: "tests/data/unity/backgrounds/blue.png"}
-            ]
-        }
-
-        function test_wallpaper(data) {
-            var backgroundImage = findChild(shell, "backgroundImage")
-            GSettingsController.setPictureUri(data.url)
-            tryCompareFunction(function() { return backgroundImage.source.toString().indexOf(data.url) !== -1; }, true)
-        }
     }
 }