Merge lp:~renatofilho/address-book-app/fix-scroll-to-contact into lp:address-book-app

[Renato Araujo Oliveira Filho]

Make sure that the contact list scroll to correct contact on dual panel mode.

Use contact list model for bottom edge element in empty state page. This will make sure that the model used is the same model used in contact list, and the model that we are connected to new contact signal.

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2016-03-21 12:33:51 +0000
+++ src/imports/ABContactListPage.qml	2016-05-10 18:02:41 +0000
@@ -126,7 +126,8 @@
                 emptyPage  = pageStack.addFileToNextColumnSync(pageStack.primaryPage,
                                                                         Qt.resolvedUrl("ABMultiColumnEmptyState.qml"),
                                                                         { 'headerTitle': "",
-                                                                          'pageStack': mainPage.pageStack })
+                                                                          'pageStack': mainPage.pageStack,
+                                                                          'model': mainPage.contactModel })
                 emptyPage.Component.onDestruction.connect(function() {
                     mainPage.emptyPage = null
                 })
 
=== modified file 'src/imports/ABMultiColumnEmptyState.qml'
--- src/imports/ABMultiColumnEmptyState.qml	2016-02-13 02:36:26 +0000
+++ src/imports/ABMultiColumnEmptyState.qml	2016-05-10 18:02:41 +0000
@@ -24,6 +24,7 @@
     property string headerTitle: i18n.tr("No contacts")
 
     property bool openBottomEdgeWhenReady: false
+    property var model: null
 
     header: PageHeader {
         title: root.headerTitle
@@ -71,7 +72,7 @@
             hintVisible: false
             parent: root
             height: root.height
-            modelToEdit: root.pageStack.contactListPage.contactModel
+            modelToEdit: root.model
             hint.flickable: root.flickable
             pageStack: root.pageStack
             onCommitCompleted: { root.openBottomEdgeWhenReady = false }