Online Accounts setup for Ubuntu Touch

Merge lp:~mardy/ubuntu-system-settings-online-accounts/signon-page-title into lp:ubuntu-system-settings-online-accounts

  1. signon-page-title
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 346
Merged at revision: 349
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/signon-page-title
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 180 lines (+31/-14)
8 files modified
online-accounts-ui/browser-request.cpp (+2/-0)
online-accounts-ui/dialog-request.cpp (+2/-14)
online-accounts-ui/qml/SignOnUiPage.qml (+2/-0)
online-accounts-ui/signonui-request.cpp (+13/-0)
online-accounts-ui/signonui-request.h (+1/-0)
tests/online-accounts-ui/mock/signonui-request-mock.cpp (+6/-0)
tests/online-accounts-ui/mock/signonui-request-mock.h (+2/-0)
tests/online-accounts-ui/tst_browser_request.cpp (+3/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/signon-page-title
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Online Accounts Pending
Review via email: mp+291246@code.launchpad.net

Commit message

Use provider name as page title

Description of the change

Use provider name as page title

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/290/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/1001/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/1001/console

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

review: Needs Fixing (continuous-integration)
lp:~mardy/ubuntu-system-settings-online-accounts/signon-page-title updated
346. By Alberto Mardegan

Merge from trunk

[ Alberto Mardegan ]
* Always show the UbuntuOne provider in the providers list (LP:
  #1559506)
* Enable scrolling in authorization page. (LP: #1561031)
[ CI Train Bot ]
* Resync trunk.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/292/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/1004/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/1004/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'online-accounts-ui/browser-request.cpp'
--- online-accounts-ui/browser-request.cpp 2015-11-23 13:37:19 +0000
+++ online-accounts-ui/browser-request.cpp 2016-04-15 08:30:35 +0000
@@ -52,6 +52,7 @@
52{52{
53 Q_OBJECT53 Q_OBJECT
54 Q_DECLARE_PUBLIC(BrowserRequest)54 Q_DECLARE_PUBLIC(BrowserRequest)
55 Q_PROPERTY(QString title READ title CONSTANT)
55 Q_PROPERTY(QUrl pageComponentUrl READ pageComponentUrl CONSTANT)56 Q_PROPERTY(QUrl pageComponentUrl READ pageComponentUrl CONSTANT)
56 Q_PROPERTY(QUrl currentUrl READ currentUrl WRITE setCurrentUrl)57 Q_PROPERTY(QUrl currentUrl READ currentUrl WRITE setCurrentUrl)
57 Q_PROPERTY(QUrl startUrl READ startUrl CONSTANT)58 Q_PROPERTY(QUrl startUrl READ startUrl CONSTANT)
@@ -64,6 +65,7 @@
6465
65 void start();66 void start();
6667
68 QString title() const { return q_ptr->windowTitle(); }
67 void setCurrentUrl(const QUrl &url);69 void setCurrentUrl(const QUrl &url);
68 QUrl pageComponentUrl() const;70 QUrl pageComponentUrl() const;
69 QUrl currentUrl() const { return m_currentUrl; }71 QUrl currentUrl() const { return m_currentUrl; }
7072
=== modified file 'online-accounts-ui/dialog-request.cpp'
--- online-accounts-ui/dialog-request.cpp 2015-11-06 06:54:23 +0000
+++ online-accounts-ui/dialog-request.cpp 2016-04-15 08:30:35 +0000
@@ -69,7 +69,7 @@
6969
70 void start();70 void start();
7171
72 QString title() const { return m_title; }72 QString title() const { return q_ptr->windowTitle(); }
73 void setUserName(const QString &userName);73 void setUserName(const QString &userName);
74 QString userName() const { return m_userName; }74 QString userName() const { return m_userName; }
75 void setPassword(const QString &password);75 void setPassword(const QString &password);
@@ -101,7 +101,6 @@
101101
102private:102private:
103 Dialog *m_dialog;103 Dialog *m_dialog;
104 QString m_title;
105 QString m_userName;104 QString m_userName;
106 QString m_password;105 QString m_password;
107 QString m_userNameText;106 QString m_userNameText;
@@ -128,17 +127,6 @@
128{127{
129 const QVariantMap &params = q_ptr->parameters();128 const QVariantMap &params = q_ptr->parameters();
130129
131 if (params.contains(SSOUI_KEY_TITLE)) {
132 m_title = params[SSOUI_KEY_TITLE].toString();
133 } else if (params.contains(SSOUI_KEY_CAPTION)) {
134 m_title = OnlineAccountsUi::_("Web authentication for %1",
135 SIGNONUI_I18N_DOMAIN).
136 arg(params[SSOUI_KEY_CAPTION].toString());
137 } else {
138 m_title = OnlineAccountsUi::_("Web authentication",
139 SIGNONUI_I18N_DOMAIN);
140 }
141
142 m_queryUsername = params.value(SSOUI_KEY_QUERYUSERNAME, false).toBool();130 m_queryUsername = params.value(SSOUI_KEY_QUERYUSERNAME, false).toBool();
143 m_userName = params.value(SSOUI_KEY_USERNAME).toString();131 m_userName = params.value(SSOUI_KEY_USERNAME).toString();
144 m_userNameText = params.value(SSOUI_KEY_USERNAME_TEXT).toString();132 m_userNameText = params.value(SSOUI_KEY_USERNAME_TEXT).toString();
@@ -187,7 +175,7 @@
187175
188 if (!q->hasHandler()) {176 if (!q->hasHandler()) {
189 m_dialog = new Dialog;177 m_dialog = new Dialog;
190 m_dialog->setTitle(m_title);178 m_dialog->setTitle(title());
191179
192 QObject::connect(m_dialog, SIGNAL(finished(int)),180 QObject::connect(m_dialog, SIGNAL(finished(int)),
193 this, SLOT(onFinished()));181 this, SLOT(onFinished()));
194182
=== modified file 'online-accounts-ui/qml/SignOnUiPage.qml'
--- online-accounts-ui/qml/SignOnUiPage.qml 2015-10-22 08:28:26 +0000
+++ online-accounts-ui/qml/SignOnUiPage.qml 2016-04-15 08:30:35 +0000
@@ -12,6 +12,8 @@
12 height: units.gu(90)12 height: units.gu(90)
1313
14 Page {14 Page {
15 title: signonRequest.title
16
15 WebView {17 WebView {
16 id: loader18 id: loader
17 signonRequest: root.signonRequest19 signonRequest: root.signonRequest
1820
=== modified file 'online-accounts-ui/signonui-request.cpp'
--- online-accounts-ui/signonui-request.cpp 2015-02-09 13:05:38 +0000
+++ online-accounts-ui/signonui-request.cpp 2016-04-15 08:30:35 +0000
@@ -26,6 +26,7 @@
26#include "globals.h"26#include "globals.h"
2727
28#include <Accounts/Account>28#include <Accounts/Account>
29#include <Accounts/Provider>
29#include <OnlineAccountsPlugin/account-manager.h>30#include <OnlineAccountsPlugin/account-manager.h>
30#include <OnlineAccountsPlugin/request-handler.h>31#include <OnlineAccountsPlugin/request-handler.h>
31#include <QDBusArgument>32#include <QDBusArgument>
@@ -219,6 +220,18 @@
219 d->m_clientData.value("providerId").toString();220 d->m_clientData.value("providerId").toString();
220}221}
221222
223QString Request::windowTitle() const
224{
225 if (parameters().contains(SSOUI_KEY_TITLE)) {
226 return parameters()[SSOUI_KEY_TITLE].toString();
227 }
228
229 OnlineAccountsUi::AccountManager *manager =
230 OnlineAccountsUi::AccountManager::instance();
231 Accounts::Provider provider = manager->provider(providerId());
232 return provider.displayName();
233}
234
222const QVariantMap &Request::clientData() const235const QVariantMap &Request::clientData() const
223{236{
224 Q_D(const Request);237 Q_D(const Request);
225238
=== modified file 'online-accounts-ui/signonui-request.h'
--- online-accounts-ui/signonui-request.h 2015-01-09 10:12:03 +0000
+++ online-accounts-ui/signonui-request.h 2016-04-15 08:30:35 +0000
@@ -46,6 +46,7 @@
46 QString method() const;46 QString method() const;
47 QString mechanism() const;47 QString mechanism() const;
48 QString providerId() const;48 QString providerId() const;
49 QString windowTitle() const;
4950
50 const QVariantMap &clientData() const;51 const QVariantMap &clientData() const;
5152
5253
=== modified file 'tests/online-accounts-ui/mock/signonui-request-mock.cpp'
--- tests/online-accounts-ui/mock/signonui-request-mock.cpp 2015-01-09 10:12:03 +0000
+++ tests/online-accounts-ui/mock/signonui-request-mock.cpp 2016-04-15 08:30:35 +0000
@@ -92,6 +92,12 @@
92 return d->m_providerId;92 return d->m_providerId;
93}93}
9494
95QString Request::windowTitle() const
96{
97 Q_D(const Request);
98 return d->m_windowTitle;
99}
100
95const QVariantMap &Request::clientData() const101const QVariantMap &Request::clientData() const
96{102{
97 Q_D(const Request);103 Q_D(const Request);
98104
=== modified file 'tests/online-accounts-ui/mock/signonui-request-mock.h'
--- tests/online-accounts-ui/mock/signonui-request-mock.h 2015-01-09 10:12:03 +0000
+++ tests/online-accounts-ui/mock/signonui-request-mock.h 2016-04-15 08:30:35 +0000
@@ -40,12 +40,14 @@
40 static RequestPrivate *mocked(Request *r) { return r->d_ptr; }40 static RequestPrivate *mocked(Request *r) { return r->d_ptr; }
4141
42 void setProviderId(const QString &id) { m_providerId = id; }42 void setProviderId(const QString &id) { m_providerId = id; }
43 void setWindowTitle(const QString &title) { m_windowTitle = title; }
4344
44private:45private:
45 mutable Request *q_ptr;46 mutable Request *q_ptr;
46 QVariantMap m_clientData;47 QVariantMap m_clientData;
47 QPointer<RequestHandler> m_handler;48 QPointer<RequestHandler> m_handler;
48 QString m_providerId;49 QString m_providerId;
50 QString m_windowTitle;
49};51};
5052
51} // namespace53} // namespace
5254
=== modified file 'tests/online-accounts-ui/tst_browser_request.cpp'
--- tests/online-accounts-ui/tst_browser_request.cpp 2015-10-01 06:39:17 +0000
+++ tests/online-accounts-ui/tst_browser_request.cpp 2016-04-15 08:30:35 +0000
@@ -148,6 +148,8 @@
148 SignOnUi::RequestPrivate *mockedRequest =148 SignOnUi::RequestPrivate *mockedRequest =
149 SignOnUi::RequestPrivate::mocked(&request);149 SignOnUi::RequestPrivate::mocked(&request);
150 mockedRequest->setProviderId(providerId);150 mockedRequest->setProviderId(providerId);
151 QString title = providerId.toUpper();
152 mockedRequest->setWindowTitle(title);
151 request.setHandler(&handler);153 request.setHandler(&handler);
152154
153 request.start();155 request.start();
@@ -155,6 +157,7 @@
155 QCOMPARE(requestChanged.count(), 1);157 QCOMPARE(requestChanged.count(), 1);
156 QObject *req = handler.request();158 QObject *req = handler.request();
157159
160 QCOMPARE(req->property("title").toString(), title);
158 QCOMPARE(req->property("pageComponentUrl").toUrl().toString(), pageComponentUrl);161 QCOMPARE(req->property("pageComponentUrl").toUrl().toString(), pageComponentUrl);
159 QCOMPARE(req->property("currentUrl").toUrl().toString(), QString());162 QCOMPARE(req->property("currentUrl").toUrl().toString(), QString());
160 QCOMPARE(req->property("startUrl").toUrl().toString(), startUrl);163 QCOMPARE(req->property("startUrl").toUrl().toString(), startUrl);

Subscribers

People subscribed via source and target branches