[Merge] lp:~renatofilho/address-book-app/choose-default-address-book into lp:address-book-app

[Renato Araujo Oliveira Filho]

All comments fixed on rev.497

Diff comments:

> 
> === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
> --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-10-26 13:18:11 +0000
> +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-12-01 16:47:06 +0000
> @@ -27,6 +27,9 @@
>      id: root
>  
>      property alias active: sourceModel.autoUpdate
> +    property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
> +    property real myHeight: sources.currentlyExpanded ? sources.containerHeight + units.gu(6) + label.height : sources.itemHeight + units.gu(6) + label.height

Done.

> +
>      signal changed()
>  
>      function save() {
> @@ -164,27 +207,17 @@
>  
>          delegate: OptionSelectorDelegate {
>              text: {
> -                if ((contact.guid.guid != "system-address-book") &&
> +                if ((sourceId != "system-address-book") &&
>                      (iconSource == "image://theme/address-book-app-symbolic")) {
> -                    return i18n.dtr("address-book-app", "Personal - %1").arg(contact.displayLabel.label)
> +                    return i18n.dtr("address-book-app", "Personal - %1").arg(sourceName)

Done.

>                  } else {
> -                    return contact.displayLabel.label
> +                    return sourceName
>                  }
>              }
>              constrainImage: true
> -            iconSource: {
> -                var details = contact.details(ContactDetail.ExtendedDetail)
> -                for(var i in details) {
> -                    if (details[i].name === "PROVIDER") {
> -                        if (details[i].data === "") {
> -                            return "image://theme/address-book-app-symbolic"
> -                        } else {
> -                            return "image://theme/online-accounts-%1".arg(details[i].data)
> -                        }
> -                    }
> -                }
> -                return "image://theme/address-book-app-symbolic"
> -            }
> +            iconSource: accountProvider == "" ?
> +                            "image://theme/address-book-app-symbolic" :
> +                            "image://theme/online-accounts-%1".arg(accountProvider)
>              height: units.gu(4)
>          }
>  


-- 
https://code.launchpad.net/~renatofilho/address-book-app/choose-default-address-book/+merge/279135
Your team Ubuntu Phablet Team is subscribed to branch lp:address-book-app.