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
=== modified file 'client/OnlineAccountsClient/setup.cpp'
--- client/OnlineAccountsClient/setup.cpp 2015-09-02 14:32:46 +0000
+++ client/OnlineAccountsClient/setup.cpp 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -176,7 +176,7 @@
176 *176 *
177 * \qml177 * \qml
178 * import QtQuick 2.0178 * import QtQuick 2.0
179 * import Ubuntu.Components 0.1179 * import Ubuntu.Components 1.3
180 * import Ubuntu.OnlineAccounts.Client 0.1180 * import Ubuntu.OnlineAccounts.Client 0.1
181 *181 *
182 * Rectangle {182 * Rectangle {
183183
=== modified file 'client/examples/CreateFacebook.qml'
--- client/examples/CreateFacebook.qml 2013-08-01 08:20:17 +0000
+++ client/examples/CreateFacebook.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 0.12import Ubuntu.Components 1.3
3import Ubuntu.OnlineAccounts.Client 0.13import Ubuntu.OnlineAccounts.Client 0.1
44
5Rectangle {5Rectangle {
66
=== modified file 'debian/control'
--- debian/control 2015-09-02 14:54:04 +0000
+++ debian/control 2015-10-30 15:39:29 +0000
@@ -41,6 +41,7 @@
41 ${shlibs:Depends},41 ${shlibs:Depends},
42 libonline-accounts-daemon1,42 libonline-accounts-daemon1,
43 liboxideqt-qmlplugin (>= 1.2.0),43 liboxideqt-qmlplugin (>= 1.2.0),
44 qml-module-ubuntu-onlineaccounts2,
44 qtdeclarative5-accounts-plugin (>= 0.3),45 qtdeclarative5-accounts-plugin (>= 0.3),
45 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,46 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
46 signon-ui-service,47 signon-ui-service,
4748
=== modified file 'online-accounts-ui/qml/AccountCreationPage.qml'
--- online-accounts-ui/qml/AccountCreationPage.qml 2014-09-25 11:40:59 +0000
+++ online-accounts-ui/qml/AccountCreationPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.OnlineAccounts 0.121import Ubuntu.OnlineAccounts 0.1
2222
23Item {23Item {
2424
=== modified file 'online-accounts-ui/qml/AuthorizationPage.qml'
--- online-accounts-ui/qml/AuthorizationPage.qml 2014-10-24 18:21:11 +0000
+++ online-accounts-ui/qml/AuthorizationPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23Flickable {23Flickable {
24 id: root24 id: root
2525
=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
--- online-accounts-ui/qml/ProviderRequest.qml 2014-11-27 08:58:57 +0000
+++ online-accounts-ui/qml/ProviderRequest.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.OnlineAccounts 0.121import Ubuntu.OnlineAccounts 0.1
22import Ubuntu.OnlineAccounts.Internal 1.022import Ubuntu.OnlineAccounts.Internal 1.0
2323
@@ -34,7 +34,6 @@
3434
35 width: units.gu(48)35 width: units.gu(48)
36 height: units.gu(60)36 height: units.gu(60)
37 useDeprecatedToolbar: false
38 automaticOrientation: true37 automaticOrientation: true
3938
40 Component.onCompleted: {39 Component.onCompleted: {
4140
=== modified file 'online-accounts-ui/qml/SignOnUiDialog.qml'
--- online-accounts-ui/qml/SignOnUiDialog.qml 2014-11-05 08:04:55 +0000
+++ online-accounts-ui/qml/SignOnUiDialog.qml 2015-10-30 15:39:29 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 0.12import Ubuntu.Components 1.3
3import Ubuntu.Components.Popups 0.13import Ubuntu.Components.Popups 1.3
4import Ubuntu.Components.ListItems 0.1 as ListItem4import Ubuntu.Components.ListItems 1.3 as ListItem
55
6Item {6Item {
7 id: root7 id: root
88
=== modified file 'online-accounts-ui/qml/SignOnUiPage.qml'
--- online-accounts-ui/qml/SignOnUiPage.qml 2014-06-12 10:54:13 +0000
+++ online-accounts-ui/qml/SignOnUiPage.qml 2015-10-30 15:39:29 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 0.12import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 0.1 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.OnlineAccounts.Plugin 1.04import Ubuntu.OnlineAccounts.Plugin 1.0
55
6MainView {6MainView {
77
=== modified file 'plugins/example/Main.qml'
--- plugins/example/Main.qml 2013-06-07 13:50:18 +0000
+++ plugins/example/Main.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.OnlineAccounts 0.121import Ubuntu.OnlineAccounts 0.1
2222
23Column {23Column {
2424
=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml 2015-01-23 11:13:02 +0000
+++ plugins/module/OAuth.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.OnlineAccounts 0.122import Ubuntu.OnlineAccounts 0.1
23import Ubuntu.OnlineAccounts.Plugin 1.023import Ubuntu.OnlineAccounts.Plugin 1.0
2424
2525
=== modified file 'plugins/module/OAuthMain.qml'
--- plugins/module/OAuthMain.qml 2014-03-12 13:20:27 +0000
+++ plugins/module/OAuthMain.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.OnlineAccounts 0.121import Ubuntu.OnlineAccounts 0.1
2222
23Item {23Item {
2424
=== modified file 'plugins/module/Options.qml'
--- plugins/module/Options.qml 2013-09-04 17:53:58 +0000
+++ plugins/module/Options.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,9 +17,9 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.Components.Popups 0.122import Ubuntu.Components.Popups 1.3
23import Ubuntu.OnlineAccounts 0.123import Ubuntu.OnlineAccounts 0.1
2424
25Column {25Column {
2626
=== modified file 'plugins/module/RemovalConfirmation.qml'
--- plugins/module/RemovalConfirmation.qml 2014-05-02 11:08:02 +0000
+++ plugins/module/RemovalConfirmation.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,9 +17,9 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.Components.Popups 0.122import Ubuntu.Components.Popups 1.3
2323
24Dialog {24Dialog {
25 id: root25 id: root
2626
=== modified file 'plugins/module/ServiceItem.qml'
--- plugins/module/ServiceItem.qml 2014-12-19 11:01:47 +0000
+++ plugins/module/ServiceItem.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.OnlineAccounts 0.122import Ubuntu.OnlineAccounts 0.1
2323
24Column {24Column {
2525
=== modified file 'plugins/module/ServiceSwitches.qml'
--- plugins/module/ServiceSwitches.qml 2014-05-09 10:52:01 +0000
+++ plugins/module/ServiceSwitches.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.OnlineAccounts 0.122import Ubuntu.OnlineAccounts 0.1
2323
24Column {24Column {
2525
=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml 2015-06-18 14:05:58 +0000
+++ plugins/module/WebView.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import Ubuntu.Web 0.23import Ubuntu.Web 0.2
44
5WebView {5WebView {
66
=== modified file 'system-settings-plugin/AccountEditPage.qml'
--- system-settings-plugin/AccountEditPage.qml 2014-08-27 06:34:11 +0000
+++ system-settings-plugin/AccountEditPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.OnlineAccounts 0.121import Ubuntu.OnlineAccounts 0.1
22import Ubuntu.OnlineAccounts.Plugin 1.022import Ubuntu.OnlineAccounts.Plugin 1.0
2323
2424
=== modified file 'system-settings-plugin/AccountItem.qml'
--- system-settings-plugin/AccountItem.qml 2014-08-29 12:45:28 +0000
+++ system-settings-plugin/AccountItem.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.OnlineAccounts 0.122import Ubuntu.OnlineAccounts 0.1
2323
24ListItem.Subtitled {24ListItem.Subtitled {
2525
=== modified file 'system-settings-plugin/AccountsPage.qml'
--- system-settings-plugin/AccountsPage.qml 2014-08-26 13:45:04 +0000
+++ system-settings-plugin/AccountsPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23Flickable {23Flickable {
24 id: root24 id: root
2525
=== modified file 'system-settings-plugin/AddAccountLabel.qml'
--- system-settings-plugin/AddAccountLabel.qml 2014-08-26 13:45:04 +0000
+++ system-settings-plugin/AddAccountLabel.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23ListItem.Caption {23ListItem.Caption {
24 anchors.left: parent.left24 anchors.left: parent.left
2525
=== modified file 'system-settings-plugin/MainPage.qml'
--- system-settings-plugin/MainPage.qml 2014-08-26 13:45:04 +0000
+++ system-settings-plugin/MainPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.019import QtQuick 2.0
20import SystemSettings 1.020import SystemSettings 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 0.1 as ListItem22import Ubuntu.Components.ListItems 1.3 as ListItem
23import Ubuntu.OnlineAccounts 0.123import Ubuntu.OnlineAccounts 0.1
2424
25ItemPage {25ItemPage {
2626
=== modified file 'system-settings-plugin/NewAccountPage.qml'
--- system-settings-plugin/NewAccountPage.qml 2014-09-15 12:16:50 +0000
+++ system-settings-plugin/NewAccountPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
2121
22Page {22Page {
23 title: i18n.dtr(domain, "Add account")23 title: i18n.dtr(domain, "Add account")
2424
=== modified file 'system-settings-plugin/NoAccountsPage.qml'
--- system-settings-plugin/NoAccountsPage.qml 2014-09-12 13:08:18 +0000
+++ system-settings-plugin/NoAccountsPage.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23Flickable {23Flickable {
24 id: root24 id: root
2525
=== modified file 'system-settings-plugin/ProviderPluginList.qml'
--- system-settings-plugin/ProviderPluginList.qml 2014-09-15 12:16:50 +0000
+++ system-settings-plugin/ProviderPluginList.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 0.120import Ubuntu.Components 1.3
21import Ubuntu.OnlineAccounts.Client 0.121import Ubuntu.OnlineAccounts.Client 0.1
2222
23ProvidersList {23ProvidersList {
2424
=== modified file 'system-settings-plugin/ProvidersList.qml'
--- system-settings-plugin/ProvidersList.qml 2014-09-30 12:29:26 +0000
+++ system-settings-plugin/ProvidersList.qml 2015-10-30 15:39:29 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd.2 * Copyright (C) 2013-2015 Canonical Ltd.
3 *3 *
4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>4 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
5 *5 *
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
22import Ubuntu.OnlineAccounts 0.122import Ubuntu.OnlineAccounts 0.1
2323
24Column {24Column {
@@ -38,19 +38,24 @@
38 model: providerModel38 model: providerModel
3939
40 delegate: ListItem.Standard {40 delegate: ListItem.Standard {
41 id: provider
41 text: displayName42 text: displayName
42 enabled: accountModel === null || accountModel.count === 043 enabled: accountModel === null || accountModel.count === 0
43 iconSource: model.iconName.indexOf("/") === 0 ?44 iconSource: model.iconName.indexOf("/") === 0 ?
44 model.iconName : "image://theme/" + model.iconName45 model.iconName : "image://theme/" + model.iconName
45 progression: false46 progression: false
46 onClicked: { pressed = true; root.providerClicked(providerId) }47 onTriggered: {
48 activated = true;
49 root.providerClicked(providerId);
50 }
47 property var accountModel: isSingleAccount ? createAccountModel(providerId) : null51 property var accountModel: isSingleAccount ? createAccountModel(providerId) : null
52 property bool activated: false
4853
49 ActivityIndicator {54 ActivityIndicator {
50 anchors.verticalCenter: parent.verticalCenter55 anchors.verticalCenter: parent.verticalCenter
51 anchors.right: parent.right56 anchors.right: parent.right
52 anchors.rightMargin: units.gu(2)57 anchors.rightMargin: units.gu(2)
53 running: pressed58 running: provider.activated
54 }59 }
5560
56 function createAccountModel(providerId) {61 function createAccountModel(providerId) {
@@ -70,7 +75,7 @@
7075
71 function clearPressedButtons() {76 function clearPressedButtons() {
72 for (var i = 0; i < repeater.count; i++) {77 for (var i = 0; i < repeater.count; i++) {
73 repeater.itemAt(i).pressed = false78 repeater.itemAt(i).activated = false
74 }79 }
75 }80 }
76}81}

Subscribers

People subscribed via source and target branches