Online Accounts setup for Ubuntu Touch

Merge lp:~jonas-drange/ubuntu-system-settings-online-accounts/lp1445350 into lp:ubuntu-system-settings-online-accounts

  1. lp1445350
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 296
Merged at revision: 304
Proposed branch: lp:~jonas-drange/ubuntu-system-settings-online-accounts/lp1445350
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 39 lines (+8/-3)
1 file modified
system-settings-plugin/ProvidersList.qml (+8/-3)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings-online-accounts/lp1445350
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+271956@code.launchpad.net

Commit message

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

Description of the change

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

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

FAILED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/250/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/38
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/703
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/703/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23569

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'system-settings-plugin/ProvidersList.qml'
2--- system-settings-plugin/ProvidersList.qml 2014-09-30 12:29:26 +0000
3+++ system-settings-plugin/ProvidersList.qml 2015-09-22 12:39:26 +0000
4@@ -38,19 +38,24 @@
5 model: providerModel
6
7 delegate: ListItem.Standard {
8+ id: provider
9 text: displayName
10 enabled: accountModel === null || accountModel.count === 0
11 iconSource: model.iconName.indexOf("/") === 0 ?
12 model.iconName : "image://theme/" + model.iconName
13 progression: false
14- onClicked: { pressed = true; root.providerClicked(providerId) }
15+ onTriggered: {
16+ activated = true;
17+ root.providerClicked(providerId);
18+ }
19 property var accountModel: isSingleAccount ? createAccountModel(providerId) : null
20+ property bool activated: false
21
22 ActivityIndicator {
23 anchors.verticalCenter: parent.verticalCenter
24 anchors.right: parent.right
25 anchors.rightMargin: units.gu(2)
26- running: pressed
27+ running: provider.activated
28 }
29
30 function createAccountModel(providerId) {
31@@ -70,7 +75,7 @@
32
33 function clearPressedButtons() {
34 for (var i = 0; i < repeater.count; i++) {
35- repeater.itemAt(i).pressed = false
36+ repeater.itemAt(i).activated = false
37 }
38 }
39 }

Subscribers

People subscribed via source and target branches