Online Accounts setup for Ubuntu Touch

Merge lp:~mardy/ubuntu-system-settings-online-accounts/uitk1.3 into lp:ubuntu-system-settings-online-accounts

  1. uitk1.3
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Pat McGowan
Approved revision: 301
Merged at revision: 304
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/uitk1.3
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 533 lines (+70/-65)
25 files modified
client/OnlineAccountsClient/setup.cpp (+2/-2)
client/examples/CreateFacebook.qml (+1/-1)
debian/control (+1/-0)
online-accounts-ui/qml/AccountCreationPage.qml (+2/-2)
online-accounts-ui/qml/AuthorizationPage.qml (+3/-3)
online-accounts-ui/qml/ProviderRequest.qml (+2/-3)
online-accounts-ui/qml/SignOnUiDialog.qml (+3/-3)
online-accounts-ui/qml/SignOnUiPage.qml (+2/-2)
plugins/example/Main.qml (+2/-2)
plugins/module/OAuth.qml (+3/-3)
plugins/module/OAuthMain.qml (+2/-2)
plugins/module/Options.qml (+4/-4)
plugins/module/RemovalConfirmation.qml (+4/-4)
plugins/module/ServiceItem.qml (+3/-3)
plugins/module/ServiceSwitches.qml (+3/-3)
plugins/module/WebView.qml (+1/-1)
system-settings-plugin/AccountEditPage.qml (+2/-2)
system-settings-plugin/AccountItem.qml (+3/-3)
system-settings-plugin/AccountsPage.qml (+3/-3)
system-settings-plugin/AddAccountLabel.qml (+3/-3)
system-settings-plugin/MainPage.qml (+3/-3)
system-settings-plugin/NewAccountPage.qml (+2/-2)
system-settings-plugin/NoAccountsPage.qml (+3/-3)
system-settings-plugin/ProviderPluginList.qml (+2/-2)
system-settings-plugin/ProvidersList.qml (+11/-6)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/uitk1.3
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
David Barth (community) Approve
Review via email: mp+275279@code.launchpad.net

Commit message

Use version 1.3 of Ubuntu.Components

Description of the change

Use version 1.3 of Ubuntu.Components

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

PASSED: Continuous integration, rev:299
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/892
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/892
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/892/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24458

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

review: Approve (continuous-integration)
lp:~mardy/ubuntu-system-settings-online-accounts/uitk1.3 updated
300. By Alberto Mardegan

pressed will refer to the AbstractButton's MouseArea, so rename the property to avoid the conflict

301. By Alberto Mardegan

Don't use deprecated property

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

FAILED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/263/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/971/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/51
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/971/console

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

review: Needs Fixing (continuous-integration)
lp:~mardy/ubuntu-system-settings-online-accounts/uitk1.3 updated
302. By Alberto Mardegan

Make sure that the V2 API is installed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/OnlineAccountsClient/setup.cpp'
2--- client/OnlineAccountsClient/setup.cpp 2015-09-02 14:32:46 +0000
3+++ client/OnlineAccountsClient/setup.cpp 2015-10-30 15:39:29 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2013 Canonical Ltd.
7+ * Copyright (C) 2013-2015 Canonical Ltd.
8 *
9 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
10 *
11@@ -176,7 +176,7 @@
12 *
13 * \qml
14 * import QtQuick 2.0
15- * import Ubuntu.Components 0.1
16+ * import Ubuntu.Components 1.3
17 * import Ubuntu.OnlineAccounts.Client 0.1
18 *
19 * Rectangle {
20
21=== modified file 'client/examples/CreateFacebook.qml'
22--- client/examples/CreateFacebook.qml 2013-08-01 08:20:17 +0000
23+++ client/examples/CreateFacebook.qml 2015-10-30 15:39:29 +0000
24@@ -1,5 +1,5 @@
25 import QtQuick 2.0
26-import Ubuntu.Components 0.1
27+import Ubuntu.Components 1.3
28 import Ubuntu.OnlineAccounts.Client 0.1
29
30 Rectangle {
31
32=== modified file 'debian/control'
33--- debian/control 2015-09-02 14:54:04 +0000
34+++ debian/control 2015-10-30 15:39:29 +0000
35@@ -41,6 +41,7 @@
36 ${shlibs:Depends},
37 libonline-accounts-daemon1,
38 liboxideqt-qmlplugin (>= 1.2.0),
39+ qml-module-ubuntu-onlineaccounts2,
40 qtdeclarative5-accounts-plugin (>= 0.3),
41 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
42 signon-ui-service,
43
44=== modified file 'online-accounts-ui/qml/AccountCreationPage.qml'
45--- online-accounts-ui/qml/AccountCreationPage.qml 2014-09-25 11:40:59 +0000
46+++ online-accounts-ui/qml/AccountCreationPage.qml 2015-10-30 15:39:29 +0000
47@@ -1,5 +1,5 @@
48 /*
49- * Copyright (C) 2013 Canonical Ltd.
50+ * Copyright (C) 2013-2015 Canonical Ltd.
51 *
52 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
53 *
54@@ -17,7 +17,7 @@
55 */
56
57 import QtQuick 2.0
58-import Ubuntu.Components 0.1
59+import Ubuntu.Components 1.3
60 import Ubuntu.OnlineAccounts 0.1
61
62 Item {
63
64=== modified file 'online-accounts-ui/qml/AuthorizationPage.qml'
65--- online-accounts-ui/qml/AuthorizationPage.qml 2014-10-24 18:21:11 +0000
66+++ online-accounts-ui/qml/AuthorizationPage.qml 2015-10-30 15:39:29 +0000
67@@ -1,5 +1,5 @@
68 /*
69- * Copyright (C) 2013 Canonical Ltd.
70+ * Copyright (C) 2013-2015 Canonical Ltd.
71 *
72 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
73 *
74@@ -17,8 +17,8 @@
75 */
76
77 import QtQuick 2.0
78-import Ubuntu.Components 0.1
79-import Ubuntu.Components.ListItems 0.1 as ListItem
80+import Ubuntu.Components 1.3
81+import Ubuntu.Components.ListItems 1.3 as ListItem
82
83 Flickable {
84 id: root
85
86=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
87--- online-accounts-ui/qml/ProviderRequest.qml 2014-11-27 08:58:57 +0000
88+++ online-accounts-ui/qml/ProviderRequest.qml 2015-10-30 15:39:29 +0000
89@@ -1,5 +1,5 @@
90 /*
91- * Copyright (C) 2013 Canonical Ltd.
92+ * Copyright (C) 2013-2015 Canonical Ltd.
93 *
94 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
95 *
96@@ -17,7 +17,7 @@
97 */
98
99 import QtQuick 2.0
100-import Ubuntu.Components 0.1
101+import Ubuntu.Components 1.3
102 import Ubuntu.OnlineAccounts 0.1
103 import Ubuntu.OnlineAccounts.Internal 1.0
104
105@@ -34,7 +34,6 @@
106
107 width: units.gu(48)
108 height: units.gu(60)
109- useDeprecatedToolbar: false
110 automaticOrientation: true
111
112 Component.onCompleted: {
113
114=== modified file 'online-accounts-ui/qml/SignOnUiDialog.qml'
115--- online-accounts-ui/qml/SignOnUiDialog.qml 2014-11-05 08:04:55 +0000
116+++ online-accounts-ui/qml/SignOnUiDialog.qml 2015-10-30 15:39:29 +0000
117@@ -1,7 +1,7 @@
118 import QtQuick 2.0
119-import Ubuntu.Components 0.1
120-import Ubuntu.Components.Popups 0.1
121-import Ubuntu.Components.ListItems 0.1 as ListItem
122+import Ubuntu.Components 1.3
123+import Ubuntu.Components.Popups 1.3
124+import Ubuntu.Components.ListItems 1.3 as ListItem
125
126 Item {
127 id: root
128
129=== modified file 'online-accounts-ui/qml/SignOnUiPage.qml'
130--- online-accounts-ui/qml/SignOnUiPage.qml 2014-06-12 10:54:13 +0000
131+++ online-accounts-ui/qml/SignOnUiPage.qml 2015-10-30 15:39:29 +0000
132@@ -1,6 +1,6 @@
133 import QtQuick 2.0
134-import Ubuntu.Components 0.1
135-import Ubuntu.Components.ListItems 0.1 as ListItem
136+import Ubuntu.Components 1.3
137+import Ubuntu.Components.ListItems 1.3 as ListItem
138 import Ubuntu.OnlineAccounts.Plugin 1.0
139
140 MainView {
141
142=== modified file 'plugins/example/Main.qml'
143--- plugins/example/Main.qml 2013-06-07 13:50:18 +0000
144+++ plugins/example/Main.qml 2015-10-30 15:39:29 +0000
145@@ -1,5 +1,5 @@
146 /*
147- * Copyright (C) 2013 Canonical Ltd.
148+ * Copyright (C) 2013-2015 Canonical Ltd.
149 *
150 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
151 *
152@@ -17,7 +17,7 @@
153 */
154
155 import QtQuick 2.0
156-import Ubuntu.Components 0.1
157+import Ubuntu.Components 1.3
158 import Ubuntu.OnlineAccounts 0.1
159
160 Column {
161
162=== modified file 'plugins/module/OAuth.qml'
163--- plugins/module/OAuth.qml 2015-01-23 11:13:02 +0000
164+++ plugins/module/OAuth.qml 2015-10-30 15:39:29 +0000
165@@ -1,5 +1,5 @@
166 /*
167- * Copyright (C) 2013 Canonical Ltd.
168+ * Copyright (C) 2013-2015 Canonical Ltd.
169 *
170 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
171 *
172@@ -17,8 +17,8 @@
173 */
174
175 import QtQuick 2.0
176-import Ubuntu.Components 0.1
177-import Ubuntu.Components.ListItems 0.1 as ListItem
178+import Ubuntu.Components 1.3
179+import Ubuntu.Components.ListItems 1.3 as ListItem
180 import Ubuntu.OnlineAccounts 0.1
181 import Ubuntu.OnlineAccounts.Plugin 1.0
182
183
184=== modified file 'plugins/module/OAuthMain.qml'
185--- plugins/module/OAuthMain.qml 2014-03-12 13:20:27 +0000
186+++ plugins/module/OAuthMain.qml 2015-10-30 15:39:29 +0000
187@@ -1,5 +1,5 @@
188 /*
189- * Copyright (C) 2013 Canonical Ltd.
190+ * Copyright (C) 2013-2015 Canonical Ltd.
191 *
192 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
193 *
194@@ -17,7 +17,7 @@
195 */
196
197 import QtQuick 2.0
198-import Ubuntu.Components 0.1
199+import Ubuntu.Components 1.3
200 import Ubuntu.OnlineAccounts 0.1
201
202 Item {
203
204=== modified file 'plugins/module/Options.qml'
205--- plugins/module/Options.qml 2013-09-04 17:53:58 +0000
206+++ plugins/module/Options.qml 2015-10-30 15:39:29 +0000
207@@ -1,5 +1,5 @@
208 /*
209- * Copyright (C) 2013 Canonical Ltd.
210+ * Copyright (C) 2013-2015 Canonical Ltd.
211 *
212 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
213 *
214@@ -17,9 +17,9 @@
215 */
216
217 import QtQuick 2.0
218-import Ubuntu.Components 0.1
219-import Ubuntu.Components.ListItems 0.1 as ListItem
220-import Ubuntu.Components.Popups 0.1
221+import Ubuntu.Components 1.3
222+import Ubuntu.Components.ListItems 1.3 as ListItem
223+import Ubuntu.Components.Popups 1.3
224 import Ubuntu.OnlineAccounts 0.1
225
226 Column {
227
228=== modified file 'plugins/module/RemovalConfirmation.qml'
229--- plugins/module/RemovalConfirmation.qml 2014-05-02 11:08:02 +0000
230+++ plugins/module/RemovalConfirmation.qml 2015-10-30 15:39:29 +0000
231@@ -1,5 +1,5 @@
232 /*
233- * Copyright (C) 2013 Canonical Ltd.
234+ * Copyright (C) 2013-2015 Canonical Ltd.
235 *
236 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
237 *
238@@ -17,9 +17,9 @@
239 */
240
241 import QtQuick 2.0
242-import Ubuntu.Components 0.1
243-import Ubuntu.Components.ListItems 0.1 as ListItem
244-import Ubuntu.Components.Popups 0.1
245+import Ubuntu.Components 1.3
246+import Ubuntu.Components.ListItems 1.3 as ListItem
247+import Ubuntu.Components.Popups 1.3
248
249 Dialog {
250 id: root
251
252=== modified file 'plugins/module/ServiceItem.qml'
253--- plugins/module/ServiceItem.qml 2014-12-19 11:01:47 +0000
254+++ plugins/module/ServiceItem.qml 2015-10-30 15:39:29 +0000
255@@ -1,5 +1,5 @@
256 /*
257- * Copyright (C) 2013 Canonical Ltd.
258+ * Copyright (C) 2013-2015 Canonical Ltd.
259 *
260 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
261 *
262@@ -17,8 +17,8 @@
263 */
264
265 import QtQuick 2.0
266-import Ubuntu.Components 0.1
267-import Ubuntu.Components.ListItems 0.1 as ListItem
268+import Ubuntu.Components 1.3
269+import Ubuntu.Components.ListItems 1.3 as ListItem
270 import Ubuntu.OnlineAccounts 0.1
271
272 Column {
273
274=== modified file 'plugins/module/ServiceSwitches.qml'
275--- plugins/module/ServiceSwitches.qml 2014-05-09 10:52:01 +0000
276+++ plugins/module/ServiceSwitches.qml 2015-10-30 15:39:29 +0000
277@@ -1,5 +1,5 @@
278 /*
279- * Copyright (C) 2013 Canonical Ltd.
280+ * Copyright (C) 2013-2015 Canonical Ltd.
281 *
282 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
283 *
284@@ -17,8 +17,8 @@
285 */
286
287 import QtQuick 2.0
288-import Ubuntu.Components 0.1
289-import Ubuntu.Components.ListItems 0.1 as ListItem
290+import Ubuntu.Components 1.3
291+import Ubuntu.Components.ListItems 1.3 as ListItem
292 import Ubuntu.OnlineAccounts 0.1
293
294 Column {
295
296=== modified file 'plugins/module/WebView.qml'
297--- plugins/module/WebView.qml 2015-06-18 14:05:58 +0000
298+++ plugins/module/WebView.qml 2015-10-30 15:39:29 +0000
299@@ -1,5 +1,5 @@
300 import QtQuick 2.0
301-import Ubuntu.Components 1.1
302+import Ubuntu.Components 1.3
303 import Ubuntu.Web 0.2
304
305 WebView {
306
307=== modified file 'system-settings-plugin/AccountEditPage.qml'
308--- system-settings-plugin/AccountEditPage.qml 2014-08-27 06:34:11 +0000
309+++ system-settings-plugin/AccountEditPage.qml 2015-10-30 15:39:29 +0000
310@@ -1,5 +1,5 @@
311 /*
312- * Copyright (C) 2013 Canonical Ltd.
313+ * Copyright (C) 2013-2015 Canonical Ltd.
314 *
315 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
316 *
317@@ -17,7 +17,7 @@
318 */
319
320 import QtQuick 2.0
321-import Ubuntu.Components 0.1
322+import Ubuntu.Components 1.3
323 import Ubuntu.OnlineAccounts 0.1
324 import Ubuntu.OnlineAccounts.Plugin 1.0
325
326
327=== modified file 'system-settings-plugin/AccountItem.qml'
328--- system-settings-plugin/AccountItem.qml 2014-08-29 12:45:28 +0000
329+++ system-settings-plugin/AccountItem.qml 2015-10-30 15:39:29 +0000
330@@ -1,5 +1,5 @@
331 /*
332- * Copyright (C) 2013 Canonical Ltd.
333+ * Copyright (C) 2013-2015 Canonical Ltd.
334 *
335 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
336 *
337@@ -17,8 +17,8 @@
338 */
339
340 import QtQuick 2.0
341-import Ubuntu.Components 0.1
342-import Ubuntu.Components.ListItems 0.1 as ListItem
343+import Ubuntu.Components 1.3
344+import Ubuntu.Components.ListItems 1.3 as ListItem
345 import Ubuntu.OnlineAccounts 0.1
346
347 ListItem.Subtitled {
348
349=== modified file 'system-settings-plugin/AccountsPage.qml'
350--- system-settings-plugin/AccountsPage.qml 2014-08-26 13:45:04 +0000
351+++ system-settings-plugin/AccountsPage.qml 2015-10-30 15:39:29 +0000
352@@ -1,5 +1,5 @@
353 /*
354- * Copyright (C) 2013 Canonical Ltd.
355+ * Copyright (C) 2013-2015 Canonical Ltd.
356 *
357 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
358 *
359@@ -17,8 +17,8 @@
360 */
361
362 import QtQuick 2.0
363-import Ubuntu.Components 0.1
364-import Ubuntu.Components.ListItems 0.1 as ListItem
365+import Ubuntu.Components 1.3
366+import Ubuntu.Components.ListItems 1.3 as ListItem
367
368 Flickable {
369 id: root
370
371=== modified file 'system-settings-plugin/AddAccountLabel.qml'
372--- system-settings-plugin/AddAccountLabel.qml 2014-08-26 13:45:04 +0000
373+++ system-settings-plugin/AddAccountLabel.qml 2015-10-30 15:39:29 +0000
374@@ -1,5 +1,5 @@
375 /*
376- * Copyright (C) 2013 Canonical Ltd.
377+ * Copyright (C) 2013-2015 Canonical Ltd.
378 *
379 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
380 *
381@@ -17,8 +17,8 @@
382 */
383
384 import QtQuick 2.0
385-import Ubuntu.Components 0.1
386-import Ubuntu.Components.ListItems 0.1 as ListItem
387+import Ubuntu.Components 1.3
388+import Ubuntu.Components.ListItems 1.3 as ListItem
389
390 ListItem.Caption {
391 anchors.left: parent.left
392
393=== modified file 'system-settings-plugin/MainPage.qml'
394--- system-settings-plugin/MainPage.qml 2014-08-26 13:45:04 +0000
395+++ system-settings-plugin/MainPage.qml 2015-10-30 15:39:29 +0000
396@@ -1,5 +1,5 @@
397 /*
398- * Copyright (C) 2013 Canonical Ltd.
399+ * Copyright (C) 2013-2015 Canonical Ltd.
400 *
401 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
402 *
403@@ -18,8 +18,8 @@
404
405 import QtQuick 2.0
406 import SystemSettings 1.0
407-import Ubuntu.Components 0.1
408-import Ubuntu.Components.ListItems 0.1 as ListItem
409+import Ubuntu.Components 1.3
410+import Ubuntu.Components.ListItems 1.3 as ListItem
411 import Ubuntu.OnlineAccounts 0.1
412
413 ItemPage {
414
415=== modified file 'system-settings-plugin/NewAccountPage.qml'
416--- system-settings-plugin/NewAccountPage.qml 2014-09-15 12:16:50 +0000
417+++ system-settings-plugin/NewAccountPage.qml 2015-10-30 15:39:29 +0000
418@@ -1,5 +1,5 @@
419 /*
420- * Copyright (C) 2013 Canonical Ltd.
421+ * Copyright (C) 2013-2015 Canonical Ltd.
422 *
423 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
424 *
425@@ -17,7 +17,7 @@
426 */
427
428 import QtQuick 2.0
429-import Ubuntu.Components 0.1
430+import Ubuntu.Components 1.3
431
432 Page {
433 title: i18n.dtr(domain, "Add account")
434
435=== modified file 'system-settings-plugin/NoAccountsPage.qml'
436--- system-settings-plugin/NoAccountsPage.qml 2014-09-12 13:08:18 +0000
437+++ system-settings-plugin/NoAccountsPage.qml 2015-10-30 15:39:29 +0000
438@@ -1,5 +1,5 @@
439 /*
440- * Copyright (C) 2013 Canonical Ltd.
441+ * Copyright (C) 2013-2015 Canonical Ltd.
442 *
443 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
444 *
445@@ -17,8 +17,8 @@
446 */
447
448 import QtQuick 2.0
449-import Ubuntu.Components 0.1
450-import Ubuntu.Components.ListItems 0.1 as ListItem
451+import Ubuntu.Components 1.3
452+import Ubuntu.Components.ListItems 1.3 as ListItem
453
454 Flickable {
455 id: root
456
457=== modified file 'system-settings-plugin/ProviderPluginList.qml'
458--- system-settings-plugin/ProviderPluginList.qml 2014-09-15 12:16:50 +0000
459+++ system-settings-plugin/ProviderPluginList.qml 2015-10-30 15:39:29 +0000
460@@ -1,5 +1,5 @@
461 /*
462- * Copyright (C) 2013 Canonical Ltd.
463+ * Copyright (C) 2013-2015 Canonical Ltd.
464 *
465 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
466 *
467@@ -17,7 +17,7 @@
468 */
469
470 import QtQuick 2.0
471-import Ubuntu.Components 0.1
472+import Ubuntu.Components 1.3
473 import Ubuntu.OnlineAccounts.Client 0.1
474
475 ProvidersList {
476
477=== modified file 'system-settings-plugin/ProvidersList.qml'
478--- system-settings-plugin/ProvidersList.qml 2014-09-30 12:29:26 +0000
479+++ system-settings-plugin/ProvidersList.qml 2015-10-30 15:39:29 +0000
480@@ -1,5 +1,5 @@
481 /*
482- * Copyright (C) 2013 Canonical Ltd.
483+ * Copyright (C) 2013-2015 Canonical Ltd.
484 *
485 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
486 *
487@@ -17,8 +17,8 @@
488 */
489
490 import QtQuick 2.0
491-import Ubuntu.Components 1.1
492-import Ubuntu.Components.ListItems 1.0 as ListItem
493+import Ubuntu.Components 1.3
494+import Ubuntu.Components.ListItems 1.3 as ListItem
495 import Ubuntu.OnlineAccounts 0.1
496
497 Column {
498@@ -38,19 +38,24 @@
499 model: providerModel
500
501 delegate: ListItem.Standard {
502+ id: provider
503 text: displayName
504 enabled: accountModel === null || accountModel.count === 0
505 iconSource: model.iconName.indexOf("/") === 0 ?
506 model.iconName : "image://theme/" + model.iconName
507 progression: false
508- onClicked: { pressed = true; root.providerClicked(providerId) }
509+ onTriggered: {
510+ activated = true;
511+ root.providerClicked(providerId);
512+ }
513 property var accountModel: isSingleAccount ? createAccountModel(providerId) : null
514+ property bool activated: false
515
516 ActivityIndicator {
517 anchors.verticalCenter: parent.verticalCenter
518 anchors.right: parent.right
519 anchors.rightMargin: units.gu(2)
520- running: pressed
521+ running: provider.activated
522 }
523
524 function createAccountModel(providerId) {
525@@ -70,7 +75,7 @@
526
527 function clearPressedButtons() {
528 for (var i = 0; i < repeater.count; i++) {
529- repeater.itemAt(i).pressed = false
530+ repeater.itemAt(i).activated = false
531 }
532 }
533 }

Subscribers

People subscribed via source and target branches