Merge lp:~renatofilho/address-book-app/release-2014-07-02 into lp:address-book-app

[Renato Araujo Oliveira Filho]

* Implemented MostCalledContactsModel in C++ as a proxy model for HistoryEventModel;
* Enabled share button again.
* Fixed build warning: comparison with string literal results in unspecified behavior;
* Implemented swipe to delete.

[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? YES

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2484
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2484/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1458
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1458/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/release-2014-07-02]

205. By Renato Araujo Oliveira Filho on 2014-07-03

Staging merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/596/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/49
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1337
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2534
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1501
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1501/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/release-2014-07-02]

206. By Renato Araujo Oliveira Filho on 2014-07-04

Does not install unit tests dependency for [arm64, powerpc and ppc64el]

Some packages necessary to run the unit test is not available for all architectures.

207. By Renato Araujo Oliveira Filho on 2014-07-04

Check for "qmltestrunner" and "xvfb-run" installation before run qml tests.

208. By Renato Araujo Oliveira Filho on 2014-07-04

Used cmake variable with full path for XVFB_RUN_BIN

=== renamed file 'README.click' => 'README'
--- README.click	2014-06-07 13:07:42 +0000
+++ README	2014-07-04 14:53:15 +0000
@@ -1,3 +1,29 @@
+Building for desktop
+====================
+
+mkdir build
+cd build
+cmake ..
+make
+
+Run on desktop
+==============
+
+cd build
+./src/app/address-book-app
+
+Run the QML tests
+=================
+
+cd build
+make test or ctest 
+
+Run the Autopilot tests
+=======================
+
+cd build
+make autopilot
+
 Building for click
 ==================
 

=== modified file 'debian/control'
--- debian/control	2014-06-24 21:57:09 +0000
+++ debian/control	2014-07-04 14:53:15 +0000
@@ -9,9 +9,18 @@
                libgles2-mesa-dev,
                python3,
                pkg-config,
+               qml-module-qttest [i386 amd64 armhf],
+               qtdeclarative5-dev-tools [i386 amd64 armhf],
+               qtdeclarative5-qtcontacts-plugin [i386 amd64 armhf],
+               qtdeclarative5-ubuntu-content0.1 [i386 amd64 armhf],
+               qtdeclarative5-ubuntu-keyboard-extensions0.1 [i386 amd64 armhf],
+               qtdeclarative5-ubuntu-telephony-phonenumber0.1 [i386 amd64 armhf],
+               qtdeclarative5-ubuntu-ui-toolkit-plugin [i386 amd64 armhf],
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
+               qtpim5-dev,
+               xvfb [i386 amd64 armhf],
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/address-book-app
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
@@ -32,7 +41,6 @@
          qtdeclarative5-ubuntu-history0.1,
          qtdeclarative5-ubuntu-keyboard-extensions0.1,
          qtdeclarative5-ubuntu-telephony-phonenumber0.1,
-         qtdeclarative5-ubuntu-telephony0.1,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Address Book application
@@ -76,4 +84,4 @@
          address-book-app (>= ${binary:Version}),
          ubuntu-mobile-icons,
 Description: Test package for address-book-app
- Autopilot tests for the address-book-app package 
+ Autopilot tests for the address-book-app package

=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot	2014-06-27 12:54:55 +0000
+++ po/address-book-app.pot	2014-07-04 14:53:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: address-book-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-27 09:54-0300\n"
+"POT-Creation-Date: 2014-06-30 15:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -55,12 +55,12 @@
 
 #: src/imports/ContactEdit/AddFieldDialog.qml:133
 #: src/imports/ContactEdit/ContactEditor.qml:372
-#: src/imports/ContactList/ContactListPage.qml:324
+#: src/imports/ContactList/ContactListPage.qml:314
 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
 msgid "Cancel"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:252
+#: src/imports/ContactList/ContactListPage.qml:242
 msgid "Cancel selection"
 msgstr ""
 
@@ -86,8 +86,8 @@
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:337
-#: src/imports/ContactList/ContactListPage.qml:148
-#: src/imports/ContactList/ContactListPage.qml:277
+#: src/imports/ContactList/ContactListPage.qml:146
+#: src/imports/ContactList/ContactListPage.qml:267
 msgid "Delete"
 msgstr ""
 
@@ -96,7 +96,7 @@
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:141
-#: src/imports/ContactView/ContactView.qml:219
+#: src/imports/ContactView/ContactView.qml:217
 msgid "Edit"
 msgstr ""
 
@@ -173,7 +173,7 @@
 msgid "Loading"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:242
+#: src/imports/ContactList/ContactListPage.qml:232
 msgid "Loading..."
 msgstr ""
 
@@ -246,15 +246,15 @@
 msgid "Save"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:302
+#: src/imports/ContactList/ContactListPage.qml:292
 msgid "Search"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:277
+#: src/imports/ContactList/ContactListPage.qml:267
 msgid "Select"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:261
+#: src/imports/ContactList/ContactListPage.qml:251
 msgid "Select All"
 msgstr ""
 
@@ -266,6 +266,10 @@
 msgid "Select a field"
 msgstr ""
 
+#: src/imports/ContactView/ContactView.qml:206
+msgid "Share"
+msgstr ""
+
 #: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67
 msgid "Skype"
 msgstr ""
@@ -279,15 +283,15 @@
 msgid "Street"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:293
+#: src/imports/ContactList/ContactListPage.qml:283
 msgid "Sync"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:293
+#: src/imports/ContactList/ContactListPage.qml:283
 msgid "Syncing"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:242
+#: src/imports/ContactList/ContactListPage.qml:232
 msgid "Syncing..."
 msgstr ""
 

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2014-06-26 15:46:45 +0000
+++ src/app/addressbookapp.cpp	2014-07-04 14:53:15 +0000
@@ -74,7 +74,7 @@
     QString appPath = QCoreApplication::applicationDirPath();
     if (appPath.startsWith(ADDRESS_BOOK_DEV_BINDIR)) {
         return QString(ADDRESS_BOOK_APP_DEV_DATADIR) + suffix;
-    } else if (QT_EXTRA_IMPORTS_DIR != ""){
+    } else if (!QStringLiteral(QT_EXTRA_IMPORTS_DIR).isEmpty()) {
         return QString(QT_EXTRA_IMPORTS_DIR) + suffix;
     } else {
         return "";

=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2014-06-11 21:25:08 +0000
+++ src/imports/CMakeLists.txt	2014-07-04 14:53:15 +0000
@@ -1,3 +1,5 @@
+project(imports)
+
 set(ADDRESS_BOOK_APP_QMLS
     MainWindow.qml
 )

=== modified file 'src/imports/Common/ContactDetailBase.qml'
--- src/imports/Common/ContactDetailBase.qml	2014-06-12 18:54:18 +0000
+++ src/imports/Common/ContactDetailBase.qml	2014-07-04 14:53:15 +0000
@@ -60,6 +60,12 @@
         imMap[QtContacts.OnlineAccount.Protocol] = "imProtocol"
         imMap[QtContacts.OnlineAccount.Capabilities] = "imCaps"
 
+        // organization
+        var organizationMap = {}
+        organizationMap[QtContacts.Organization.Name] = 'orgName'
+        organizationMap[QtContacts.Organization.Role] = 'orgRole'
+        organizationMap[QtContacts.Organization.Title] = 'orgTitle'
+
         // SyncTarget
         var syncTargetMap = {}
         syncTargetMap[QtContacts.SyncTarget.SyncTarget] = "syncTarget"
@@ -71,6 +77,7 @@
         detailMap[QtContacts.ContactDetail.Email] = emailMap
         detailMap[QtContacts.ContactDetail.Address] = addressMap
         detailMap[QtContacts.ContactDetail.OnlineAccount] = imMap
+        detailMap[QtContacts.ContactDetail.Organization] = organizationMap
         detailMap[QtContacts.ContactDetail.SyncTarget] = syncTargetMap
 
         // detail name

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-06-27 12:54:15 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-07-04 14:53:15 +0000
@@ -141,20 +141,10 @@
         multipleSelection: !pickMode ||
                            mainPage.pickMultipleContacts || (contactExporter.active && contactExporter.isMultiple)
 
-        anchors.fill: parent
-
         leftSideAction: Action {
             iconName: "delete"
             text: i18n.tr("Delete")
-            onTriggered: {
-                value.makeDisappear()
-            }
-        }
-
-        onContactDisappeared: {
-            if (contact) {
-                contactModel.removeContact(contact.contactId)
-            }
+            onTriggered: value.remove()
         }
 
         onCountChanged: {
@@ -168,10 +158,6 @@
                 mainPage.onlineAccountsMessageDialog = null
                 application.unsetFirstRun()
             }
-
-            if (mainPage.searching) {
-                 contactList.positionViewAtBeginning()
-            }
         }
 
         onAddContactClicked: mainPage.createContactWithPhoneNumber(label)

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-06-13 19:54:01 +0000
+++ src/imports/ContactView/ContactView.qml	2014-07-04 14:53:15 +0000
@@ -200,19 +200,17 @@
                 }
             }
         }
-        // FIXME: Having more than 3 options in the header causes a bug that make difficult to reach the component behind it.
-        // Enable it again when the bug #1329557 get fix
-//        ToolbarButton {
-//            action: Action {
-//                objectName: "share"
-//                text: i18n.tr("Share")
-//                iconName: "share"
-//                onTriggered: {
-//                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-//                                   { contactModel: root.model, contact: root.contact})
-//                }
-//            }
-//        }
+        ToolbarButton {
+            action: Action {
+                objectName: "share"
+                text: i18n.tr("Share")
+                iconName: "share"
+                onTriggered: {
+                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
+                                   { contactModel: root.model, contact: root.contact})
+                }
+            }
+        }
         ToolbarButton {
             action: Action {
                 objectName: "edit"

=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-06-18 18:19:09 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-07-04 14:53:15 +0000
@@ -1,3 +1,5 @@
+set(CONTACT_COMPONENTS_PLUGIN "ubuntu-contacts-qml")
+
 set(CONTACT_COMPONENTS_QMLS
     ContactList.js
     ContactAvatar.qml
@@ -12,15 +14,44 @@
     DialogButtons.qml
     FastScroll.qml
     FastScroll.js
+    ListItemWithActions.qml
     MostCalledModel.qml
     MultipleSelectionListView.qml
     MultipleSelectionVisualModel.qml
     qmldir
 )
 
+set(CONTACT_COMPONENTS_SRC
+    mostcalledproxymodel.h
+    mostcalledproxymodel.cpp
+    plugin.h
+    plugin.cpp
+)
+
+add_library(${CONTACT_COMPONENTS_PLUGIN} MODULE
+    ${CONTACT_COMPONENTS_SRC}
+)    
+
+qt5_use_modules(${CONTACT_COMPONENTS_PLUGIN} Core Contacts Qml Quick)
+
 # make the files visible on qtcreator
 add_custom_target(contact_components_QmlFiles ALL SOURCES ${CONTACT_COMPONENTS_QMLS})
 
 if(INSTALL_COMPONENTS)
     install(FILES ${CONTACT_COMPONENTS_QMLS} DESTINATION ${QMLPLUGIN_INSTALL_PREFIX})
+    install(TARGETS ${CONTACT_COMPONENTS_PLUGIN} DESTINATION ${QMLPLUGIN_INSTALL_PREFIX})
+endif()
+
+
+#copy qml files to build dir to make it possible to run without install
+
+add_custom_target(copy_qml)
+foreach(QML_FILE ${CONTACT_COMPONENTS_QMLS})
+  add_custom_command(TARGET copy_qml PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${CMAKE_CURRENT_SOURCE_DIR}/${QML_FILE} ${CMAKE_CURRENT_BINARY_DIR}/)
+endforeach()
+
+if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    add_dependencies(${CONTACT_COMPONENTS_PLUGIN} copy_qml)
 endif()

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-06-23 18:31:56 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-07-04 14:53:15 +0000
@@ -20,7 +20,7 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "Contacts.js" as ContactsJS
 
-Item {
+ListItemWithActions {
     id: root
 
     property bool showAvatar: true
@@ -32,6 +32,7 @@
     property variant titleFields: [ Name.FirstName, Name.LastName ]
     property bool detailsShown: false
     property int loaderOpacity: 0.0
+    property var _contact: contact
 
     signal clicked(int index, QtObject contact)
     signal pressAndHold(int index, QtObject contact)
@@ -47,6 +48,10 @@
     height: delegate.height
     implicitHeight: delegate.height + (pickerLoader.item ? pickerLoader.item.height : 0)
     width: parent ? parent.width : 0
+    color: Theme.palette.normal.background
+
+    onItemClicked: root.clicked(index, contact)
+    onItemPressAndHold: root.pressAndHold(index, contact)
 
     Item {
         id: delegate
@@ -67,12 +72,6 @@
             visible: root.selected || root.detailsShown
         }
 
-        MouseArea {
-            anchors.fill: parent
-            onClicked: root.clicked(index, contact)
-            onPressAndHold: root.pressAndHold(index, contact)
-        }
-
         ContactAvatar {
             id: avatar
 
@@ -181,6 +180,7 @@
                 clip: true
                 height: root.implicitHeight
                 loaderOpacity: 1.0
+                locked: true
                 // FIXME: Setting detailsShown to true on expanded state cause the property to change to false and true during the state transition, and that
                 // causes the loader to load twice
                 //detailsShown: true

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-01 18:48:39 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-04 14:53:15 +0000
@@ -441,14 +441,14 @@
                 model: MostCalledModel {
                     id: calledModel
 
-                    readonly property bool visible:  view.favouritesIsSelected
+                    readonly property bool visible: view.favouritesIsSelected
 
                     onVisibleChanged: {
+                        // update the model every time that it became visible
                         if (visible) {
-                            filterEntries()
+                            model.update()
                         }
                     }
-                    maxCount: 20
                     onInfoRequested: root.infoRequested(contact)
                     onDetailClicked: root.detailClicked(contact, detail, action)
                     onAddContactClicked: root.addContactClicked(label)
@@ -549,6 +549,7 @@
             repeat: false
             interval: 300
             onTriggered: {
+                view.positionViewAtBeginning()
                 var needUpdate = false
                 if (root.filterTerm === "") { // if the search criteria is empty clear the list before show all contacts
                     if (contactTermFilter.value !== "") {

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-19 15:38:16 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-07-04 14:53:15 +0000
@@ -268,6 +268,13 @@
     listDelegate: ContactDelegate {
         id: contactDelegate
 
+        property var removalAnimation
+
+        function remove()
+        {
+            removalAnimation.start()
+        }
+
         width: parent.width
         selected: contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate)
         defaultAvatarUrl: contactListView.defaultAvatarImageUrl
@@ -275,17 +282,43 @@
         titleFields: contactListView.titleFields
         isCurrentItem: ListView.isCurrentItem
 
+        // actions
+        leftSideAction: contactListView.leftSideAction
+        rightSideActions: contactListView.rightSideActions
+
         onDetailClicked: contactListView.detailClicked(contact, detail, action)
         onInfoRequested: contactListView._fetchContact(index, contact)
 
         // collapse the item before remove it, to avoid crash
-        ListView.onRemove: SequentialAnimation {
+        ListView.onRemove: ScriptAction {
+            script: {
+                if (contactDelegate.state !== "") {
+                    contactListView.currentIndex = -1
+                }
+            }
+        }
+
+        // used by swipe to delete
+        removalAnimation: SequentialAnimation {
+            alwaysRunToEnd: true
+
+            PropertyAction {
+                target: contactDelegate
+                property: "ListView.delayRemove"
+                value: true
+            }
+            UbuntuNumberAnimation {
+                target: contactDelegate
+                property: "height"
+                to: 1
+            }
+            PropertyAction {
+                target: contactDelegate
+                property: "ListView.delayRemove"
+                value: false
+            }
             ScriptAction {
-                script: {
-                    if (contactDelegate.state !== "") {
-                        contactListView.currentIndex = -1
-                    }
-                }
+                script: contactListView.listModel.removeContact(contact.contactId)
             }
         }
 

=== added file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-07-04 14:53:15 +0000
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    property Action leftSideAction: null
+    property list<Action> rightSideActions
+    property double defaultHeight: units.gu(8)
+    property bool locked: false
+    property Action activeAction: null
+    property var activeItem: null
+    property bool triggerActionOnMouseRelease: false
+    property alias color: main.color
+    default property alias contents: main.children
+
+    readonly property double actionWidth: units.gu(5)
+    readonly property double threshold: 0.4
+    readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
+
+    signal itemClicked(var mouse)
+    signal itemPressAndHold(var mouse)
+
+    function returnToBoundsRTL()
+    {
+        var xOffset = Math.abs(main.x)
+        var actionFullWidth = actionWidth + units.gu(1)
+
+        if (xOffset < actionFullWidth) {
+            main.x = 0
+        } else if (xOffset > (actionFullWidth * rightActionsRepeater.count)) {
+            main.x = - (actionFullWidth * rightActionsRepeater.count)
+        } else {
+            for (var i = rightActionsRepeater.count; i >= 2; i--) {
+                if (xOffset >= (actionFullWidth * i)) {
+                    main.x = -(actionWidth * i)
+                    return
+                }
+            }
+            main.x = -actionWidth
+        }
+    }
+
+    function returnToBoundsLTR()
+    {
+        var finalX = leftActionView.width
+        if (main.x > (finalX * root.threshold))
+            main.x = finalX
+        else
+            main.x = 0
+    }
+
+    function returnToBounds()
+    {
+        if (main.x < 0) {
+            returnToBoundsRTL()
+        } else if (main.x > 0) {
+            returnToBoundsLTR()
+        }
+    }
+
+    function contains(item, point)
+    {
+        return (point.x >= item.x) && (point.x <= (item.x + item.width)) && (point.y >= item.y) && (point.y <= (item.y + item.height));
+    }
+
+    function getActionAt(point)
+    {
+        if (contains(leftActionView, point)) {
+            return leftSideAction
+        } else if (contains(rightActionsView, point)) {
+            var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
+            for (var i = 0; i < rightActionsRepeater.count; i++) {
+                var child = rightActionsRepeater.itemAt(i)
+                if (contains(child, newPoint)) {
+                    return rightSideActions[i]
+                }
+            }
+        }
+        return null
+    }
+
+    function updateActiveAction()
+    {
+        var xOffset = Math.abs(main.x)
+        if (main.x < 0) {
+            for (var i = rightActionsRepeater.count - 1; i >= 0; i--) {
+                var child = rightActionsRepeater.itemAt(i)
+                var childOffset = rightActionsView.width - child.x
+                if (xOffset <= childOffset) {
+                    root.activeItem = child
+                    root.activeAction = root.rightSideActions[i]
+                    return
+                }
+            }
+        } else {
+            root.activeAction = null
+        }
+    }
+
+    function resetSwipe()
+    {
+        main.x = 0
+    }
+
+    height: defaultHeight
+    clip: height !== defaultHeight
+
+    Rectangle {
+        id: leftActionView
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: parent.left
+        }
+        width: height
+        visible: leftSideAction
+        color: "red"
+
+        Icon {
+            anchors.centerIn: parent
+            name: leftSideAction ? leftSideAction.iconName : ""
+            color: Theme.palette.selected.field
+            height: units.gu(3)
+            width: units.gu(3)
+        }
+    }
+
+    Item {
+       id: rightActionsView
+
+       anchors {
+           top: main.top
+           right: parent.right
+           bottom: main.bottom
+       }
+       width: rightActionsRepeater.count * (root.actionWidth + units.gu(1))
+       Row {
+           anchors.fill: parent
+           spacing: units.gu(1)
+           Repeater {
+               id: rightActionsRepeater
+
+               model: rightSideActions
+               Item {
+                   property alias image: img
+
+                   anchors {
+                       top: parent.top
+                       bottom: parent.bottom
+                   }
+                   width: root.actionWidth
+
+                   Icon {
+                       id: img
+
+                       anchors.centerIn: parent
+                       width: units.gu(3)
+                       height: units.gu(3)
+                       name: iconName
+                       color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? UbuntuColors.lightAubergine : Theme.palette.selected.background
+                   }
+               }
+           }
+       }
+    }
+
+
+    Rectangle {
+        id: main
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+        }
+
+        width: parent.width
+        Behavior on x {
+            UbuntuNumberAnimation {
+                easing.type: Easing.OutElastic
+                duration: UbuntuAnimation.SlowDuration
+            }
+        }
+    }
+
+    SequentialAnimation {
+        id: triggerAction
+
+        property var currentItem: root.activeItem ? root.activeItem.image : null
+
+        running: false
+        ParallelAnimation {
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                property: "opacity"
+                from: 1.0
+                to: 0.0
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                properties: "width, height"
+                from: units.gu(3)
+                to: root.actionWidth
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+        }
+        ScriptAction {
+            script: {
+                root.activeAction.triggered(root)
+            }
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "width, height"
+            value: units.gu(3)
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "opacity"
+            value: 1.0
+        }
+        UbuntuNumberAnimation {
+            target: main
+            property: "x"
+            to: 0
+            easing.type: Easing.OutElastic
+            duration: UbuntuAnimation.SlowDuration
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        property bool locked: root.locked || ((root.leftSideAction === null) && (root.rightSideActions.count === 0))
+
+        anchors.fill: parent
+        drag {
+            target: locked ? null : main
+            axis: Drag.XAxis
+            minimumX: -rightActionsView.width
+            maximumX: leftActionView.visible ? leftActionView.width : 0
+        }
+
+        onReleased: {
+            if (root.triggerActionOnMouseRelease && root.activeAction) {
+                triggerAction.start()
+            } else {
+                root.returnToBounds()
+            }
+        }
+        onClicked: {
+            if (main.x === 0) {
+                root.itemClicked(mouse)
+                return
+            }
+
+            var action = getActionAt(Qt.point(mouse.x, mouse.y))
+            if (action) {
+                action.triggered(root)
+            }
+            root.resetSwipe()
+        }
+
+        onPositionChanged: updateActiveAction()
+        onPressAndHold: {
+            if (main.x === 0) {
+                root.itemPressAndHold(mouse)
+            }
+        }
+        z: -1
+    }
+}

=== modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
--- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-07-01 18:48:39 +0000
+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-07-04 14:53:15 +0000
@@ -18,14 +18,12 @@
 import QtQuick 2.2
 import QtContacts 5.0
 import Ubuntu.History 0.1
-import Ubuntu.Telephony 0.1
+import Ubuntu.Contacts 0.1
 
 VisualDataModel {
     id: root
 
-    property int maxCount: 10
     property var contactModel: null
-    property var historyModel
     property int currentIndex: -1
 
     signal clicked(int index, QtObject contact)
@@ -33,115 +31,39 @@
     signal infoRequested(int index, QtObject contact)
     signal addContactClicked(string label)
 
-    function filterEntries()
-    {
-        var contacts = {}
-        var interval = new Date()
-        var secs = (interval.getTime() - 2592000000) // one month ago
-        interval.setTime(secs)
-
-        var totalCount = 0
-        var i = 0;
-        while(true) {
-            var event = historyModel.getItem(i)
-            if (!event) {
-                break
-            }
-
-            if (event.timestamp < interval) {
-                break
-            }
-
-            var participants = event.participants
-            for (var p=0; p < participants.length; p++) {
-                var phoneNumber = participants[p]
-                if (phoneNumber) {
-                    if (contacts[phoneNumber] === undefined) {
-                        contacts[phoneNumber] = 1
-                    } else {
-                        var count = contacts[phoneNumber]
-                        contacts[phoneNumber] = count + 1
-                    }
-                    totalCount += 1
-                }
-            }
-            i++
-        }
-
-        listModel.clear()
-        if (totalCount == 0) {
-            return
-        }
-
-        // sort phones most called first
-        var mostCalledFirst = []
-        for (var key in contacts) {
-            mostCalledFirst.push([key, contacts[key]]);
-        }
-
-        mostCalledFirst.sort(function(a, b) {
-            a = a[1];
-            b = b[1];
-
-            return a < b ? -1 : (a > b ? 1 : 0);
-        });
-
-        contacts = {}
-        for (var i = 0; i < mostCalledFirst.length; i++) {
-            var key = mostCalledFirst[i][0];
-            var value = mostCalledFirst[i][1];
-            contacts[key] = value
-        }
-
-        // get the avarage frequency
-        var average = totalCount / mostCalledFirst.length
-
-        for (var phone in contacts) {
-            if (contacts[phone] >= average) {
-                listModel.insert(0, {"participant": phone})
-                if (listModel.count >= root.maxCount) {
-                    return;
-                }
-            }
-        }
-    }
-
-    model: ListModel {
-        id: listModel
-    }
-
-    historyModel: HistoryEventModel {
-
-        function getItem(row) {
-            while ((row >= count) && (canFetchMore())) {
-                fetchMore()
-            }
-            return get(row)
-        }
-
-        type: HistoryThreadModel.EventTypeVoice
-        sort: HistorySort {
-            sortField: "timestamp"
-            sortOrder: HistorySort.DescendingOrder
-        }
-    }
-
+
+    model: MostCalledContactsModel {
+        startInterval: new Date((new Date().getTime() - 2592000000)) // one month ago
+        sourceModel: HistoryEventModel {
+            type: HistoryThreadModel.EventTypeVoice
+            sort: HistorySort {
+                sortField: "timestamp"
+                sortOrder: HistorySort.DescendingOrder
+            }
+            filter: HistoryFilter {
+                filterProperty: "senderId"
+                filterValue: "self"
+                matchFlags: HistoryFilter.MatchCaseSensitive
+            }
+        }
+    }
 
     delegate: ContactDelegate {
         id: contactDelegate
 
         readonly property alias contact: contactFetch.contact
+        property var contents
 
         onDetailClicked: root.detailClicked(contact, detail, action)
         onInfoRequested: root.infoRequested(index, contact)
         onAddContactClicked: root.addContactClicked(label)
 
         defaultAvatarUrl: "image://theme/contacts"
-        defaultTitle: participant
-        width: parent.width
+        width: parent ? parent.width : 0
         titleDetail: ContactDetail.DisplayLabel
         titleFields: [ DisplayLabel.Label ]
         isCurrentItem: root.currentIndex === index
+        locked: true
 
         // collapse the item before remove it, to avoid crash
         ListView.onRemove: SequentialAnimation {
@@ -166,17 +88,12 @@
             }
         }
 
-        ContactWatcher {
-            id: contactWatcher
-
-            phoneNumber: participant
-            onContactIdChanged: contactFetch.fetchContact(contactId)
-        }
-
-        ContactFetch {
-            id: contactFetch
-
-            model: contactsModel
-        }
+        // delegate does not support more than one child
+        contents: ContactFetch {
+                id: contactFetch
+                model: contactsModel
+        }
+
+        Component.onCompleted: contactFetch.fetchContact(contactId)
     }
 }

=== added file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp'
--- src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	2014-07-04 14:53:15 +0000
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mostcalledproxymodel.h"
+
+#include <QtContacts/QContactManager>
+#include <QtContacts/QContactFilter>
+#include <QtContacts/QContactPhoneNumber>
+
+#include <QDebug>
+
+using namespace QtContacts;
+
+bool mostCalledContactsModelDataLessThan(const MostCalledContactsModelData &d1, const MostCalledContactsModelData &d2)
+{
+    return d1.callCount < d2.callCount;
+}
+
+MostCalledContactsModel::MostCalledContactsModel(QObject *parent)
+    : QAbstractListModel(parent),
+      m_sourceModel(0),
+      m_manager(new QContactManager("galera")),
+      m_maxCount(20),
+      m_average(0),
+      m_outdated(true),
+      m_reloadingModel(false)
+{
+    connect(this, SIGNAL(sourceModelChanged(QAbstractItemModel*)), SLOT(markAsOutdated()));
+    connect(this, SIGNAL(maxCountChanged(uint)), SLOT(markAsOutdated()));
+    connect(this, SIGNAL(startIntervalChanged(QDateTime)), SLOT(markAsOutdated()));
+    connect(this, SIGNAL(modelReset()), SIGNAL(outdatedChange(bool)));
+}
+
+MostCalledContactsModel::~MostCalledContactsModel()
+{
+}
+
+QVariant MostCalledContactsModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    int row = index.row();
+    if ((row >= 0) && (row < m_data.size())) {
+        switch (role)
+        {
+        case MostCalledContactsModel::ContactIdRole:
+            return m_data[row].contactId;
+        case MostCalledContactsModel::PhoneNumberRole:
+            return m_data[row].phoneNumber;
+        case MostCalledContactsModel::CallCountRole:
+            return m_data[row].callCount;
+        default:
+            return QVariant();
+        }
+    }
+    return QVariant();
+}
+
+QHash<int, QByteArray> MostCalledContactsModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles;
+    if (roles.isEmpty()) {
+        roles.insert(MostCalledContactsModel::ContactIdRole, "contactId");
+        roles.insert(MostCalledContactsModel::PhoneNumberRole, "phoneNumber");
+        roles.insert(MostCalledContactsModel::CallCountRole, "callCount");
+    }
+    return roles;
+}
+
+int MostCalledContactsModel::rowCount(const QModelIndex &) const
+{
+    return m_data.size();
+}
+
+QAbstractItemModel *MostCalledContactsModel::sourceModel() const
+{
+    return m_sourceModel;
+}
+
+void MostCalledContactsModel::setSourceModel(QAbstractItemModel *model)
+{
+    if (m_sourceModel != model) {
+        if (m_sourceModel) {
+            disconnect(m_sourceModel);
+        }
+
+        m_sourceModel = model;
+        connect(m_sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), SLOT(markAsOutdated()));
+        connect(m_sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SLOT(markAsOutdated()));
+        connect(m_sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(markAsOutdated()));
+        connect(m_sourceModel, SIGNAL(modelReset()), SLOT(markAsOutdated()));
+
+        Q_EMIT sourceModelChanged(m_sourceModel);
+    }
+}
+
+
+uint MostCalledContactsModel::maxCount() const
+{
+    return m_maxCount;
+}
+
+void MostCalledContactsModel::setMaxCount(uint value)
+{
+    if (m_maxCount != value) {
+        m_maxCount = value;
+        Q_EMIT maxCountChanged(m_maxCount);
+    }
+}
+
+int MostCalledContactsModel::callAverage() const
+{
+    return m_average;
+}
+
+QDateTime MostCalledContactsModel::startInterval() const
+{
+    return m_startInterval;
+}
+
+void MostCalledContactsModel::setStartInterval(const QDateTime &value)
+{
+    if (m_startInterval != value) {
+        m_startInterval = value;
+        Q_EMIT startIntervalChanged(m_startInterval);
+    }
+}
+
+QVariant MostCalledContactsModel::getSourceData(int row, int role)
+{
+    QAbstractItemModel *source = sourceModel();
+    if (!source) {
+        return QVariant();
+    }
+
+    while ((source->rowCount() <= row)  && (source->canFetchMore(QModelIndex()))) {
+        source->fetchMore(QModelIndex());
+    }
+
+    if (source->rowCount() < row) {
+        return QVariant();
+    }
+
+    QModelIndex sourceIndex = source->index(row, 0);
+    return source->data(sourceIndex, role);
+}
+
+QString MostCalledContactsModel::fetchContactId(const QString &phoneNumber)
+{
+    QContactFilter filter(QContactPhoneNumber::match(phoneNumber));
+    QContactFetchHint hint;
+    hint.setDetailTypesHint(QList<QContactDetail::DetailType>() << QContactDetail::TypeGuid);
+    QList<QContact> contacts = m_manager->contacts(filter, QList<QContactSortOrder>() , hint);
+    if (contacts.isEmpty()) {
+        return QString();
+    }
+    return contacts[0].id().toString();
+}
+
+void MostCalledContactsModel::update()
+{
+    // skip update if not necessary
+    if (!m_outdated || m_reloadingModel) {
+        return;
+    }
+
+    Q_EMIT beginResetModel();
+
+    m_reloadingModel = true;
+    m_outdated = false;
+    m_data.clear();
+    m_average = 0;
+
+    if (m_maxCount <= 0) {
+        qWarning() << "update model requested with invalid maxCount";
+        Q_EMIT endResetModel();
+        m_reloadingModel = false;
+        return;
+    }
+
+    if (!m_startInterval.isValid()) {
+        qWarning() << "Update model requested with invalid startInterval";
+        Q_EMIT endResetModel();
+        m_reloadingModel = false;
+        return;
+    }
+
+    QAbstractItemModel *source = sourceModel();
+    if (!source) {
+        qWarning() << "Update model requested with null source model";
+        m_outdated = false;
+        Q_EMIT endResetModel();
+        m_reloadingModel = false;
+        return;
+    }
+
+    QHash<int, QByteArray> roles = source->roleNames();
+    int participantsRole = roles.key("participants", -1);
+    int timestampRole = roles.key("timestamp", -1);
+    int row = 0;
+
+    Q_ASSERT(participantsRole != -1);
+    Q_ASSERT(timestampRole != -1);
+
+    QMap<QString, QString> phoneToContactCache;
+    QMap<QString, MostCalledContactsModelData > contactsData;
+
+    // get all call in the interval
+    int totalCalls = 0;
+    while(true) {
+        QVariant date = getSourceData(row, timestampRole);
+
+        // end of source model
+        if (date.isNull()) {
+            break;
+        }
+
+        // exit if date is out of interval
+        if (date.toDateTime() < m_startInterval) {
+            break;
+        }
+
+        QVariant participants = getSourceData(row, participantsRole);
+        if (participants.isValid()) {
+            Q_FOREACH(const QString phone, participants.toStringList()) {
+                QString contactId;
+                if (phoneToContactCache.contains(phone)) {
+                    contactId = phoneToContactCache.value(phone);
+                } else {
+                    contactId = fetchContactId(phone);
+                }
+
+                // skip uknown contacts
+                if (contactId.isEmpty()) {
+                    continue;
+                }
+
+                if (contactsData.contains(contactId)) {
+                    MostCalledContactsModelData &data = contactsData[contactId];
+                    data.callCount++;
+                } else {
+                    MostCalledContactsModelData data;
+                    data.contactId = contactId;
+                    data.phoneNumber = phone;
+                    data.callCount = 1;
+                    contactsData.insert(contactId, data);
+                }
+                totalCalls++;
+            }
+        }
+        row++;
+    }
+
+    if (!contactsData.isEmpty()) {
+        // sort by callCount
+        QList<MostCalledContactsModelData> data = contactsData.values();
+        qSort(data.begin(), data.end(), mostCalledContactsModelDataLessThan);
+
+        // average
+        m_average = totalCalls / contactsData.size();
+
+        Q_FOREACH(const MostCalledContactsModelData &d, data) {
+            if (d.callCount >= m_average) {
+                m_data << d;
+            }
+            if ((uint) m_data.size() > m_maxCount) {
+                break;
+            }
+        }
+    }
+
+    Q_EMIT endResetModel();
+    m_reloadingModel = false;
+}
+
+void MostCalledContactsModel::markAsOutdated()
+{
+    // skip if model is being reloaded
+    if (m_reloadingModel) {
+        return;
+    }
+
+    if (!m_outdated) {
+        m_outdated = true;
+        Q_EMIT outdatedChange(m_outdated);
+    }
+}

=== added file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.h'
--- src/imports/Ubuntu/Contacts/mostcalledproxymodel.h	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.h	2014-07-04 14:53:15 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MOSTCALLEDCONTACTSMODEL_H__
+#define __MOSTCALLEDCONTACTSMODEL_H__
+
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QDateTime>
+
+#include <QtContacts/QContactManager>
+
+struct MostCalledContactsModelData
+{
+    QString contactId;
+    QString phoneNumber;
+    int callCount;
+};
+
+class MostCalledContactsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
+    Q_PROPERTY(uint maxCount READ maxCount WRITE setMaxCount NOTIFY maxCountChanged)
+    Q_PROPERTY(int callAverage READ callAverage NOTIFY callAverageChanged)
+    Q_PROPERTY(QDateTime startInterval READ startInterval WRITE setStartInterval NOTIFY startIntervalChanged)
+    Q_PROPERTY(bool outdated READ outdated NOTIFY outdatedChange)
+
+public:
+    enum Role {
+        ContactIdRole = 0,
+        PhoneNumberRole,
+        CallCountRole
+    };
+
+    MostCalledContactsModel(QObject *parent=0);
+    ~MostCalledContactsModel();
+
+    QVariant data(const QModelIndex &index, int role) const;
+    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex&) const;
+
+    QAbstractItemModel *sourceModel() const;
+    void setSourceModel(QAbstractItemModel *model);
+
+    uint maxCount() const;
+    void setMaxCount(uint value);
+
+    int callAverage() const;
+    bool outdated() const;
+
+    QDateTime startInterval() const;
+    void setStartInterval(const QDateTime &value);
+
+    Q_INVOKABLE void update();
+
+Q_SIGNALS:
+    void maxCountChanged(uint value);
+    void callAverageChanged(int value);
+    void startIntervalChanged(const QDateTime &value);
+    void sourceModelChanged(QAbstractItemModel *value);
+    void outdatedChange(bool value);
+
+private Q_SLOTS:
+    void markAsOutdated();
+
+private:
+    QAbstractItemModel *m_sourceModel;
+    QScopedPointer<QtContacts::QContactManager> m_manager;
+    QList<MostCalledContactsModelData> m_data;
+    uint m_maxCount;
+    int m_average;
+    QDateTime m_startInterval;
+    bool m_outdated;
+    bool m_reloadingModel;
+
+    QString fetchContactId(const QString &phoneNumber);
+    QVariant getSourceData(int row, int role);
+};
+
+
+#endif

=== added file 'src/imports/Ubuntu/Contacts/plugin.cpp'
--- src/imports/Ubuntu/Contacts/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/plugin.cpp	2014-07-04 14:53:15 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "mostcalledproxymodel.h"
+
+#include <QQmlEngine>
+#include <qqml.h>
+
+void UbuntuContacts::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(uri);
+}
+
+void UbuntuContacts::registerTypes(const char *uri)
+{
+    // @uri Ubuntu.Contacts
+    qmlRegisterType<MostCalledContactsModel>(uri, 0, 1, "MostCalledContactsModel");
+}

=== added file 'src/imports/Ubuntu/Contacts/plugin.h'
--- src/imports/Ubuntu/Contacts/plugin.h	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/plugin.h	2014-07-04 14:53:15 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _UBUNTU_CONTACTS_H_
+#define _UBUNTU_CONTACTS_H_
+
+#include <QQmlContext>
+#include <QQmlExtensionPlugin>
+
+class UbuntuContacts : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri);
+};
+
+#endif //_UBUNTU_CONTACTS_H_

=== modified file 'src/imports/Ubuntu/Contacts/qmldir'
--- src/imports/Ubuntu/Contacts/qmldir	2014-06-18 18:19:09 +0000
+++ src/imports/Ubuntu/Contacts/qmldir	2014-07-04 14:53:15 +0000
@@ -1,10 +1,13 @@
 module Ubuntu.Contacts
 
+plugin ubuntu-contacts-qml
+
 ContactAvatar 0.1 ContactAvatar.qml
 ContactDetailOnlineAccountTypeModel 0.1 ContactDetailOnlineAccountTypeModel.qml
 ContactDetailPhoneNumberTypeModel 0.1 ContactDetailPhoneNumberTypeModel.qml
 ContactFetch 0.1 ContactFetch.qml
 ContactListView 0.1 ContactListView.qml
+ListItemWithActions 0.1 ListItemWithActions.qml
 MultipleSelectionListView 0.1 MultipleSelectionListView.qml
 
 internal ContactSimpleListView ContactSimpleListView.qml

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-12-12 15:55:57 +0000
+++ tests/CMakeLists.txt	2014-07-04 14:53:15 +0000
@@ -1,3 +1,5 @@
+add_subdirectory(qml)
+
 if(ENABLE_AUTOPILOT)
     add_subdirectory(autopilot)
     add_subdirectory(data)

=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2014-06-17 00:20:22 +0000
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2014-07-04 14:53:15 +0000
@@ -49,96 +49,6 @@
         list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
-    def test_add_contact_without_name(self):
-        # execute add new contact
-        contact_editor = self.app.main_window.go_to_add_contact()
-
-        # Try to save a empty contact
-        acceptButton = self.app.main_window.get_button("save")
-
-        # Save button must be disabled
-        self.assertThat(acceptButton.enabled, Eventually(Equals(False)))
-
-        contact_editor.fill_form(data.Contact(first_name='Fulano'))
-
-        # Save button must be enabled
-        self.assertThat(acceptButton.enabled, Eventually(Equals(True)))
-
-        contact_editor.fill_form(data.Contact(first_name=''))
-
-        # Save button must be disabled
-        self.assertThat(acceptButton.enabled, Eventually(Equals(False)))
-
-        contact_editor.fill_form(data.Contact(last_name='de Tal'))
-
-        # Save button must be enabled
-        self.assertThat(acceptButton.enabled, Eventually(Equals(True)))
-
-        # clear lastName field
-        contact_editor.fill_form(data.Contact(last_name=''))
-
-        # Save button must be disabled
-        self.assertThat(acceptButton.enabled, Eventually(Equals(False)))
-
-        # Clicking on disabled button should do nothing
-        self.pointing_device.click_object(acceptButton)
-
-        # Check if the contact editor still visbile
-        list_page = self.app.main_window.get_contact_list_page()
-
-        self.assertThat(list_page.visible, Eventually(Equals(False)))
-        self.assertThat(contact_editor.visible, Eventually(Equals(True)))
-
-        # Check if the contact list still empty
-        list_view = self.app.main_window.get_contact_list_view()
-        self.assertThat(list_view.count, Eventually(Equals(0)))
-
-    def test_add_contact_with_full_name(self):
-        test_contact = data.Contact(first_name='Fulano', last_name='de Tal')
-
-        # execute add new contact
-        contact_editor = self.app.main_window.go_to_add_contact()
-        contact_editor.fill_form(test_contact)
-
-        # Save contact
-        self.app.main_window.save()
-
-        # Check if the contact list is visible again
-        list_page = self.app.main_window.get_contact_list_page()
-        self.assertThat(list_page.visible, Eventually(Equals(True)))
-
-        # Check if contact was added
-        list_view = self.app.main_window.get_contact_list_view()
-        self.assertThat(list_view.count, Eventually(Equals(1)))
-
-    def test_add_contact_with_first_name(self):
-        test_contact = data.Contact(first_name='Fulano')
-
-        # execute add new contact
-        contact_editor = self.app.main_window.go_to_add_contact()
-        contact_editor.fill_form(test_contact)
-
-        # Save contact
-        self.app.main_window.save()
-
-        # Check if contact was added
-        list_view = self.app.main_window.get_contact_list_view()
-        self.assertThat(list_view.count, Eventually(Equals(1)))
-
-    def test_add_contact_with_last_name(self):
-        test_contact = data.Contact(last_name='de Tal')
-
-        # execute add new contact
-        contact_editor = self.app.main_window.go_to_add_contact()
-        contact_editor.fill_form(test_contact)
-
-        # Save contact
-        self.app.main_window.save()
-
-        # Check if contact was added
-        list_view = self.app.main_window.get_contact_list_view()
-        self.assertThat(list_view.count, Eventually(Equals(1)))
-
     def test_add_contact_with_name_and_phone(self):
         test_contact = data.Contact(
             first_name='Fulano', last_name='de Tal',

=== added directory 'tests/qml'
=== added file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qml/CMakeLists.txt	2014-07-04 14:53:15 +0000
@@ -0,0 +1,22 @@
+find_program(QMLTESTRUNNER_BIN
+    NAMES qmltestrunner
+    PATHS /usr/lib/*/qt5/bin
+    NO_DEFAULT_PATH
+)
+
+find_program(XVFB_RUN_BIN
+    NAMES xvfb-run
+)
+
+if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
+    add_test(NAME qmltestrunner
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24" ${QMLTESTRUNNER_BIN} -import ${imports_BINARY_DIR} -input ${CMAKE_SOURCE_DIR}/tests/qml
+    )
+else()
+    if (NOT QMLTESTRUNNER_BIN)
+        message(WARNING "Qml tests disabled: qmltestrunner not found")
+    else()
+        message(WARNING "Qml tests disabled: xvfb-run not found")
+    endif()
+endif()

=== added file 'tests/qml/tst_ContactEditor.qml'
--- tests/qml/tst_ContactEditor.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_ContactEditor.qml	2014-07-04 14:53:15 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Test 0.1
+import Ubuntu.Contacts 0.1 
+
+import '../../src/imports/ContactEdit'
+
+Item {
+
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(80)
+
+    MainView {
+        id: mainView
+        anchors.fill: parent
+        useDeprecatedToolbar: false
+
+        ListModel {
+            // dummy data model.
+            id: dummyDataModel
+
+            signal contactsFetched
+        }
+
+        ContactEditor {
+            id: contactEditor
+            anchors.fill: parent
+            model: dummyDataModel
+            contact: createEmptyContact('')
+        }
+    }
+
+    function createEmptyContact(phoneNumber) {
+        var details = [
+           {detail: 'PhoneNumber', field: 'number', value: phoneNumber},
+           {detail: 'EmailAddress', field: 'emailAddress', value: ''},
+           {detail: 'OnlineAccount', field: 'accountUri', value: ''},
+           {detail: 'Address', field: 'street', value: ''},
+           {detail: 'Name', field: 'firstName', value: ''},
+           {detail: 'Organization', field: 'name', value: ''}
+       ];
+
+        var newContact = Qt.createQmlObject(
+            'import QtContacts 5.0; Contact{ }', mainView);
+        var detailSourceTemplate = 'import QtContacts 5.0; %1{ %2: "%3" }';
+        for (var i=0; i < details.length; i++) {
+            var detailMetaData = details[i];
+            var template = detailSourceTemplate.arg(detailMetaData.detail).arg(
+                detailMetaData.field).arg(detailMetaData.value);
+            var newDetail = Qt.createQmlObject(template, mainView);
+            newContact.addDetail(newDetail);
+        }
+        return newContact;
+    }
+
+    UbuntuTestCase {
+        id: contactEditorTestCase
+        name: 'contactEditorTestCase'
+
+        when: windowShown
+
+        function init() {
+            waitForRendering(contactEditor);
+            var saveButton = findChild(root, 'save_header_button');
+            compare(saveButton.enabled, false);
+        }
+
+        function cleanup() {
+            var textFields = getRequiredTextFields().concat(
+                getOptionalTextFields());
+            textFields.forEach(clearTextField);
+        }
+
+        function getRequiredTextFields() {
+            return ['firstName', 'lastName', 'phoneNumber_0'];
+        }
+
+        function getOptionalTextFields() {
+            return [
+                'emailAddress_0', 'imUri_0', 'streetAddress_0',
+                'localityAddress_0', 'regionAddress_0', 'postcodeAddress_0',
+                'countryAddress_0', 'orgName_0', 'orgRole_0', 'orgTitle_0'
+            ];
+        }
+
+        function clearTextField(value, index, array) {
+            var textField = findChild(root, value);
+            textField.text = '';
+        }
+
+        function test_fillRequiredFieldsMustEnableSaveButton_data() {
+            var textFields = getRequiredTextFields();
+            return objectNamesArrayToDataScenarios(textFields);
+        }
+
+        function objectNamesArrayToDataScenarios(objectNamesArray) {
+            var data = [];
+            for (var index = 0; index < objectNamesArray.length; index++) {
+                var objectName = objectNamesArray[index];
+                data.push({tag: objectName, objectName: objectName});
+            }
+            return data;
+        }
+
+        function test_fillRequiredFieldsMustEnableSaveButton(data) {
+            var textField = findChild(root, data.objectName);
+            textField.text = 'test'
+            var saveButton = findChild(root, 'save_header_button');
+            tryCompare(saveButton, 'enabled', true);
+        }
+
+        function test_fillOptionalFieldsMustNotEnableSaveButton_data() {
+            var textFields = getOptionalTextFields();
+            return objectNamesArrayToDataScenarios(textFields)
+        }
+
+        function test_fillOptionalFieldsMustNotEnableSaveButton(data) {
+            var textField = findChild(root, data.objectName);
+            textField.text = 'test'
+            var saveButton = findChild(root, 'save_header_button');
+            tryCompare(saveButton, 'enabled', false);
+        }
+    }
+}