Merge lp:~renatofilho/address-book-app/fix-1387659 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Show "No contacts." for empty list in pick mode.
Hide search button if the list is empty.
Make the "share" and "select" buttons invisible if the contact list is empty.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:321
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/702/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/90
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/56
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/56/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/702/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/fix-1387659]

323. By Renato Araujo Oliveira Filho on 2014-11-11

Resync parent branch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/706/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/9
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/67
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/106
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15660
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/71
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/71/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/706/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/708/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/108
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/73
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/73/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/708/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/fix-1387659]

324. By Renato Araujo Oliveira Filho on 2014-11-11

Do not async load content hub object. Async load can cause some signal to get lost due the delay to create the component.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed UI labels, did you update the pot file? NO LABEL CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO

[lp:~renatofilho/address-book-app/fix-1387659]

325. By Renato Araujo Oliveira Filho on 2014-11-11

Do not use preset property in the header.

326. By Renato Araujo Oliveira Filho on 2014-11-11

Use "You have no contacts." string instead of "no contacts".

This will avoid create a new string to be translated.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/709/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/116
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15681
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/67/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/79
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/79/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/709/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the MR

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/710/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/125
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/87
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/87/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/710/rebuild

review: Approve (continuous-integration)

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-11-11 14:36:28 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-11-11 14:36:28 +0000
@@ -37,6 +37,7 @@
     property string newPhoneToAdd: ""
     property alias contactManager: contactList.manager
 
+    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
@@ -352,6 +353,7 @@
                 Action {
                     text: i18n.tr("Search")
                     iconName: "search"
+                    visible: !mainPage.isEmpty
                     onTriggered: {
                         mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
                         contactList.showAllContacts()
@@ -402,12 +404,12 @@
             name: "selection"
             backAction: Action {
                 text: i18n.tr("Cancel selection")
-                iconName: "close"
+                iconName: "back"
                 onTriggered: contactList.cancelSelection()
             }
             actions: [
                 Action {
-                    text: i18n.tr("Select All")
+                    text: (contactList.selectedItems.count === contactList.count) ? i18n.tr("Unselect All") : i18n.tr("Select All")
                     iconName: "select"
                     onTriggered: {
                         if (contactList.selectedItems.count === contactList.count) {
@@ -416,12 +418,13 @@
                             contactList.selectAll()
                         }
                     }
-                    visible: contactList.multipleSelection
+                    visible: contactList.multipleSelection && !mainPage.isEmpty
                 },
                 Action {
                     objectName: "share"
                     text: i18n.tr("Share")
                     iconName: "share"
+                    enabled: (contactList.selectedItems.count > 0)
                     visible: contactList.isInSelectionMode
                     onTriggered: {
                         var contacts = []
@@ -439,6 +442,7 @@
                     objectName: "delete"
                     text: i18n.tr("Delete")
                     iconName: "delete"
+                    enabled: (contactList.selectedItems.count > 0)
                     visible: contactList.isInSelectionMode && !mainPage.pickMode
                     onTriggered: {
                         var contacts = []
@@ -532,8 +536,7 @@
         height: childrenRect.height
         width: childrenRect.width
         spacing: units.gu(2)
-
-        visible: (contactList.count === 0 && !indicator.visible && (mainPage.newPhoneToAdd === ""))
+        visible: (mainPage.isEmpty && !indicator.visible && (mainPage.newPhoneToAdd === ""))
 
         Icon {
             id: emptyStateIcon
@@ -547,7 +550,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("You have 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

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-11-11 14:36:28 +0000
+++ src/imports/MainWindow.qml	2014-11-11 14:36:28 +0000
@@ -32,6 +32,8 @@
         mainStack.resetStack()
         if (mainStack.contactListPage) {
             mainStack.contactListPage.showContact(contactId)
+        } else {
+            console.error("Contact preview requested but ContactListPage not loaded")
         }
         mainStack.quitOnDepth = 1
     }
@@ -41,6 +43,8 @@
         mainStack.resetStack()
         if (mainStack.contactListPage) {
             mainStack.contactListPage.createContactWithPhoneNumber(phoneNumber)
+        } else {
+            console.error("Contact creation requested but ContactListPage not loaded")
         }
     }
 
@@ -49,11 +53,14 @@
         mainStack.resetStack()
         if (mainStack.contactListPage) {
             mainStack.contactListPage.addPhoneToContact(contactId, phoneNumber)
+        } else {
+            console.error("Add phone to contact requested but ContactListPage not loaded")
         }
     }
 
     function pick(single)
     {
+        console.debug("Pick mode:" + single)
         pickWithTransfer(single, null)
     }
 
@@ -62,6 +69,8 @@
         mainStack.resetStack()
         if (mainStack.contactListPage) {
             mainStack.contactListPage.startPickMode(single === "true", activeTransfer)
+        } else {
+            console.error("Pick mode requested but ContactListPage not loaded")
         }
     }
 
@@ -75,6 +84,8 @@
         mainStack.resetStack()
         if (mainStack.contactListPage) {
             mainStack.contactListPage.importContact(_urls)
+        } else {
+            console.error("Import vcard requested but ContactListPage not loaded")
         }
     }
 
@@ -83,6 +94,8 @@
         mainStack.resetStack()
         if (mainStack.contactListPage) {
             mainStack.contactListPage.addNewPhone(phoneNumer)
+        } else {
+            console.error("Add new phone requested but ContactListPage not loaded")
         }
     }
 
@@ -159,7 +172,8 @@
     Loader {
         id: contentHubLoader
 
-        asynchronous: true
+        //We can not use async load, the export requested signal can be received before the component get ready
+        //asynchronous: true
         source: Qt.resolvedUrl("ContentHubProxy.qml")
         onStatusChanged: {
             if (status === Loader.Ready) {