[Merge] lp:~renatofilho/address-book-app/fix-1387659 into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Diff comments:

> === modified file 'src/imports/ContactList/ContactListPage.qml'
> --- src/imports/ContactList/ContactListPage.qml	2014-10-23 15:17:14 +0000
> +++ src/imports/ContactList/ContactListPage.qml	2014-10-30 17:09:00 +0000
> @@ -36,6 +36,7 @@
>      property bool contactsLoaded: false
>      property string newPhoneToAdd: ""
>  
> +    readonly property bool isEmpty: (contactList.count === 0)
>      readonly property bool allowToQuit: (application.callbackApplication.length > 0)
>      readonly property bool syncEnabled: application.syncEnabled
>      readonly property var contactModel: contactList.listModel ? contactList.listModel : null
> @@ -359,6 +360,7 @@
>                  Action {
>                      text: i18n.tr("Search")
>                      iconName: "search"
> +                    visible: !mainPage.isEmpty
>                      onTriggered: {
>                          mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
>                          contactList.showAllContacts()
> @@ -423,13 +425,13 @@
>                              contactList.selectAll()
>                          }
>                      }
> -                    visible: contactList.multipleSelection
> +                    visible: contactList.multipleSelection && !mainPage.isEmpty
>                  },
>                  Action {
>                      objectName: "share"
>                      text: i18n.tr("Share")
>                      iconName: "share"
> -                    visible: contactList.isInSelectionMode
> +                    visible: contactList.isInSelectionMode && !mainPage.isEmpty

Fixed on Rev. 319

>                      onTriggered: {
>                          var contacts = []
>                          var items = contactList.selectedItems
> @@ -550,7 +552,7 @@
>          width: childrenRect.width
>          spacing: units.gu(2)
>  
> -        visible: (contactList.count === 0 && !indicator.visible)
> +        visible: (mainPage.isEmpty && !indicator.visible)
>  
>          Icon {
>              id: emptyStateIcon
> @@ -564,7 +566,9 @@
>              id: emptyStateLabel
>              width: mainPage.width - units.gu(12)
>              height: paintedHeight
> -            text: i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
> +            text: mainPage.pickMode ?
> +                      i18n.tr("No Contacts.") :
> +                      i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
>              color: "#5d5d5d"
>              fontSize: "x-large"
>              wrapMode: Text.WordWrap
> 


-- 
https://code.launchpad.net/~renatofilho/address-book-app/fix-1387659/+merge/240140
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~renatofilho/address-book-app/fix-1387659 into lp:~phablet-team/address-book-app/staging.