Merge lp:~ibelieve/friends-app/improved-message into lp:friends-app

[Michael Spencer]

Improved the no accounts message

Improved the No Accounts message, centered in, and hid the back button.

The message will also go away once an account is added.

[Ken VanDine (ken-vandine)]

Looks good, we'll be able to enable that addButton real soon. The API for online accounts to add accounts will be is ready to be merged :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-app-autolanding/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-autolanding/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1066/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1049
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/953/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1066
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1066/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1049
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1049/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3631
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1738

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-app-autolanding/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-autolanding/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1067/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1050
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/954/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1067
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1050
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1050/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3632
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1739

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'qml/Setup.qml'
--- qml/Setup.qml	2013-07-22 13:40:57 +0000
+++ qml/Setup.qml	2013-11-22 16:59:46 +0000
@@ -17,43 +17,42 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-Item {
-    anchors {
-        fill: parent
-    }
-    width: parent.width
-
-
-    Text {
-        id: noAccountsMsg
-        anchors {
-            margins: units.gu(2)
-        }
-        width: parent.width * 0.9
-        text: i18n.tr("No online accounts configured, you can add one in System Settings")
-        font.family: "Ubuntu"
+Column {
+
+    Label {
+        id: header
+        text: i18n.tr("No online accounts configured")
+        anchors.horizontalCenter: parent.horizontalCenter
+        fontSize: "large"
         font.bold: true
-        font.pointSize: 18
-        wrapMode: Text.WordWrap
-        color: Theme.palette.normal.baseText
-    }
-
-    /*
-    Button {
-        id: addButton
-        anchors {
-            top: parent.top
-            left: noAccountsMsg.right
-            margins: units.gu(2)
-        }
-        text: i18n.tr("Add Accounts")
-        onClicked: {
-            console.log ("Add Accounts activated");
-            Qt.openUrlExternally("system:///credentials");
-
-        }
-    }
-    */
+    }
+
+    Label {
+        text: i18n.tr("To configure accounts, go to System Settings and choose \"Online Accounts\".")
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        horizontalAlignment: Text.AlignHCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+    }
+
+//    Item {
+//        height: units.gu(4)
+//        width: parent.width
+//    }
+
+//    Button {
+//        id: addButton
+//        anchors.horizontalCenter: parent.horizontalCenter
+
+//        text: i18n.tr("Add account...")
+//        width: header.width - units.gu(2)//Math.min(header.width, parent.width * 3/4)
+//        onClicked: {
+//            console.log ("Add Accounts activated");
+//            Qt.openUrlExternally("settings:///system/credentials");
+
+//        }
+//    }
+
 
 }
 

=== modified file 'qml/friends-app.qml'
--- qml/friends-app.qml	2013-11-03 10:35:46 +0000
+++ qml/friends-app.qml	2013-11-22 16:59:46 +0000
@@ -28,8 +28,8 @@
     objectName: "main"
     automaticOrientation: true
 
-    width: units.gu(60)
-    height: units.gu(90)
+    width: units.gu(48)
+    height: units.gu(75)
 
     backgroundColor: "#273d66"
     headerColor: "#395996"
@@ -64,6 +64,18 @@
     AccountServiceModel {
         id: accounts
         serviceType: "microblogging"
+
+        onCountChanged: {
+            if (!loaded) return
+
+            if (pageStack.currentPage === noAccountsPage && count > 0) {
+                pageStack.pop()
+            }
+
+            if (pageStack.currentPage !== noAccountsPage && count === 0) {
+                pageStack.push(noAccountsPage)
+            }
+        }
     }
 
     FriendsDispatcher {
@@ -72,24 +84,32 @@
 
     PageStack {
         id: pageStack
+
+        property bool loaded: false
+
         Component.onCompleted: {
             console.log ("accounts.count: "+accounts.count);
             pageStack.push(mainPage);
             if (accounts.count < 1)
                 pageStack.push(noAccountsPage);
+
+            loaded = true
         }
 
         Page {
             id: noAccountsPage
-            title: i18n.tr("Setup Accounts")
+            title: i18n.tr("Friends")
             Setup {
                 id: noAccounts
                 anchors {
-                    fill: parent
+                    centerIn: parent
                 }
+
+                width: parent.width - units.gu(4)
             }
             visible: false
             tools: ToolbarItems {
+                back: null
             }
         }