Merge lp:~andrewsomething/ubuntu-system-settings-online-accounts/1235004 into lp:ubuntu-system-settings-online-accounts

[Andrew Starr-Bochicchio]

Add loading indicator to OAuth page. Fixes: https://bugs.launchpad.net/ubuntu-system-settings-online-accounts/+bug/1235004

[Ken VanDine (ken-vandine)]

This looks pretty good, but you can simplify the visible property. Instead of:

 visible: loading = true

Since loading is a bool, you can just do this:

 visible: loading

review: Needs Fixing

[Alberto Mardegan (mardy)]

Hi Andrew, this is excellent! Thanks a lot!

Just one very minor thing: can you replace the "..." with "…" in line 45?

review: Needs Fixing

[Alberto Mardegan (mardy)]

Looks good to me!

BTW, Andrew, you don't have to request a new merge when you add some commit. Just push it into the same branch, and launchpad will automatically update the diff. :-)

review: Approve

[Ken VanDine (ken-vandine)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/module/OAuth.qml'
--- src/module/OAuth.qml	2013-10-08 12:16:19 +0000
+++ src/module/OAuth.qml	2013-10-09 15:23:24 +0000
@@ -33,6 +33,7 @@
     property bool isNewAccount: false
     property variant __account: account
     property alias globalAccountService: globalAccountSettings
+    property bool loading: true
 
     signal authenticated(variant reply)
     signal authenticationError(variant error)
@@ -40,6 +41,7 @@
 
     anchors.left: parent.left
     anchors.right: parent.right
+    spacing: units.gu(2)
 
     Component.onCompleted: {
         isNewAccount = (account.accountId === 0)
@@ -73,7 +75,37 @@
         account: __account.objectHandle
     }
 
+    ListItem.Base {
+        visible: loading
+        height: units.gu(7)
+        showDivider: false
+
+        Item {
+            height: units.gu(5)
+            width: units.gu(30)
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.top: parent.top
+            anchors.margins: units.gu(1)
+
+            ActivityIndicator {
+                id: loadingIndicator
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                anchors.leftMargin: units.gu(5)
+                running: loading
+                z: 1
+            }
+            Label {
+                text: i18n.dtr("ubuntu-system-settings-online-accounts", "Loading…")
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: loadingIndicator.right
+                anchors.leftMargin: units.gu(3)
+            }
+        }
+    }
+
     ListItem.SingleControl {
+        showDivider: false
         control: Button {
             text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
             width: parent.width - units.gu(4)
@@ -148,4 +180,6 @@
     onAuthenticated: completeCreation(reply)
 
     onAuthenticationError: root.cancel()
+
+    onFinished: loading = false
 }