Merge lp:~mardy/ubuntu-system-settings-online-accounts/ui-bugs into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Fix a few UI issues:

- Application title should be "Accounts"
- Explanatory text should use the Caption style
- Cancel button when starting the OAuth process moved to the bottom of the page

(see the linked bugs for details)

Fix a few UI issues:

- Application title should be "Accounts"
- Explanatory text should use the Caption style
- Cancel button when starting the OAuth process moved to the bottom of the page

(see the linked bugs for details)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-i386-ci/41

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

review: Approve (continuous-integration)

[David Barth (dbarth)]

+1

review: Approve

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'src/module/OAuth.qml'
--- src/module/OAuth.qml	2014-02-03 10:27:39 +0000
+++ src/module/OAuth.qml	2014-03-12 15:20:23 +0000
@@ -21,7 +21,7 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
-Column {
+Item {
     id: root
 
     /* To override the parameters coming from the .provider file: */
@@ -40,9 +40,7 @@
     signal authenticationError(variant error)
     signal finished
 
-    anchors.left: parent.left
-    anchors.right: parent.right
-    spacing: units.gu(2)
+    anchors.fill: parent
 
     Component.onCompleted: {
         isNewAccount = (account.accountId === 0)
@@ -84,6 +82,7 @@
         visible: loading
         height: units.gu(7)
         showDivider: false
+        anchors.top: parent.top
 
         Item {
             height: units.gu(5)
@@ -110,6 +109,7 @@
     }
 
     ListItem.SingleControl {
+        anchors.bottom: parent.bottom
         showDivider: false
         control: Button {
             text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
 
=== modified file 'src/module/OAuthMain.qml'
--- src/module/OAuthMain.qml	2013-06-05 11:33:39 +0000
+++ src/module/OAuthMain.qml	2014-03-12 15:20:23 +0000
@@ -20,7 +20,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.OnlineAccounts 0.1
 
-Flickable {
+Item {
     id: root
 
     property url creationComponentUrl: "OAuth.qml"
@@ -32,14 +32,11 @@
 
     signal finished
 
-    anchors.left: parent.left
-    anchors.right: parent.right
-    contentHeight: contentItem.childrenRect.height
+    anchors.fill: parent
 
     Loader {
         id: loader
-        anchors.left: parent.left
-        anchors.right: parent.right
+        anchors.fill: parent
         source: sourceComponent === null ? (account.accountId != 0 ? editingComponentUrl : creationComponentUrl) : ""
         sourceComponent: account.accountId != 0 ? editingComponent : creationComponent
 
 
=== modified file 'src/qml/AddAccountLabel.qml'
--- src/qml/AddAccountLabel.qml	2013-09-09 10:56:53 +0000
+++ src/qml/AddAccountLabel.qml	2014-03-12 15:20:23 +0000
@@ -20,10 +20,9 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
-Label {
+ListItem.Caption {
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.margins: units.gu(2)
     text: i18n.tr("Storing account details here lets apps use the accounts without you having to sign in for each app.")
-    wrapMode: Text.WordWrap
 }
 
=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2013-09-09 10:56:53 +0000
+++ src/qml/MainPage.qml	2014-03-12 15:20:23 +0000
@@ -39,7 +39,7 @@
 
         Page {
             id: mainPage
-            title: i18n.tr("Online Accounts")
+            title: i18n.tr("Accounts")
 
             Loader {
                 id: loader
 
=== modified file 'src/qml/ProviderRequest.qml'
--- src/qml/ProviderRequest.qml	2014-02-03 10:27:39 +0000
+++ src/qml/ProviderRequest.qml	2014-03-12 15:20:23 +0000
@@ -47,7 +47,7 @@
 
         Page {
             id: mainPage
-            title: i18n.tr("Online Accounts")
+            title: i18n.tr("Accounts")
 
             Loader {
                 id: loader
@@ -115,7 +115,7 @@
     Component {
         id: createAccountPageComponent
         Page {
-            title: i18n.tr("Online Accounts")
+            title: i18n.tr("Accounts")
             Loader {
                 anchors.fill: parent
                 sourceComponent: accountCreationPage