Merge lp:~phablet-team/address-book-app/address-book-app-desktop-translations into lp:address-book-app

[Ugo Riboni]

Add translations inside .desktop files

Add translations inside .desktop files

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/588/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/930/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1681/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/986/console

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

could you create a new mr against the staging branch?

[lp:~phablet-team/address-book-app/address-book-app-desktop-translations]

211. By Renato Araujo Oliveira Filho on 2014-07-16

Removed useless code.

212. By Renato Araujo Oliveira Filho on 2014-07-16

Staging merged.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-07 19:46:23 +0000
+++ CMakeLists.txt	2014-07-16 12:56:44 +0000
@@ -18,9 +18,13 @@
 find_package(Qt5DBus)
 find_package(PkgConfig REQUIRED)
 
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
+
 set(ADDRESS_BOOK_APP_DIR ${CMAKE_INSTALL_DATADIR}/address-book-app)
 set(ADDRESS_BOOK_APP_FULL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/address-book-app)
 set(ADDRESS_BOOK_APP_NAME "Address Book")
+set(DESKTOP_FILE address-book-app.desktop)
 set(API_VERSION 0.1)
 
 # for dh_translations to extract the domain

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-07-07 19:46:23 +0000
+++ data/CMakeLists.txt	2014-07-16 12:56:44 +0000
@@ -5,13 +5,11 @@
     set(ADDRESS_BOOK_APP_ICON "address-book-app.svg")
 endif()
 
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_APP_DESKTOP_FILE})
-file(STRINGS ${ADDRESS_BOOK_APP_DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
-foreach(LINE ${DESKTOP_FILE_CONTENTS})
-    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
-    string(CONFIGURE "${LINE}" LINE)
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_APP_DESKTOP_FILE} "${LINE}\n")
-endforeach(LINE)
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
+add_custom_target(${DESKTOP_FILE} ALL
+         COMMENT "Merging translations into ${DESKTOP_FILE}"
+         COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
+)
 
 if(CLICK_MODE)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_APP_DESKTOP_FILE}

=== renamed file 'data/address-book-app.desktop.in' => 'data/address-book-app.desktop.in.in'
--- data/address-book-app.desktop.in	2014-07-07 19:46:23 +0000
+++ data/address-book-app.desktop.in.in	2014-07-16 12:56:44 +0000
@@ -3,13 +3,13 @@
 Version=1.0
 Terminal=false
 Type=Application
-Name=tr("Contacts")
-GenericName=tr("Contacts")
-Comment=tr("Contacts Address Book")
+_Name=Contacts
+_GenericName=Contacts
+_Comment=Contacts Address Book
+_Keywords=Contacts;People;Numbers
 Exec=@DESKTOP_EXEC@ %u
 Icon=@ADDRESS_BOOK_APP_ICON@
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=address-book-app
 X-Ubuntu-Single-Instance=true
 @XSCREENSHOT@

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-05-28 19:56:00 +0000
+++ po/CMakeLists.txt	2014-07-16 12:56:44 +0000
@@ -4,8 +4,8 @@
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/*.qml
-    ${CMAKE_SOURCE_DIR}/data/*.desktop.in)
+    ${CMAKE_SOURCE_DIR}/src/*.qml)
+list(APPEND I18N_SRCS data/${DESKTOP_FILE}.in.in)
 list(SORT I18N_SRCS)
 
 foreach(PO_FILE ${PO_FILES})
@@ -19,8 +19,11 @@
 
 find_program(XGETTEXT_EXECUTABLE xgettext)
 if(XGETTEXT_EXECUTABLE)
-    add_custom_target(${POT_FILE})
-    add_custom_command(TARGET ${POT_FILE}
+    add_custom_target(${POT_FILE} ALL
+        COMMENT "Generating translation template"
+        COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+                --srcdir=${CMAKE_SOURCE_DIR} data/${DESKTOP_FILE}.in.in
+
         COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
                 --c++ --qt --add-comments=TRANSLATORS
                 --keyword=tr --keyword=tr:1,2

=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot	2014-06-30 18:01:45 +0000
+++ po/address-book-app.pot	2014-07-16 12:56:44 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: address-book-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-30 15:01-0300\n"
+"POT-Creation-Date: 2014-07-16 09:55-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"
@@ -22,10 +22,18 @@
 msgid "%1 vCards imported"
 msgstr ""
 
+#: src/imports/ContactList/ContactListPage.qml:202
+msgid "+ New Contact"
+msgstr ""
+
 #: src/imports/ContactEdit/ContactEditor.qml:322
 msgid "Add Field"
 msgstr ""
 
+#: src/imports/ContactList/ContactListPage.qml:462
+msgid "Add contact"
+msgstr ""
+
 #: src/imports/ContactEdit/AddFieldDialog.qml:59
 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:23
 #: src/imports/ContactView/ContactDetailAddressesView.qml:24
@@ -55,12 +63,12 @@
 
 #: src/imports/ContactEdit/AddFieldDialog.qml:133
 #: src/imports/ContactEdit/ContactEditor.qml:372
-#: src/imports/ContactList/ContactListPage.qml:314
+#: src/imports/ContactList/ContactListPage.qml:418
 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
 msgid "Cancel"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:242
+#: src/imports/ContactList/ContactListPage.qml:330
 msgid "Cancel selection"
 msgstr ""
 
@@ -72,22 +80,17 @@
 msgid "Contact not found"
 msgstr ""
 
-#: data/address-book-app.desktop.in:6 data/address-book-app.desktop.in:7
-#: src/imports/ContactList/ContactListPage.qml:75
+#: src/imports/ContactList/ContactListPage.qml:146
 msgid "Contacts"
 msgstr ""
 
-#: data/address-book-app.desktop.in:8
-msgid "Contacts Address Book"
-msgstr ""
-
 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:35
 msgid "Country"
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:337
-#: src/imports/ContactList/ContactListPage.qml:146
-#: src/imports/ContactList/ContactListPage.qml:267
+#: src/imports/ContactList/ContactListPage.qml:235
+#: src/imports/ContactList/ContactListPage.qml:355
 msgid "Delete"
 msgstr ""
 
@@ -120,7 +123,7 @@
 msgstr ""
 
 #: src/imports/ContactView/ContactFetchError.qml:25
-#: src/imports/MainWindow.qml:98
+#: src/imports/MainWindow.qml:112
 msgid "Error"
 msgstr ""
 
@@ -136,12 +139,12 @@
 msgid "First name"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactListView.qml:427
+#: src/imports/Ubuntu/Contacts/ContactListView.qml:442
 msgid "Frequently called"
 msgstr ""
 
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:116
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:94
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:99
 msgid "Home"
 msgstr ""
 
@@ -173,7 +176,7 @@
 msgid "Loading"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:232
+#: src/imports/ContactList/ContactListPage.qml:320
 msgid "Loading..."
 msgstr ""
 
@@ -185,7 +188,7 @@
 msgid "MSN"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:98
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:103
 msgid "Mobile"
 msgstr ""
 
@@ -193,7 +196,7 @@
 msgid "Multiple contacts"
 msgstr ""
 
-#: src/imports/ContactEdit/TextInputDetail.qml:77
+#: src/imports/ContactEdit/TextInputDetail.qml:74
 msgid "Next"
 msgstr ""
 
@@ -211,7 +214,7 @@
 msgstr ""
 
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:118
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:102
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:107
 msgid "Other"
 msgstr ""
 
@@ -234,6 +237,10 @@
 msgid "Professional details"
 msgstr ""
 
+#: src/imports/ContactList/ContactListPage.qml:372
+msgid "Quit"
+msgstr ""
+
 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:33
 msgid "Region"
 msgstr ""
@@ -246,19 +253,19 @@
 msgid "Save"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:292
+#: src/imports/ContactList/ContactListPage.qml:396
 msgid "Search"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:267
+#: src/imports/ContactList/ContactListPage.qml:355
 msgid "Select"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:251
+#: src/imports/ContactList/ContactListPage.qml:339
 msgid "Select All"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:75
+#: src/imports/ContactList/ContactListPage.qml:512
 msgid "Select Contacts"
 msgstr ""
 
@@ -283,15 +290,15 @@
 msgid "Street"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:283
+#: src/imports/ContactList/ContactListPage.qml:387
 msgid "Sync"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:283
+#: src/imports/ContactList/ContactListPage.qml:387
 msgid "Syncing"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:232
+#: src/imports/ContactList/ContactListPage.qml:320
 msgid "Syncing..."
 msgstr ""
 
@@ -303,18 +310,12 @@
 msgid "Touch"
 msgstr ""
 
-#. TRANSLATORS: This value is used as default value for phone number format, when no coutry code is provided
-#. the supported values can be found in: https://www.iso.org/obp/ui/#search
-#: src/imports/ContactEdit/TextInputDetail.qml:73
-msgid "US"
-msgstr ""
-
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:96
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:101
 msgid "Work"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:100
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:105
 msgid "Work Mobile"
 msgstr ""
 

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2014-07-05 05:59:02 +0000
+++ po/pt_BR.po	2014-07-16 12:56:44 +0000
@@ -307,7 +307,7 @@
 #. the supported values can be found in: https://www.iso.org/obp/ui/#search
 #: src/imports/ContactEdit/TextInputDetail.qml:73
 msgid "US"
-msgstr ""
+msgstr "BR"
 
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
 #: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:96

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2014-07-04 23:10:37 +0000
+++ src/app/addressbookapp.cpp	2014-07-16 12:56:44 +0000
@@ -22,6 +22,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
+#include <QDesktopServices>
 #include <QStringList>
 #include <QQuickItem>
 #include <QQmlComponent>
@@ -30,6 +31,8 @@
 #include <QLibrary>
 #include <QIcon>
 #include <QSettings>
+#include <QTimer>
+
 
 #include <QQmlEngine>
 
@@ -39,11 +42,12 @@
 {
     qDebug() << "usage:"
              << arguments.at(0).toUtf8().constData()
-             << "[addressbook:///addphone?id=<contact-id>&phone=<phone-number>"
-             << "[addressbook:///contact?id=<contact-id>"
-             << "[addressbook:///create?phone=<phone-number>"
-             << "[addressbook:///pick?single=<true/false>"
-             << "[addressbook:///importvcard?url=<vcard-file>"
+             << "[addressbook:///addphone?id=<contact-id>&phone=<phone-number>]"
+             << "[addressbook:///addnewphone?phone=<phone-number>]"
+             << "[addressbook:///contact?id=<contact-id>]"
+             << "[addressbook:///create?phone=<phone-number>]"
+             << "[addressbook:///pick?single=<true/false>]"
+             << "[addressbook:///importvcard?url=<vcard-file>]"
              << "[--fullscreen]"
              << "[--help]"
              << "[-testability]";
@@ -266,6 +270,15 @@
     sendEvent(m_view, &keyReleaseEvent);
 }
 
+void AddressBookApp::exit()
+{
+    if (!m_callbackApplication.isEmpty()) {
+        QDesktopServices::openUrl(QUrl(QString("application:///%1").arg(m_callbackApplication)));
+    }
+    // quit after a delay to avoid problems with unity task manager.
+    QTimer::singleShot(1000, this, SLOT(quit()));
+}
+
 void AddressBookApp::parseUrl(const QString &arg)
 {
     QUrl url = QUrl::fromPercentEncoding(arg.toUtf8());
@@ -305,6 +318,11 @@
         args << "url";
         methodsMetaData.insert("importvcard", args);
         args.clear();
+
+        //addnewphone
+        args << "phone";
+        methodsMetaData.insert("addnewphone", args);
+        args.clear();
     }
 
     QUrlQuery query(url);
@@ -316,6 +334,8 @@
         QPair<QString, QString> item = queryItemsPair[i];
         queryItems.insert(item.first, item.second);
     }
+    // keep callback arg
+    setCallbackApplication(queryItems.take("callback"));
 
     if (methodsMetaData.contains(methodName)) {
         QStringList argsNames = methodsMetaData[methodName];
@@ -450,3 +470,16 @@
     }
     return false;
 }
+
+QString AddressBookApp::callbackApplication() const
+{
+    return m_callbackApplication;
+}
+
+void AddressBookApp::setCallbackApplication(const QString &application)
+{
+    if (m_callbackApplication != application) {
+        m_callbackApplication = application;
+        Q_EMIT callbackApplicationChanged();
+    }
+}

=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2014-06-11 21:25:08 +0000
+++ src/app/addressbookapp.h	2014-07-16 12:56:44 +0000
@@ -28,6 +28,7 @@
     Q_PROPERTY(bool firstRun READ isFirstRun CONSTANT)
     Q_PROPERTY(bool syncing READ isSyncing NOTIFY syncingChanged)
     Q_PROPERTY(bool syncEnabled READ syncEnabled NOTIFY syncEnabledChanged)
+    Q_PROPERTY(QString callbackApplication READ callbackApplication WRITE setCallbackApplication NOTIFY callbackApplicationChanged)
 
 public:
     AddressBookApp(int &argc, char **argv);
@@ -37,9 +38,13 @@
     bool isSyncing() const;
     bool syncEnabled() const;
 
+    QString callbackApplication() const;
+    void setCallbackApplication(const QString &application);
+
 Q_SIGNALS:
     void syncingChanged();
     void syncEnabledChanged();
+    void callbackApplicationChanged();
 
 public Q_SLOTS:
     void activateWindow();
@@ -50,6 +55,7 @@
     bool isFirstRun() const;
     void unsetFirstRun() const;
     void sendTabEvent() const;
+    void exit();
 
     // sync monitor
     void startSync() const;
@@ -62,6 +68,7 @@
     QQuickView *m_view;
     QDBusInterface *m_syncMonitor;
     QString m_initialArg;
+    QString m_callbackApplication;
     bool m_viewReady;
     bool m_pickingMode;
     bool m_testMode;

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2014-06-17 17:30:40 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-07-16 12:56:44 +0000
@@ -82,8 +82,8 @@
             // backend error will be handled by the root page (contact list)
             var newContact = (contact.model == null)
             contactEditor.model.saveContact(contact)
-            if (newContact) {
-                pageStack.contactCreated(contact)
+            if (newContact && pageStack.contactListPage) {
+                pageStack.contactListPage.moveListToContact(contact)
             }
         }
         pageStack.pop()

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2014-06-12 22:55:20 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2014-07-16 12:56:44 +0000
@@ -67,10 +67,7 @@
         id: field
 
         anchors.fill: parent
-
-        // TRANSLATORS: This value is used as default value for phone number format, when no coutry code is provided
-        // the supported values can be found in: https://www.iso.org/obp/ui/#search
-        defaultRegion: i18n.tr("US")
+        defaultRegion: PhoneUtils.defaultRegion
         autoFormat: false
 
         // Ubuntu.Keyboard

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-07-02 23:23:19 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-07-16 12:56:44 +0000
@@ -35,12 +35,28 @@
     property var onlineAccountsMessageDialog: null
     property QtObject contactIndex: null
     property bool contactsLoaded: false
+    property string newPhoneToAdd: ""
 
+    readonly property bool allowToQuit: (application.callbackApplication.length > 0)
     readonly property bool syncEnabled: application.syncEnabled
     readonly property var contactModel: contactList.listModel ? contactList.listModel : null
-    readonly property bool searching: (state === "searching")
-
-    function createEmptyContact(phoneNumber) {
+    readonly property bool searching: (state === "searching" || state === "newphoneSearching")
+
+    // this function is used to reset the contact list page to the default state if it was called
+    // from the uri. For example when called to add a new contact
+    function returnToNormalState()
+    {
+        // these two states are the only state that need to be reset
+        if (state == "newphoneSearching" || state == "newphone") {
+            pageStack.resetStack()
+            state = ""
+            newPhoneToAdd = ""
+            application.callbackApplication = ""
+        }
+    }
+
+    function createEmptyContact(phoneNumber)
+    {
         var details = [ {detail: "PhoneNumber", field: "number", value: phoneNumber},
                         {detail: "EmailAddress", field: "emailAddress", value: ""},
                         {detail: "Name", field: "firstName", value: ""}
@@ -63,16 +79,71 @@
         var newContact = mainPage.createEmptyContact(phoneNumber)
         //WORKAROUND: SKD changes the page header as soon as the page get created
         // setting active false will avoid that
-        mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                    {model: contactList.listModel,
-                                     contact: newContact,
-                                     active: false,
-                                     enabled: false,
-                                     initialFocusSection: "name"})
-
-    }
-
-    title: contactList.isInSelectionMode ? i18n.tr("Select Contacts") : i18n.tr("Contacts")
+        if (bottomEdgeEnabled) {
+            mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                                        {model: contactList.listModel,
+                                         contact: newContact,
+                                         active: false,
+                                         enabled: false,
+                                         initialFocusSection: "name"})
+        } else {
+            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                           {model: contactList.listModel,
+                            contact: newContact,
+                            initialFocusSection: "name"})
+        }
+    }
+
+    function showContact(contactId)
+    {
+        pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
+                       {model: contactList.listModel, contactId: contactId})
+    }
+
+    function addPhoneToContact(contactId, phoneNumber)
+    {
+        pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
+                       {model: contactList.listModel,
+                        contactId: contactId,
+                        addPhoneToContact: phoneNumber})
+    }
+
+    function importContact(urls)
+    {
+        if (urls.length > 0) {
+            var importDialog = Qt.createQmlObject("VCardImportDialog{}",
+                               mainPage,
+                               "VCardImportDialog")
+            if (importDialog) {
+                importDialog.importVCards(contactList.listModel, urls)
+            }
+        }
+    }
+
+    function startPickMode(isSingleSelection)
+    {
+        pickMode = true
+        pickMultipleContacts = !isSingleSelection
+        contactList.startSelection()
+    }
+
+    function moveListToContact(contact)
+    {
+        contactIndex = contact
+        mainPage.state = ""
+        // this means a new contact was created
+        if (mainPage.allowToQuit) {
+            application.exit()
+        }
+    }
+
+    function addNewPhone(phoneNumber)
+    {
+        newPhoneToAdd = phoneNumber
+        state = "newphone"
+    }
+
+    title: i18n.tr("Contacts")
 
     //bottom edge page
     bottomEdgePageComponent: ContactEditor {
@@ -124,13 +195,30 @@
         }
     }
 
+    Button {
+        id: addNewContactButton
+        objectName: "addNewContact"
+
+        text: i18n.tr("+ New Contact")
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            margins: visible ? units.gu(2) : 0
+        }
+        height: visible ? units.gu(4) : 0
+        visible: false
+        onClicked: mainPage.createContactWithPhoneNumber(mainPage.newPhoneToAdd)
+    }
+
     flickable: null //contactList.fastScrolling ? null : contactList.view
     ContactsUI.ContactListView {
         id: contactList
         objectName: "contactListView"
 
         anchors {
-            top: parent.top
+            top: addNewContactButton.bottom
+            topMargin: addNewContactButton.visible ? units.gu(2) : 0
             left: parent.left
             bottom: keyboard.top
             right: parent.right
@@ -139,7 +227,8 @@
         detailToPick: ContactDetail.PhoneNumber
         multiSelectionEnabled: true
         multipleSelection: !pickMode ||
-                           mainPage.pickMultipleContacts || (contactExporter.active && contactExporter.isMultiple)
+                           mainPage.pickMultipleContacts ||
+                           (contactExporter.active && contactExporter.isMultiple)
 
         leftSideAction: Action {
             iconName: "delete"
@@ -174,6 +263,9 @@
                 Qt.openUrlExternally("tel:///" + encodeURIComponent(detail.number))
             else if (action == "message")
                 Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
+            else if ((mainPage.state === "newphone") || (mainPage.state === "newphoneSearching")) {
+                mainPage.addPhoneToContact(contact.contactId, mainPage.newPhoneToAdd)
+            }
         }
 
         onSelectionDone: {
@@ -247,7 +339,7 @@
                 text: i18n.tr("Select All")
                 iconName: "filter"
                 onTriggered: {
-                    if (contactList.selectedItems.count == contactList.count) {
+                    if (contactList.selectedItems.count === contactList.count) {
                         contactList.clearSelection()
                     } else {
                         contactList.selectAll()
@@ -268,10 +360,26 @@
         }
     }
 
+    ToolbarButton {
+        id: quitButton
+
+        visible: false
+        action: Action {
+            objectName: "quitApp"
+
+            visible: mainPage.allowToQuit
+            iconName: "back"
+            text: i18n.tr("Quit")
+            onTriggered: application.exit()
+        }
+    }
+
     ToolbarItems {
         id: toolbarItemsNormalMode
 
         visible: false
+        back: mainPage.allowToQuit ? quitButton : null
+
         ToolbarButton {
             objectName: "Sync"
             action: Action {
@@ -289,7 +397,7 @@
                 visible: !mainPage.searching
                 iconName: "search"
                 onTriggered: {
-                    mainPage.state = "searching"
+                    mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
                     searchField.forceActiveFocus()
                 }
             }
@@ -306,9 +414,9 @@
                 objectName: "cancelSearch"
 
                 visible: mainPage.searching
-                iconName: "back"
+                iconName: "close"
                 text: i18n.tr("Cancel")
-                onTriggered: mainPage.state = ""
+                onTriggered: mainPage.state = (mainPage.state === "newphoneSearching" ? "newphone" : "")
             }
         }
     }
@@ -329,13 +437,57 @@
         onTextChanged: contactList.currentIndex = -1
         inputMethodHints: Qt.ImhNoPredictiveText
     }
-
     states: [
         State {
             name: ""
             PropertyChanges {
                 target: searchField
                 text: ""
+                newPhoneToAdd: ""
+            }
+        },
+        State {
+            name: "newphone"
+            PropertyChanges {
+                target: searchField
+                text: ""
+            }
+            PropertyChanges {
+                target: addNewContactButton
+                visible: true
+            }
+            PropertyChanges {
+                target: mainPage
+                bottomEdgeEnabled: false
+                title: i18n.tr("Add contact")
+            }
+            PropertyChanges {
+                target: contactList
+                detailToPick: -1
+            }
+        },
+        State {
+            name: "newphoneSearching"
+            PropertyChanges {
+                target: addNewContactButton
+                visible: true
+            }
+            PropertyChanges {
+                target: mainPage
+                bottomEdgeEnabled: false
+            }
+            PropertyChanges {
+                target: contactList
+                detailToPick: -1
+            }
+            PropertyChanges {
+                target: mainPage
+                __customHeaderContents: searchField
+                tools: toolbarItemsSearch
+            }
+            PropertyChanges {
+                target: contactList
+                showFavourites: false
             }
         },
         State {
@@ -356,10 +508,11 @@
             PropertyChanges {
                 target: mainPage
                 tools: toolbarItemsSelectionMode
+                bottomEdgeEnabled: false
+                title: i18n.tr("Select Contacts")
             }
         }
     ]
-
     tools: toolbarItemsNormalMode
 
     // WORKAROUND: Avoid the gap btw the header and the contact list when the list moves
@@ -392,35 +545,6 @@
                                     initialFocusSection: "name"})
     }
 
-    Connections {
-        target: pageStack
-        onCreateContactRequested: mainPage.createContactWithPhoneNumber(phoneNumber)
-        onContactRequested: {
-            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                           {model: contactList.listModel, contactId: contactId})
-        }
-        onEditContatRequested: {
-            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                           {model: contactList.listModel,
-                            contactId: contactId,
-                            addPhoneToContact: phoneNumber})
-        }
-        onContactCreated: {
-            mainPage.contactIndex = contact
-        }
-
-        onImportContactRequested: {
-            if (urls.length > 0) {
-                var importDialog = Qt.createQmlObject("VCardImportDialog{}",
-                                   mainPage,
-                                   "VCardImportDialog")
-                if (importDialog) {
-                    importDialog.importVCards(contactList.listModel, urls)
-                }
-            }
-        }
-    }
-
     KeyboardRectangle {
         id: keyboard
     }
@@ -435,7 +559,6 @@
         }
     }
 
-
     QtObject {
         id: contactExporter
 
@@ -470,25 +593,22 @@
     }
 
     Component.onCompleted: {
-        if (pickMode) {
-            contactList.startSelection()
-        } else if ((contactList.count === 0) &&
+        if ((contactList.count === 0) &&
                    application.firstRun &&
                    !mainPage.syncEnabled) {
             mainPage.onlineAccountsMessageDialog = PopupUtils.open(onlineAccountsDialog, null)
         }
 
-        if (TEST_DATA != "") {
+        if (TEST_DATA !== "") {
             contactList.listModel.importContacts("file://" + TEST_DATA)
         }
 
-        if (!pickMode) {
-            mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                       {model: contactList.listModel,
-                                        contact: mainPage.createEmptyContact(""),
-                                        active: false,
-                                        enabled: false,
-                                        initialFocusSection: "name"})
-        }
+        mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                                   {model: contactList.listModel,
+                                    contact: mainPage.createEmptyContact(""),
+                                    active: false,
+                                    enabled: false,
+                                    initialFocusSection: "name"})
+        pageStack.contactListPage = mainPage
     }
 }

=== modified file 'src/imports/ContactView/ContactDetailAvatarView.qml'
--- src/imports/ContactView/ContactDetailAvatarView.qml	2014-07-08 14:20:01 +0000
+++ src/imports/ContactView/ContactDetailAvatarView.qml	2014-07-16 12:56:44 +0000
@@ -28,7 +28,8 @@
     implicitWidth: units.gu(10)
 
     Connections {
-        target: root.contact.avatar
+        target: root.contact ? root.contact.detail(ContactDetail.Avatar) : null
+        ignoreUnknownSignals: true
         onDetailChanged: avatar.reload()
     }
 

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-06-26 15:46:45 +0000
+++ src/imports/MainWindow.qml	2014-07-16 12:56:44 +0000
@@ -24,6 +24,7 @@
     id: mainWindow
 
     property string modelErrorMessage: ""
+    readonly property bool appActive: Qt.application.active
 
     width: units.gu(40)
     height: units.gu(71)
@@ -32,54 +33,67 @@
 
     signal applicationReady()
 
-    function contact(contactId) {
-        mainStack.contactRequested(contactId)
-    }
-
-    function create(phoneNumber) {
-        mainStack.createContactRequested(phoneNumber)
-    }
-
-    function addphone(contactId, phoneNumber) {
-        mainStack.newPhoneNumber = phoneNumber
-        mainStack.editContatRequested(contactId, phoneNumber)
-    }
-
-    function pick(single) {
-        var isSingle = (single == "true")
-        mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"), { pickMode: true, pickMultipleContacts: !isSingle})
-    }
-
-    function importvcard(_url) {
-        mainStack.importContactRequested([_url])
+    function contact(contactId)
+    {
+        mainStack.resetStack()
+        if (mainStack.contactListPage) {
+            mainStack.contactListPage.showContact(contactId)
+        }
+    }
+
+    function create(phoneNumber)
+    {
+        mainStack.resetStack()
+        if (mainStack.contactListPage) {
+            mainStack.contactListPage.createContactWithPhoneNumber(phoneNumber)
+        }
+    }
+
+    function addphone(contactId, phoneNumber)
+    {
+        mainStack.resetStack()
+        if (mainStack.contactListPage) {
+            mainStack.contactListPage.addPhoneToContact(contactId, phoneNumber)
+        }
+    }
+
+    function pick(single)
+    {
+        mainStack.resetStack()
+        if (mainStack.contactListPage) {
+            mainStack.contactListPage.startPickMode(single == "true")
+        }
+    }
+
+    function importvcard(_url)
+    {
+        mainStack.resetStack()
+        if (mainStack.contactListPage) {
+            mainStack.contactListPage.importContactRequested([_url])
+        }
+    }
+
+    function addnewphone(phoneNumer)
+    {
+        mainStack.resetStack()
+        if (mainStack.contactListPage) {
+            mainStack.contactListPage.addNewPhone(phoneNumer)
+        }
     }
 
     PageStack {
         id: mainStack
 
-        property string newPhoneNumber: ""
-
-        signal contactRequested(string contactId)
-        signal createContactRequested(string phoneNumber)
-        signal editContatRequested(string contactId, string phoneNumber)
-        signal contactCreated(QtObject contact)
-        signal contactModelError(string errorMessage)
-        signal importContactRequested(var urls)
-
-        anchors {
-            fill: parent
-            Behavior on bottomMargin {
-                NumberAnimation {
-                    duration: 175
-                    easing.type: Easing.OutQuad
-                }
+        property var contactListPage: null
+
+        function resetStack()
+        {
+            while(depth > 1) {
+                pop()
             }
-       }
+        }
 
-       onContactModelError: {
-           modelErrorMessage = errorMessage
-           PopupUtils.open(errorDialog, null)
-       }
+        anchors.fill: parent
     }
 
     Component.onCompleted: {
@@ -133,4 +147,12 @@
             }
         }
     }
+
+
+    // If application was called from uri handler and lost the focus reset the app to normal state
+    onAppActiveChanged: {
+        if (!appActive && mainStack.contactListPage) {
+            mainStack.contactListPage.returnToNormalState()
+        }
+    }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-07-09 15:30:13 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-07-16 12:56:44 +0000
@@ -138,13 +138,16 @@
         id: pickerLoader
 
         source: {
+            if (!root.detailsShown) {
+                return "";
+            }
+
             switch(root.detailToPick) {
             case ContactDetail.PhoneNumber:
             default:
                 return Qt.resolvedUrl("ContactDetailPickerPhoneNumberDelegate.qml")
             }
         }
-        active: contact && root.detailsShown
         asynchronous: true
         anchors {
             top: delegate.bottom
@@ -158,11 +161,21 @@
         }
 
         onStatusChanged: {
-            if ((status == Loader.Ready) && contact) {
+            if (status == Loader.Ready) {
                 pickerLoader.item.updateDetails(contact)
                 pickerLoader.item.detailClicked.connect(root._onDetailClicked)
             }
         }
+
+        // update delegate if contact update
+        Connections {
+            target: contact
+            onContactChanged: {
+                if (pickerLoader.item) {
+                    pickerLoader.item.updateDetails(contact)
+                }
+            }
+        }
     }
 
     Behavior on height {

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2014-07-07 22:20:38 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2014-07-16 12:56:44 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.2
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components 0.1
+import QtContacts 5.0 as QtContacts
 
 Item {
     id: root
@@ -31,7 +32,9 @@
 
     function updateDetails(contact)
     {
-        phoneNumberEntries.model = contact.phoneNumbers
+        if (contact) {
+            phoneNumberEntries.model = contact.details(QtContacts.ContactDetail.PhoneNumber)
+        }
     }
 
     height: detailItems.height + units.gu(2)
@@ -56,7 +59,6 @@
         Repeater {
             id: phoneNumberEntries
 
-            model: contact.phoneNumbers
             ListItem.Subtitled {
                 anchors {
                     left: parent.left
@@ -66,7 +68,7 @@
                 showDivider: false
                 // TODO: change text font color to UbuntuColors.lightAubergine
                 // see bug #1324128
-                text: number
+                text: modelData.number
                 subText: phoneTypeModel.get(phoneTypeModel.getTypeIndex(modelData)).label
                 onClicked: root.detailClicked(modelData, "")
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-09 22:24:55 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-16 12:56:44 +0000
@@ -401,6 +401,7 @@
                 var areaY = view.contentY
                 if (itemY < areaY) {
                     view.contentY = itemY
+                    view.returnToBounds()
                 }
             }
 
@@ -411,16 +412,22 @@
             height: visible ? childrenRect.height : 0
             visible: view.favouritesIsSelected && (callerRepeat.count > 0)
             onHeightChanged: {
-                // make selected item fully visible
                 if (calledModel.currentIndex != -1) {
                     mostCalledView.makeItemVisible(callerRepeat.itemAt(calledModel.currentIndex))
-                } else {
-                    // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
-                    // this should fix the Y position (630 is the header height)
-                    view.contentY = -630
                 }
             }
 
+            // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
+            // calling the positionViewAtBeginning after the list created fix that
+            Timer {
+                id: moveToBegining
+
+                interval: 100
+                running: false
+                repeat: false
+                onTriggered: view.positionViewAtBeginning()
+            }
+
             Rectangle {
                 color: Theme.palette.normal.background
                 anchors {
@@ -453,6 +460,7 @@
 
                     onVisibleChanged: {
                         // update the model every time that it became visible
+                        // in fact calling update only reloads the model data if it has changed
                         if (visible) {
                             model.update()
                         }
@@ -465,6 +473,10 @@
                             view.currentIndex = -1
                         }
                     }
+
+                    // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
+                    // calling the positionViewAtBeginning after the list created fix that
+                    onLoaded: moveToBegining.restart()
                 }
             }
 
@@ -624,8 +636,8 @@
         id: fastScroll
 
         listView: view
-        // only enable FastScroll if the we have more than 2 pages of content
-        enabled: view.contentHeight > (view.height * 2)
+        // only enable FastScroll if the we have more than 2 pages of content and sections is enabled
+        enabled: showSections && (view.contentHeight > (view.height * 2))
 
         anchors {
             top: view.top

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-07-09 15:30:13 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-07-16 12:56:44 +0000
@@ -134,7 +134,7 @@
 
       This property holds the detail type to be picked
     */
-    property int detailToPick: 0
+    property int detailToPick: -1
     /*!
       \qmlproperty bool showSections
 
@@ -358,10 +358,10 @@
                 contactListView.currentIndex = -1
                 return
             // check if we should expand and display the details picker
-            } else if (detailToPick !== 0) {
+            } else if (detailToPick !== -1) {
                 contactListView.currentIndex = index
                 return
-            } else if (detailToPick == 0) {
+            } else if (detailToPick == -1) {
                 contactListView.detailClicked(contact, null, "")
             }
         }

=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-07-05 01:00:05 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-07-16 12:56:44 +0000
@@ -31,6 +31,8 @@
     default property alias contents: main.children
 
     readonly property double actionWidth: units.gu(5)
+    readonly property double leftActionWidth: units.gu(10)
+    readonly property double actionThreshold: actionWidth * 0.4
     readonly property double threshold: 0.4
     readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
     readonly property alias swipping: mainItemMoving.running
@@ -40,27 +42,20 @@
 
     function returnToBoundsRTL()
     {
+        var actionFullWidth = actionWidth + units.gu(2)
         var xOffset = Math.abs(main.x)
-        var actionFullWidth = actionWidth + units.gu(1)
+        var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
 
-        if (xOffset < actionFullWidth) {
+        if (index < 1) {
             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
+            main.x = -(actionFullWidth * index)
         }
     }
 
     function returnToBoundsLTR()
     {
-        var finalX = leftActionView.width
+        var finalX = leftActionWidth
         if (main.x > (finalX * root.threshold))
             main.x = finalX
         else
@@ -99,16 +94,14 @@
 
     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
-                }
+        if (main.x <= -root.actionWidth) {
+            var actionFullWidth = actionWidth + units.gu(2)
+            var xOffset = Math.abs(main.x)
+            var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+            index = index - 1
+            if (index > -1) {
+                root.activeItem = rightActionsRepeater.itemAt(index)
+                root.activeAction = root.rightSideActions[index]
             }
         } else {
             root.activeAction = null
@@ -129,14 +122,17 @@
         anchors {
             top: parent.top
             bottom: parent.bottom
-            left: parent.left
+            right: main.left
         }
-        width: height
+        width: root.leftActionWidth + actionThreshold
         visible: leftSideAction
         color: "red"
 
         Icon {
-            anchors.centerIn: parent
+            anchors {
+                centerIn: parent
+                horizontalCenterOffset: actionThreshold / 2
+            }
             name: leftSideAction ? leftSideAction.iconName : ""
             color: Theme.palette.selected.field
             height: units.gu(3)
@@ -149,13 +145,14 @@
 
        anchors {
            top: main.top
-           right: parent.right
+           left: main.right
+           leftMargin: units.gu(1)
            bottom: main.bottom
        }
-       width: rightActionsRepeater.count * (root.actionWidth + units.gu(1))
+       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + actionThreshold : 0
        Row {
            anchors.fill: parent
-           spacing: units.gu(1)
+           spacing: units.gu(2)
            Repeater {
                id: rightActionsRepeater
 
@@ -227,11 +224,6 @@
                 easing {type: Easing.InOutBack; }
             }
         }
-        ScriptAction {
-            script: {
-                root.activeAction.triggered(root)
-            }
-        }
         PropertyAction {
             target: triggerAction.currentItem
             properties: "width, height"
@@ -249,6 +241,11 @@
             easing.type: Easing.OutElastic
             duration: UbuntuAnimation.SlowDuration
         }
+        ScriptAction {
+            script: {
+                root.activeAction.triggered(root)
+            }
+        }
     }
 
     MouseArea {

=== modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
--- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-07-03 19:35:30 +0000
+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-07-16 12:56:44 +0000
@@ -25,14 +25,18 @@
 
     property var contactModel: null
     property int currentIndex: -1
+    property alias callAverage: mostCalledModel.callAverage
 
     signal clicked(int index, QtObject contact)
     signal detailClicked(QtObject contact, QtObject detail, string action)
     signal infoRequested(int index, QtObject contact)
     signal addContactClicked(string label)
+    signal loaded()
 
 
     model: MostCalledContactsModel {
+        id: mostCalledModel
+
         startInterval: new Date((new Date().getTime() - 2592000000)) // one month ago
         sourceModel: HistoryEventModel {
             type: HistoryThreadModel.EventTypeVoice
@@ -46,6 +50,7 @@
                 matchFlags: HistoryFilter.MatchCaseSensitive
             }
         }
+        onLoaded: root.loaded()
     }
 
     delegate: ContactDelegate {
@@ -79,12 +84,10 @@
         onClicked: {
             if (root.currentIndex === index) {
                 root.currentIndex = -1
-                return
-            } else if (detailToPick !== 0) {
+            } else if (detailToPick !== -1) {
                 root.currentIndex = index
-                return
-            } else if (detailToPick == 0) {
-                contactListView.detailClicked(contact, null, "")
+            } else if (detailToPick === -1) {
+                detailClicked(contact, null, "")
             }
         }
 

=== modified file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp'
--- src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	2014-07-02 01:43:06 +0000
+++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	2014-07-16 12:56:44 +0000
@@ -272,8 +272,7 @@
         qSort(data.begin(), data.end(), mostCalledContactsModelDataLessThan);
 
         // average
-        m_average = totalCalls / contactsData.size();
-
+        m_average = qRound(((qreal) (totalCalls)) / contactsData.size());
         Q_FOREACH(const MostCalledContactsModelData &d, data) {
             if (d.callCount >= m_average) {
                 m_data << d;
@@ -286,6 +285,8 @@
 
     Q_EMIT endResetModel();
     m_reloadingModel = false;
+    Q_EMIT callAverageChanged(m_average);
+    Q_EMIT loaded();
 }
 
 void MostCalledContactsModel::markAsOutdated()

=== modified file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.h'
--- src/imports/Ubuntu/Contacts/mostcalledproxymodel.h	2014-07-02 01:43:06 +0000
+++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.h	2014-07-16 12:56:44 +0000
@@ -73,6 +73,7 @@
     void startIntervalChanged(const QDateTime &value);
     void sourceModelChanged(QAbstractItemModel *value);
     void outdatedChange(bool value);
+    void loaded();
 
 private Q_SLOTS:
     void markAsOutdated();