Merge lp:~mardy/ubuntu-system-settings-online-accounts/cancel-button into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Add a Cancel button to the OAuth authentication pages

Use signon-ui's new X-PageComponent key to specify a QML page to be used.

Add a Cancel button to the OAuth authentication pages

Use signon-ui's new X-PageComponent key to specify a QML page to be used.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-saucy-amd64-ci/45

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-online-accounts-ci/45/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

works great!

review: Approve

=== modified file 'debian/ubuntu-system-settings-online-accounts.install'
--- debian/ubuntu-system-settings-online-accounts.install	2013-08-06 15:06:54 +0000
+++ debian/ubuntu-system-settings-online-accounts.install	2013-10-08 13:29:43 +0000
@@ -1,4 +1,5 @@
 usr/lib/*/pkgconfig/OnlineAccountsPlugin.pc
 usr/share/locale
+usr/share/signon-ui/online-accounts-ui
 usr/share/ubuntu/settings
 usr/lib/*/ubuntu-system-settings

=== modified file 'src/module/OAuth.qml'
--- src/module/OAuth.qml	2013-10-02 11:25:01 +0000
+++ src/module/OAuth.qml	2013-10-08 13:29:43 +0000
@@ -25,7 +25,7 @@
     id: root
 
     /* To override the parameters coming from the .provider file: */
-    property variant authenticationParameters: null
+    property variant authenticationParameters: {}
     /* To override the default access control list: */
     property variant accessControlList: ["unconfined"]
 
@@ -96,7 +96,13 @@
     function credentialsStored() {
         console.log("Credentials stored, id: " + creds.credentialsId)
         if (creds.credentialsId == 0) return
-        globalAccountSettings.authenticate(authenticationParameters)
+        var parameters = {
+            "X-PageComponent": "file:///usr/share/signon-ui/online-accounts-ui/Page.qml"
+        }
+        for (p in authenticationParameters) {
+            parameters[p] = authenticationParameters[p]
+        }
+        globalAccountSettings.authenticate(parameters)
     }
 
     function cancel() {

=== added directory 'src/signon-ui'
=== added file 'src/signon-ui/Page.qml'
--- src/signon-ui/Page.qml	1970-01-01 00:00:00 +0000
+++ src/signon-ui/Page.qml	2013-10-08 13:29:43 +0000
@@ -0,0 +1,28 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: root
+
+    Loader {
+        id: loader
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: cancelButton.top
+            bottomMargin: Math.max(osk.height - cancelButton.height, 0)
+        }
+        focus: true
+        sourceComponent: browserComponent
+    }
+
+    Button {
+        id: cancelButton
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
+        width: parent.width - units.gu(4)
+        onClicked: request.cancel()
+    }
+}

=== added file 'src/signon-ui/signon-ui.pro'
--- src/signon-ui/signon-ui.pro	1970-01-01 00:00:00 +0000
+++ src/signon-ui/signon-ui.pro	2013-10-08 13:29:43 +0000
@@ -0,0 +1,13 @@
+include(../../common-project-config.pri)
+include($${TOP_SRC_DIR}/common-vars.pri)
+
+TEMPLATE = aux
+
+QML_SOURCES = \
+    Page.qml
+
+OTHER_FILES += $${QML_SOURCES}
+
+qml.files = $${QML_SOURCES}
+qml.path = $${INSTALL_PREFIX}/share/signon-ui/online-accounts-ui
+INSTALLS += qml

=== modified file 'src/src.pro'
--- src/src.pro	2013-06-05 11:33:39 +0000
+++ src/src.pro	2013-10-08 13:29:43 +0000
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     module \
-    online-accounts.pro
+    online-accounts.pro \
+    signon-ui