Merge lp:~diegosarmentero/ubuntu-system-settings/not-credentials into lp:ubuntu-system-settings

[Diego Sarmentero]

- Not dismiss Credentials warning with other messages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:709
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/827/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/497
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/497/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/271
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/271/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks fine, thanks!

review: Approve

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-05-13 14:30:04 +0000
+++ plugins/system-update/PageComponent.qml	2014-05-15 12:31:03 +0000
@@ -37,6 +37,8 @@
     property bool installAll: false
     property int updatesAvailable: 0
 
+    property var notificationAction;
+
     DeviceInfo {
         id: deviceInfo
     }
@@ -76,7 +78,6 @@
     states: [
         State {
             name: "SEARCHING"
-            PropertyChanges { target: notification; visible: false}
             PropertyChanges { target: installAllButton; visible: false}
             PropertyChanges { target: checkForUpdatesArea; visible: true}
             PropertyChanges { target: updateNotification; visible: false}
@@ -90,10 +91,6 @@
         },
         State {
             name: "SYSTEMUPDATEFAILED"
-            PropertyChanges { target: notification; text: i18n.tr("System update has failed.")}
-            PropertyChanges { target: notification; onClicked: undefined }
-            PropertyChanges { target: notification; progression: false}
-            PropertyChanges { target: notification; visible: true}
             PropertyChanges { target: installingImageUpdate; visible: false}
             PropertyChanges { target: installAllButton; visible: false}
             PropertyChanges { target: checkForUpdatesArea; visible: false}
@@ -104,16 +101,6 @@
             PropertyChanges { target: updateList; visible: true}
             PropertyChanges { target: installAllButton; visible: true}
             PropertyChanges { target: updateNotification; visible: false}
-        },
-        State {
-            name: "NOCREDENTIALS"
-            PropertyChanges { target: updateList; visible: true}
-            PropertyChanges { target: notification; text: i18n.tr("Please log into your Ubuntu One account.")}
-            PropertyChanges { target: notification; onClicked: root.open_online_accounts() }
-            PropertyChanges { target: notification; progression: true}
-            PropertyChanges { target: notification; visible: true}
-            PropertyChanges { target: updateNotification; text: i18n.tr("Credentials not found")}
-            PropertyChanges { target: updateNotification; visible: true}
         }
     ]
 
@@ -126,22 +113,19 @@
         objectName: "updateManager"
 
         Component.onCompleted: {
+            credentialsNotification.visible = false;
             root.state = "SEARCHING";
             updateManager.checkUpdates();
         }
 
         onUpdateAvailableFound: {
-            if (updateManager.model.length > 0) {
-                root.updatesAvailable = updateManager.model.length;
-                root.state = "UPDATE";
-                root.installAll = downloading
-            } else {
-                root.state = "NOUPDATES";
-            }
+            root.updatesAvailable = updateManager.model.length;
+            root.state = "UPDATE";
+            root.installAll = downloading;
         }
 
         onUpdatesNotFound: {
-            if (root.state != "NOCREDENTIALS") {
+            if (!credentialsNotification.visible) {
                 root.state = "NOUPDATES";
             }
         }
@@ -151,7 +135,10 @@
         }
 
         onCredentialsNotFound: {
-            root.state = "NOCREDENTIALS";
+            credentialsNotification.visible = true;
+            notification.text = i18n.tr("Please log into your Ubuntu One account.");
+            notification.progression = true;
+            notificationAction = root.open_online_accounts;
         }
 
         onSystemUpdateDownloaded: {
@@ -163,7 +150,11 @@
             root.state = "SYSTEMUPDATEFAILED";
             if (lastReason) {
                 notification.text = lastReason;
+            } else {
+                notification.text = i18n.tr("System update has failed.");
             }
+            notification.progression = false;
+            notificationAction = undefined;
         }
 
         onUpdateProcessFailed: {
@@ -434,8 +425,14 @@
     ListItem.Standard {
         id: notification
         objectName: "notification"
-        visible: false
+        visible: updateNotification.visible || credentialsNotification.visible ? true : false
         anchors.bottom: configuration.top
+
+        onClicked: {
+            if (notificationAction) {
+                notificationAction();
+            }
+        }
     }
 
     ListItem.SingleValue {
@@ -483,6 +480,32 @@
     }
 
     Rectangle {
+        id: credentialsNotification
+        objectName: "credentialsNotification"
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: installAllButton.bottom
+            bottom: notification.visible ? notification.top : configuration.top
+            margins: units.gu(2)
+            bottomMargin: 0
+        }
+        visible: false
+
+        color: "transparent"
+
+        Column {
+            anchors.centerIn: parent
+
+            Label {
+                text: i18n.tr("Credentials not found")
+                anchors.horizontalCenter: parent.horizontalCenter
+                fontSize: "large"
+            }
+        }
+    }
+
+    Rectangle {
         id: installingImageUpdate
         objectName: "installingImageUpdate"
         anchors.fill: parent