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
1=== modified file 'online-accounts-ui/browser-request.cpp'
2--- online-accounts-ui/browser-request.cpp 2015-11-23 13:37:19 +0000
3+++ online-accounts-ui/browser-request.cpp 2016-04-15 08:30:35 +0000
4@@ -52,6 +52,7 @@
5 {
6 Q_OBJECT
7 Q_DECLARE_PUBLIC(BrowserRequest)
8+ Q_PROPERTY(QString title READ title CONSTANT)
9 Q_PROPERTY(QUrl pageComponentUrl READ pageComponentUrl CONSTANT)
10 Q_PROPERTY(QUrl currentUrl READ currentUrl WRITE setCurrentUrl)
11 Q_PROPERTY(QUrl startUrl READ startUrl CONSTANT)
12@@ -64,6 +65,7 @@
13
14 void start();
15
16+ QString title() const { return q_ptr->windowTitle(); }
17 void setCurrentUrl(const QUrl &url);
18 QUrl pageComponentUrl() const;
19 QUrl currentUrl() const { return m_currentUrl; }
20
21=== modified file 'online-accounts-ui/dialog-request.cpp'
22--- online-accounts-ui/dialog-request.cpp 2015-11-06 06:54:23 +0000
23+++ online-accounts-ui/dialog-request.cpp 2016-04-15 08:30:35 +0000
24@@ -69,7 +69,7 @@
25
26 void start();
27
28- QString title() const { return m_title; }
29+ QString title() const { return q_ptr->windowTitle(); }
30 void setUserName(const QString &userName);
31 QString userName() const { return m_userName; }
32 void setPassword(const QString &password);
33@@ -101,7 +101,6 @@
34
35 private:
36 Dialog *m_dialog;
37- QString m_title;
38 QString m_userName;
39 QString m_password;
40 QString m_userNameText;
41@@ -128,17 +127,6 @@
42 {
43 const QVariantMap &params = q_ptr->parameters();
44
45- if (params.contains(SSOUI_KEY_TITLE)) {
46- m_title = params[SSOUI_KEY_TITLE].toString();
47- } else if (params.contains(SSOUI_KEY_CAPTION)) {
48- m_title = OnlineAccountsUi::_("Web authentication for %1",
49- SIGNONUI_I18N_DOMAIN).
50- arg(params[SSOUI_KEY_CAPTION].toString());
51- } else {
52- m_title = OnlineAccountsUi::_("Web authentication",
53- SIGNONUI_I18N_DOMAIN);
54- }
55-
56 m_queryUsername = params.value(SSOUI_KEY_QUERYUSERNAME, false).toBool();
57 m_userName = params.value(SSOUI_KEY_USERNAME).toString();
58 m_userNameText = params.value(SSOUI_KEY_USERNAME_TEXT).toString();
59@@ -187,7 +175,7 @@
60
61 if (!q->hasHandler()) {
62 m_dialog = new Dialog;
63- m_dialog->setTitle(m_title);
64+ m_dialog->setTitle(title());
65
66 QObject::connect(m_dialog, SIGNAL(finished(int)),
67 this, SLOT(onFinished()));
68
69=== modified file 'online-accounts-ui/qml/SignOnUiPage.qml'
70--- online-accounts-ui/qml/SignOnUiPage.qml 2015-10-22 08:28:26 +0000
71+++ online-accounts-ui/qml/SignOnUiPage.qml 2016-04-15 08:30:35 +0000
72@@ -12,6 +12,8 @@
73 height: units.gu(90)
74
75 Page {
76+ title: signonRequest.title
77+
78 WebView {
79 id: loader
80 signonRequest: root.signonRequest
81
82=== modified file 'online-accounts-ui/signonui-request.cpp'
83--- online-accounts-ui/signonui-request.cpp 2015-02-09 13:05:38 +0000
84+++ online-accounts-ui/signonui-request.cpp 2016-04-15 08:30:35 +0000
85@@ -26,6 +26,7 @@
86 #include "globals.h"
87
88 #include <Accounts/Account>
89+#include <Accounts/Provider>
90 #include <OnlineAccountsPlugin/account-manager.h>
91 #include <OnlineAccountsPlugin/request-handler.h>
92 #include <QDBusArgument>
93@@ -219,6 +220,18 @@
94 d->m_clientData.value("providerId").toString();
95 }
96
97+QString Request::windowTitle() const
98+{
99+ if (parameters().contains(SSOUI_KEY_TITLE)) {
100+ return parameters()[SSOUI_KEY_TITLE].toString();
101+ }
102+
103+ OnlineAccountsUi::AccountManager *manager =
104+ OnlineAccountsUi::AccountManager::instance();
105+ Accounts::Provider provider = manager->provider(providerId());
106+ return provider.displayName();
107+}
108+
109 const QVariantMap &Request::clientData() const
110 {
111 Q_D(const Request);
112
113=== modified file 'online-accounts-ui/signonui-request.h'
114--- online-accounts-ui/signonui-request.h 2015-01-09 10:12:03 +0000
115+++ online-accounts-ui/signonui-request.h 2016-04-15 08:30:35 +0000
116@@ -46,6 +46,7 @@
117 QString method() const;
118 QString mechanism() const;
119 QString providerId() const;
120+ QString windowTitle() const;
121
122 const QVariantMap &clientData() const;
123
124
125=== modified file 'tests/online-accounts-ui/mock/signonui-request-mock.cpp'
126--- tests/online-accounts-ui/mock/signonui-request-mock.cpp 2015-01-09 10:12:03 +0000
127+++ tests/online-accounts-ui/mock/signonui-request-mock.cpp 2016-04-15 08:30:35 +0000
128@@ -92,6 +92,12 @@
129 return d->m_providerId;
130 }
131
132+QString Request::windowTitle() const
133+{
134+ Q_D(const Request);
135+ return d->m_windowTitle;
136+}
137+
138 const QVariantMap &Request::clientData() const
139 {
140 Q_D(const Request);
141
142=== modified file 'tests/online-accounts-ui/mock/signonui-request-mock.h'
143--- tests/online-accounts-ui/mock/signonui-request-mock.h 2015-01-09 10:12:03 +0000
144+++ tests/online-accounts-ui/mock/signonui-request-mock.h 2016-04-15 08:30:35 +0000
145@@ -40,12 +40,14 @@
146 static RequestPrivate *mocked(Request *r) { return r->d_ptr; }
147
148 void setProviderId(const QString &id) { m_providerId = id; }
149+ void setWindowTitle(const QString &title) { m_windowTitle = title; }
150
151 private:
152 mutable Request *q_ptr;
153 QVariantMap m_clientData;
154 QPointer<RequestHandler> m_handler;
155 QString m_providerId;
156+ QString m_windowTitle;
157 };
158
159 } // namespace
160
161=== modified file 'tests/online-accounts-ui/tst_browser_request.cpp'
162--- tests/online-accounts-ui/tst_browser_request.cpp 2015-10-01 06:39:17 +0000
163+++ tests/online-accounts-ui/tst_browser_request.cpp 2016-04-15 08:30:35 +0000
164@@ -148,6 +148,8 @@
165 SignOnUi::RequestPrivate *mockedRequest =
166 SignOnUi::RequestPrivate::mocked(&request);
167 mockedRequest->setProviderId(providerId);
168+ QString title = providerId.toUpper();
169+ mockedRequest->setWindowTitle(title);
170 request.setHandler(&handler);
171
172 request.start();
173@@ -155,6 +157,7 @@
174 QCOMPARE(requestChanged.count(), 1);
175 QObject *req = handler.request();
176
177+ QCOMPARE(req->property("title").toString(), title);
178 QCOMPARE(req->property("pageComponentUrl").toUrl().toString(), pageComponentUrl);
179 QCOMPARE(req->property("currentUrl").toUrl().toString(), QString());
180 QCOMPARE(req->property("startUrl").toUrl().toString(), startUrl);

Subscribers

People subscribed via source and target branches