Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1257028 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Use new iconName property for list items

Also, avoid using the deprecated model roles from accounts-qml-module:
account -> accountHandle
accountService -> accountServiceHandle

Introducing a new Item as root item in the ServiceItem component is needed in
order to hide the Repeater's "model" property, which would otherwise conflict
with the homonymous context property in ServiceSwitches.qml.

Use new iconName property for list items

Also, avoid using the deprecated model roles from accounts-qml-module:
account -> accountHandle
accountService -> accountServiceHandle

Introducing a new Item as root item in the ServiceItem component is needed in
order to hide the Repeater's "model" property, which would otherwise conflict
with the homonymous context property in ServiceSwitches.qml.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-i386-ci/9

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks great!

review: Approve

=== modified file 'src/module/ServiceItem.qml'
--- src/module/ServiceItem.qml	2013-09-25 08:13:59 +0000
+++ src/module/ServiceItem.qml	2013-12-03 08:25:53 +0000
@@ -21,26 +21,32 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
-Repeater {
+Item {
     property variant accountServiceHandle
 
-    resources: AccountService {
-        id: accountService
-        objectHandle: accountServiceHandle
-    }
-
-    model: ApplicationModel {
-        service: accountService.service.id
-    }
-
-    delegate: ListItem.Standard {
-        text: model.displayName
-        icon: "image://theme/" + model.iconName
-        control: Switch {
-            checked: accountService.serviceEnabled
-            onCheckedChanged: {
-                if (checked != accountService.serviceEnabled) {
-                    accountService.updateServiceEnabled(checked)
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: childrenRect.height
+
+    Repeater {
+        resources: AccountService {
+            id: accountService
+            objectHandle: accountServiceHandle
+        }
+
+        model: ApplicationModel {
+            service: accountService.service.id
+        }
+
+        delegate: ListItem.Standard {
+            text: model.displayName
+            iconName: model.iconName
+            control: Switch {
+                checked: accountService.serviceEnabled
+                onCheckedChanged: {
+                    if (checked != accountService.serviceEnabled) {
+                        accountService.updateServiceEnabled(checked)
+                    }
                 }
             }
         }

=== modified file 'src/module/ServiceSwitches.qml'
--- src/module/ServiceSwitches.qml	2013-06-24 16:25:20 +0000
+++ src/module/ServiceSwitches.qml	2013-12-03 08:25:53 +0000
@@ -42,7 +42,7 @@
     Repeater {
         model: accountServices
         delegate: ServiceItem {
-            accountServiceHandle: accountService
+            accountServiceHandle: model.accountServiceHandle
         }
     }
 }

=== modified file 'src/qml/AccountItem.qml'
--- src/qml/AccountItem.qml	2013-10-17 11:08:57 +0000
+++ src/qml/AccountItem.qml	2013-12-03 08:25:53 +0000
@@ -27,9 +27,7 @@
     property variant __editPage: null
     property bool running: false
 
-    text: providerName
-    subText: displayName
-    icon: "image://theme/" + globalService.provider.iconName
+    iconName: globalService.provider.iconName
     progression: true
     opacity: globalService.enabled ? 1 : 0.5
 

=== modified file 'src/qml/AccountsPage.qml'
--- src/qml/AccountsPage.qml	2013-10-17 11:08:57 +0000
+++ src/qml/AccountsPage.qml	2013-12-03 08:25:53 +0000
@@ -41,8 +41,8 @@
                 ListView.delayRemove: running
                 text: providerName
                 subText: displayName
-                accountHandle: account
-                globalServiceHandle: accountService
+                accountHandle: model.accountHandle
+                globalServiceHandle: accountServiceHandle
             }
         }
 

=== modified file 'src/qml/ProvidersList.qml'
--- src/qml/ProvidersList.qml	2013-10-17 11:08:57 +0000
+++ src/qml/ProvidersList.qml	2013-12-03 08:25:53 +0000
@@ -39,7 +39,7 @@
         delegate: ListItem.Standard {
             text: displayName
             enabled: !isSingleAccount || hasNoAccounts(providerId)
-            icon: "image://theme/" + iconName
+            iconName: model.iconName
             progression: true
             onClicked: root.providerClicked(providerId)
         }