Merge lp:~renatofilho/address-book-app/release-2014-08-14 into lp:address-book-app

[Renato Araujo Oliveira Filho]

- [Contacts] Created ContactPreviewPage component and extend it to be used by other apps.
- [Contacts] Created VCardParser component.
- [ContactListPage] Fixed contact share on multiselection mode.
- [ListItemWithActions] Filter only visible right side actions.
- [ContactEditorPage] Used ContentPeerPicker to pick a contact avatar.
- [ContactEditorPage] Update "add field" "delete" buttons color.
- [FastScroll] Avoid make the letter empty when scrolling over it, this was causing problems on fast scroll.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/665/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/118
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3574/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2807/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3467/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4821
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4821/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11513
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2275/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3087
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3087/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/666/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4831
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3098
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3098/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[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 UI labels, did you update the pot file? YES

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

[lp:~renatofilho/address-book-app/release-2014-08-14]

244. By Renato Araujo Oliveira Filho on 2014-08-14

Removed code used by debug.

245. By Renato Araujo Oliveira Filho on 2014-08-15

Fixed ContactListPage state change from "selection" to "default".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/667/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4875
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3121
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3121/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot	2014-07-16 12:56:19 +0000
+++ po/address-book-app.pot	2014-08-15 21:50:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: address-book-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-16 09:55-0300\n"
+"POT-Creation-Date: 2014-08-13 09:13-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,25 +22,30 @@
 msgid "%1 vCards imported"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:202
-msgid "+ New Contact"
+#. TRANSLATORS: this refers to creating a new contact
+#: src/imports/ContactList/ContactListPage.qml:240
+msgid "+ Create New"
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:322
 msgid "Add Field"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:462
+#: src/imports/ContactList/ContactListPage.qml:527
 msgid "Add contact"
 msgstr ""
 
+#: src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml:82
+msgid "Add number..."
+msgstr ""
+
 #: src/imports/ContactEdit/AddFieldDialog.qml:59
 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:23
 #: src/imports/ContactView/ContactDetailAddressesView.qml:24
 msgid "Address"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml:77
+#: src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml:76
 #: src/imports/ContactView/ContactDetailSyncTargetView.qml:48
 msgid "Addressbook"
 msgstr ""
@@ -49,7 +54,8 @@
 msgid "Aim"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactListView.qml:316
+#. TRANSLATORS: this refers to all contacts
+#: src/imports/ContactList/ContactListPage.qml:410
 msgid "All"
 msgstr ""
 
@@ -62,13 +68,14 @@
 msgstr ""
 
 #: src/imports/ContactEdit/AddFieldDialog.qml:133
-#: src/imports/ContactEdit/ContactEditor.qml:372
-#: src/imports/ContactList/ContactListPage.qml:418
+#: src/imports/ContactEdit/ContactEditor.qml:373
+#: src/imports/ContactList/ContactListPage.qml:423
+#: src/imports/MainWindow.qml:133
 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
 msgid "Cancel"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:330
+#: src/imports/ContactList/ContactListPage.qml:447
 msgid "Cancel selection"
 msgstr ""
 
@@ -89,8 +96,8 @@
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:337
-#: src/imports/ContactList/ContactListPage.qml:235
-#: src/imports/ContactList/ContactListPage.qml:355
+#: src/imports/ContactList/ContactListPage.qml:267
+#: src/imports/ContactList/ContactListPage.qml:487
 msgid "Delete"
 msgstr ""
 
@@ -123,7 +130,7 @@
 msgstr ""
 
 #: src/imports/ContactView/ContactFetchError.qml:25
-#: src/imports/MainWindow.qml:112
+#: src/imports/MainWindow.qml:129
 msgid "Error"
 msgstr ""
 
@@ -131,20 +138,20 @@
 msgid "Favorite"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactListView.qml:348
-msgid "Favourites"
+#: src/imports/ContactList/ContactListPage.qml:410
+msgid "Favorites"
 msgstr ""
 
 #: src/imports/ContactEdit/ContactDetailNameEditor.qml:83
 msgid "First name"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactListView.qml:442
+#: src/imports/Ubuntu/Contacts/ContactListView.qml:430
 msgid "Frequently called"
 msgstr ""
 
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:116
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:99
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:103
 msgid "Home"
 msgstr ""
 
@@ -172,11 +179,7 @@
 msgid "Last name"
 msgstr ""
 
-#: src/imports/ContactEdit/AvatarImport.qml:71
-msgid "Loading"
-msgstr ""
-
-#: src/imports/ContactList/ContactListPage.qml:320
+#: src/imports/ContactList/ContactListPage.qml:338
 msgid "Loading..."
 msgstr ""
 
@@ -188,7 +191,7 @@
 msgid "MSN"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:103
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:107
 msgid "Mobile"
 msgstr ""
 
@@ -214,7 +217,7 @@
 msgstr ""
 
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:118
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:107
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:111
 msgid "Other"
 msgstr ""
 
@@ -229,15 +232,12 @@
 msgstr ""
 
 #: src/imports/ContactEdit/AddFieldDialog.qml:63
-msgid "Professional Details"
-msgstr ""
-
 #: src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml:23
 #: src/imports/ContactView/ContactDetailOrganizationsView.qml:27
-msgid "Professional details"
+msgid "Professional Details"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:372
+#: src/imports/ContactList/ContactListPage.qml:382
 msgid "Quit"
 msgstr ""
 
@@ -249,30 +249,27 @@
 msgid "Role"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactEditor.qml:385
+#: src/imports/ContactEdit/ContactEditor.qml:386
 msgid "Save"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:396
+#: src/imports/ContactList/ContactListPage.qml:397
 msgid "Search"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:355
-msgid "Select"
+#: src/imports/ContactList/ContactListPage.qml:353
+msgid "Search..."
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:339
+#: src/imports/ContactList/ContactListPage.qml:453
 msgid "Select All"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:512
-msgid "Select Contacts"
-msgstr ""
-
 #: src/imports/ContactEdit/AddFieldDialog.qml:116
 msgid "Select a field"
 msgstr ""
 
+#: src/imports/ContactList/ContactListPage.qml:466
 #: src/imports/ContactView/ContactView.qml:206
 msgid "Share"
 msgstr ""
@@ -290,15 +287,15 @@
 msgid "Street"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:387
+#: src/imports/ContactList/ContactListPage.qml:391
 msgid "Sync"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:387
+#: src/imports/ContactList/ContactListPage.qml:391
 msgid "Syncing"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:320
+#: src/imports/ContactList/ContactListPage.qml:338
 msgid "Syncing..."
 msgstr ""
 
@@ -311,11 +308,11 @@
 msgstr ""
 
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:101
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:105
 msgid "Work"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:105
+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:109
 msgid "Work Mobile"
 msgstr ""
 
 
=== modified file 'src/imports/Common/CMakeLists.txt'
--- src/imports/Common/CMakeLists.txt	2014-06-05 16:46:28 +0000
+++ src/imports/Common/CMakeLists.txt	2014-08-15 21:50:36 +0000
@@ -1,8 +1,5 @@
 set(CONTACT_COMMON_QMLS
-    ContactDetailBase.qml
     ContactDetailItem.qml
-    ContactDetailGroupBase.qml
-    ContactDetailGroupWithTypeBase.qml
     KeyboardRectangle.qml
     RemoveContactsDialog.qml
     StandardAnimation.qml
 
=== modified file 'src/imports/Common/ContactDetailItem.qml'
--- src/imports/Common/ContactDetailItem.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Common/ContactDetailItem.qml	2014-08-15 21:50:36 +0000
@@ -15,8 +15,9 @@
  */
 
 import QtQuick 2.2
+
 import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Contacts 0.1
 
 ContactDetailBase {
     id: root
 
=== modified file 'src/imports/Common/RemoveContactsDialog.qml'
--- src/imports/Common/RemoveContactsDialog.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Common/RemoveContactsDialog.qml	2014-08-15 21:50:36 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components.Popups 1.0
 
-Popups.Dialog {
+Dialog {
     objectName: "removeContactsDialog"
 
     property var contacts: []
 
=== modified file 'src/imports/ContactEdit/AddFieldDialog.qml'
--- src/imports/ContactEdit/AddFieldDialog.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactEdit/AddFieldDialog.qml	2014-08-15 21:50:36 +0000
@@ -15,9 +15,10 @@
  */
 
 import QtQuick 2.2
+import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import QtContacts 5.0
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components.Popups 1.0
 
 
 Item {
@@ -109,7 +110,7 @@
     Component {
         id: addFieldDialog
 
-        Popups.Dialog {
+        Dialog {
             id: dialogue
             objectName: "addFieldDialog"
 
 
=== modified file 'src/imports/ContactEdit/AvatarImport.qml'
--- src/imports/ContactEdit/AvatarImport.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactEdit/AvatarImport.qml	2014-08-15 21:50:36 +0000
@@ -15,64 +15,106 @@
  */
 
 import QtQuick 2.2
+
 import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
-import Ubuntu.Content 0.1 as ContentHub
+import Ubuntu.Components.Popups 1.0
+import Ubuntu.Content 0.1
 
 Item {
     id: root
 
-    property var activeTransfer: null
-    property var loadingDialog: null
+    property var importDialog: null
 
     signal avatarReceived(string avatarUrl)
 
     function requestNewAvatar()
     {
-        if (!root.loadingDialog) {
-            root.loadingDialog = PopupUtils.open(loadingDialog, null)
-            root.activeTransfer = defaultSource.request();
-        }
-    }
-
-    ContentHub.ContentPeer {
-        id: defaultSource
-
-        contentType: ContentHub.ContentType.Pictures
-        handler: ContentHub.ContentHandler.Source
-        selectionType: ContentHub.ContentTransfer.Single
-    }
-
-    Connections {
-        target: root.activeTransfer
-        onStateChanged: {
-            var done = ((root.activeTransfer.state === ContentHub.ContentTransfer.Charged) ||
-                        (root.activeTransfer.state === ContentHub.ContentTransfer.Aborted));
-
-            if (root.activeTransfer.state === ContentHub.ContentTransfer.Charged) {
-                if (root.activeTransfer.items.length > 0) {
-                    root.avatarReceived(root.activeTransfer.items[0].url)
-                }
-            }
-
-            if (done) {
-                PopupUtils.close(root.loadingDialog)
-                root.loadingDialog = null
-            }
+        if (!root.importDialog) {
+            root.importDialog = PopupUtils.open(contentHubDialog, null)
+        } else {
+            console.warn("Import dialog already running")
         }
     }
 
     Component {
-        id: loadingDialog
+        id: contentHubDialog
 
-        Popups.Dialog {
+        PopupBase {
             id: dialogue
 
-            title: i18n.tr("Loading")
-            ActivityIndicator {
-                running: true
-                visible: running
-            }
+            property alias activeTransfer: signalConnections.target
+
+            parent: QuickUtils.rootItem(this)
+            focus: true
+
+            Rectangle {
+                anchors.fill: parent
+
+                ContentTransferHint {
+                    anchors.fill: parent
+                    activeTransfer: dialogue.activeTransfer
+                }
+
+                ContentPeerPicker {
+                    id: peerPicker
+
+                    anchors.fill: parent
+                    visible: dialogue.done
+                    contentType: ContentType.Pictures
+                    handler: ContentHandler.Source
+
+                    onPeerSelected: {
+                        peer.selectionType = ContentTransfer.Single
+                        dialogue.activeTransfer = peer.request()
+                    }
+
+                    onCancelPressed: {
+                        PopupUtils.close(root.importDialog)
+                    }
+                }
+            }
+
+            Connections {
+                id: signalConnections
+
+                target: dialogue.activeTransfer
+                onStateChanged: {
+                    var done = ((dialogue.activeTransfer.state === ContentTransfer.Charged) ||
+                                (dialogue.activeTransfer.state === ContentTransfer.Aborted))
+
+                    if (dialogue.activeTransfer.state === ContentTransfer.Charged) {
+                        dialogue.hide()
+                        if (dialogue.activeTransfer.items.length > 0) {
+                            root.avatarReceived(dialogue.activeTransfer.items[0].url)
+                        }
+                    }
+
+                    if (done) {
+                        acceptTimer.restart()
+                    }
+                }
+            }
+
+            // WORKAROUND: Work around for application becoming insensitive to touch events
+            // if the dialog is dismissed while the application is inactive.
+            // Just listening for changes to Qt.application.active doesn't appear
+            // to be enough to resolve this, so it seems that something else needs
+            // to be happening first. As such there's a potential for a race
+            // condition here, although as yet no problem has been encountered.
+            Timer {
+                id: acceptTimer
+
+                interval: 100
+                repeat: true
+                running: false
+                onTriggered: {
+                   if(Qt.application.active) {
+                       PopupUtils.close(root.importDialog)
+                   }
+                }
+            }
+
+            Component.onDestruction: root.importDialog = null
         }
     }
 }
 
=== modified file 'src/imports/ContactEdit/ContactDetailAddressesEditor.qml'
--- src/imports/ContactEdit/ContactDetailAddressesEditor.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactEdit/ContactDetailAddressesEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,19 +15,19 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0 as QtContacts
+import QtContacts 5.0
 
-import "../Common"
+import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeEditor {
     title: i18n.tr("Address")
     detailQmlTypeName: "Address"
-    detailType: QtContacts.ContactDetail.Address
-    fields: [ QtContacts.Address.Street,
-        QtContacts.Address.Locality,
-        QtContacts.Address.Region,
-        QtContacts.Address.Postcode,
-        QtContacts.Address.Country ]
+    detailType: ContactDetail.Address
+    fields: [ Address.Street,
+        Address.Locality,
+        Address.Region,
+        Address.Postcode,
+        Address.Country ]
     placeholderTexts: [ i18n.tr("Street"),
                         i18n.tr("Locality"),
                         i18n.tr("Region"),
 
=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-07-28 23:12:24 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,10 +15,10 @@
  */
 
 import QtQuick 2.2
+import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import QtContacts 5.0
-
-import "../Common"
+import Ubuntu.Contacts 0.1
 
 ContactDetailBase {
     id: root
@@ -89,6 +89,12 @@
         }
     }
 
+    ActivityIndicator {
+        anchors.centerIn: avatar
+        running: (avatarImport.importDialog != null)
+        visible: running
+    }
+
     AvatarImport {
         id: avatarImport
 
 
=== modified file 'src/imports/ContactEdit/ContactDetailEmailsEditor.qml'
--- src/imports/ContactEdit/ContactDetailEmailsEditor.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactEdit/ContactDetailEmailsEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,14 +15,15 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0 as QtContacts
-
-import "../Common"
+import QtContacts 5.0
+
+import Ubuntu.Contacts 0.1
+
 
 ContactDetailGroupWithTypeEditor {
     title: i18n.tr("Email")
     detailQmlTypeName: "EmailAddress"
-    detailType: QtContacts.ContactDetail.Email
+    detailType: ContactDetail.Email
     fields: [ 0 ]
     placeholderTexts: [ i18n.tr("Enter an email address") ]
     inputMethodHints: Qt.ImhEmailCharactersOnly
 
=== modified file 'src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,18 +15,18 @@
  */
 
 import QtQuick 2.2
+import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import QtContacts 5.0 as QtContacts
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-import "../Common"
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeBase {
     id: root
 
     property string detailQmlTypeName
     property int currentItem: -1
-    property int fieldType: QtContacts.ContactDetail.FieldContext
+    property int fieldType: ContactDetail.FieldContext
     property variant placeholderTexts: []
     property int inputMethodHints: Qt.ImhNone
     property variant newDetails: []
@@ -96,7 +96,7 @@
         return changed
     }
 
-    headerDelegate: ListItem.Empty {
+    headerDelegate: Empty {
         id: header
         highlightWhenPressed: false
 
 
=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,8 +15,9 @@
  */
 
 import QtQuick 2.2
+import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import QtContacts 5.0 as QtContacts
 
 import "../Common"
 
@@ -53,11 +54,11 @@
 
     spacing: units.gu(1)
     detail: root.contact ? root.contact.name : null
-    fields: [ QtContacts.Name.FirstName, QtContacts.Name.LastName ]
+    fields: [ Name.FirstName, Name.LastName ]
 
     fieldDelegate: TextInputDetail {
         id: textInputDetail
-        objectName: detailToString(QtContacts.ContactDetail.Name, field)
+        objectName: detailToString(ContactDetail.Name, field)
 
         function checkIsEmpty() {
             if (field == -1) {
@@ -80,7 +81,7 @@
         x: units.gu(2)
         detail: root.detail
         height: units.gu(4)
-        placeholderText: field == QtContacts.Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")
+        placeholderText: field == Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")
         inputMethodHints: Qt.ImhNoPredictiveText
         onTextChanged: checkIsEmpty()
         onFieldChanged: checkIsEmpty()
 
=== modified file 'src/imports/ContactEdit/ContactDetailOnlineAccountsEditor.qml'
--- src/imports/ContactEdit/ContactDetailOnlineAccountsEditor.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactEdit/ContactDetailOnlineAccountsEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,16 +15,15 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0 as QtContacts
+import QtContacts 5.0
+
 import Ubuntu.Contacts 0.1
 
-import "../Common"
-
 ContactDetailGroupWithTypeEditor {
     title: i18n.tr("IM")
-    detailType: QtContacts.ContactDetail.OnlineAccount
+    detailType: ContactDetail.OnlineAccount
     detailQmlTypeName: "OnlineAccount"
-    fields: [ QtContacts.OnlineAccount.AccountUri ]
+    fields: [ OnlineAccount.AccountUri ]
     placeholderTexts: [ i18n.tr("Enter a social alias") ]
     typeModel: ContactDetailOnlineAccountTypeModel { }
     inputMethodHints: Qt.ImhEmailCharactersOnly
 
=== modified file 'src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml'
--- src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,18 +15,16 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0 as QtContacts
-
-import "../Common"
+import QtContacts 5.0
 
 ContactDetailGroupWithTypeEditor {
-    title: i18n.tr("Professional details")
+    title: i18n.tr("Professional Details")
     typeModel: null
     detailQmlTypeName: "Organization"
-    detailType: QtContacts.ContactDetail.Organization
-    fields: [ QtContacts.Organization.Name,
-              QtContacts.Organization.Role,
-              QtContacts.Organization.Title ]
+    detailType: ContactDetail.Organization
+    fields: [ Organization.Name,
+              Organization.Role,
+              Organization.Title ]
     placeholderTexts: [ i18n.tr("Organization"),
                         i18n.tr("Role"),
                         i18n.tr("Title")
 
=== modified file 'src/imports/ContactEdit/ContactDetailPhoneNumbersEditor.qml'
--- src/imports/ContactEdit/ContactDetailPhoneNumbersEditor.qml	2014-05-13 18:53:02 +0000
+++ src/imports/ContactEdit/ContactDetailPhoneNumbersEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,16 +15,15 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0 as QtContacts
+import QtContacts 5.0
+
 import Ubuntu.Contacts 0.1
 
-import "../Common"
-
 ContactDetailGroupWithTypeEditor {
     title: i18n.tr("Phone")
-    detailType: QtContacts.ContactDetail.PhoneNumber
+    detailType: ContactDetail.PhoneNumber
     detailQmlTypeName: "PhoneNumber"
-    fields: [ QtContacts.PhoneNumber.Number ]
+    fields: [ PhoneNumber.Number ]
     placeholderTexts: [ i18n.tr("Enter a number") ]
     typeModel: ContactDetailPhoneNumberTypeModel { }
     inputMethodHints: Qt.ImhDialableCharactersOnly
 
=== modified file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-07-20 20:26:54 +0000
+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-08-15 21:50:36 +0000
@@ -16,10 +16,10 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-import "../Common"
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Contacts 0.1
 
 ContactDetailBase {
     id: root
@@ -83,7 +83,7 @@
         height: units.gu(4)
     }
 
-    ListItem.ThinDivider {
+    ThinDivider {
         id: divider
 
         anchors.top: label.bottom
 
=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-08-15 21:50:36 +0000
@@ -15,11 +15,10 @@
  */
 
 import QtQuick 2.2
+import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import QtContacts 5.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-import "../Common"
+import Ubuntu.Contacts 0.1
 
 ContactDetailBase {
     id: root
 
=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2014-07-22 10:39:49 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-08-15 21:50:36 +0000
@@ -16,9 +16,10 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
+
 import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
 
 import "../Common"
 
@@ -288,7 +289,7 @@
                 height: implicitHeight
             }
 
-            ListItem.ThinDivider {}
+            ThinDivider {}
 
             Item {
                 anchors {
@@ -320,7 +321,7 @@
                     objectName: "addNewFieldButton"
 
                     text: i18n.tr("Add Field")
-                    gradient: UbuntuColors.greyGradient
+                    strokeColor: UbuntuColors.warmGrey
                     anchors {
                         top: parent.top
                         bottom: parent.bottom
@@ -336,6 +337,7 @@
 
                     text: i18n.tr("Delete")
                     visible: !contactEditor.isNewContact
+                    color: "red"
                     anchors {
                         top: parent.top
                         bottom: parent.bottom
@@ -343,7 +345,7 @@
                     }
                     width: (parent.width / 2) - units.gu(1)
                     onClicked: {
-                        var dialog = Popups.PopupUtils.open(removeContactDialog, null)
+                        var dialog = PopupUtils.open(removeContactDialog, null)
                         dialog.contacts = [contactEditor.contact]
                     }
                 }
@@ -427,13 +429,13 @@
             property var popPages: false
 
             onCanceled: {
-                Popups.PopupUtils.close(removeContactsDialogMessage)
+                PopupUtils.close(removeContactsDialogMessage)
             }
 
             onAccepted: {
                 popPages = true
                 removeContacts(contactEditor.model)
-                Popups.PopupUtils.close(removeContactsDialogMessage)
+                PopupUtils.close(removeContactsDialogMessage)
             }
 
             // hide virtual keyboard if necessary
 
=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-07-31 07:56:49 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-08-15 21:50:36 +0000
@@ -236,6 +236,7 @@
                     rightMargin: units.gu(2)
                 }
                 color: UbuntuColors.lightAubergine
+                // TRANSLATORS: this refers to creating a new contact
                 text: i18n.tr("+ Create New")
                 elide: Text.ElideRight
             }
@@ -301,6 +302,7 @@
 
         onAddDetailClicked: mainPage.addPhoneToContact(contact.contactId, " ")
 
+        onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
         onSelectionCanceled: {
             if (pickMode) {
                 if (contentHubTransfer) {
@@ -308,7 +310,6 @@
                 }
                 pickMode = false
                 contentHubTransfer = null
-                console.debug("UPDATE STATE:" +  mainPage.state )
                 application.returnVcard("")
             }
             mainPage.state = "default"
@@ -369,7 +370,6 @@
     }
 
     state: "default"
-    onStateChanged: console.debug("STATE CHANGEDDDDD" + state)
     states: [
         PageHeadState {
             id: defaultState
@@ -405,7 +405,8 @@
                 target: mainPage.head
                 backAction: defaultState.backAction
                 actions: defaultState.actions
-                sections.model: ["All", "Favorites"]
+                // TRANSLATORS: this refers to all contacts
+                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
             }
             PropertyChanges {
                 target: searchField
@@ -440,7 +441,6 @@
             id: selectionState
 
             name: "selection"
-            when: contactList.isInSelectionMode
             backAction: Action {
                 text: i18n.tr("Cancel selection")
                 iconName: "close"
@@ -468,16 +468,18 @@
                         var contacts = []
                         var items = contactList.selectedItems
 
-                        for (var i=0; i < items.count; i++) {
+                        for (var i=0, iMax=items.count; i < iMax; i++) {
                             contacts.push(items.get(i).model.contact)
                         }
+
                         if (mainPage.pickMode) {
                             contactExporter.exportContacts(contacts)
                             mainPage.pickMode = false
                         } else {
                             pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-                                           { contactModel: contactList.model, contacts: contacts })
+                                           { contactModel: contactList.listModel, contacts: contacts })
                         }
+                        contactList.endSelection()
                     }
                 },
                 Action {
@@ -486,7 +488,6 @@
                     iconName: "delete"
                     visible: contactList.isInSelectionMode && !mainPage.pickMode
                     onTriggered: {
-
                         var contacts = []
                         var items = contactList.selectedItems
 
 
=== modified file 'src/imports/ContactView/CMakeLists.txt'
--- src/imports/ContactView/CMakeLists.txt	2014-06-12 17:21:38 +0000
+++ src/imports/ContactView/CMakeLists.txt	2014-08-15 21:50:36 +0000
@@ -1,19 +1,6 @@
 set(CONTACT_VIEW_QMLS
-    ActionButton.qml
-    BasicFieldView.qml
-    ContactDetailAddressesView.qml
-    ContactDetailAvatarView.qml
-    ContactDetailEmailsView.qml
-    ContactDetailGroupWithTypeView.qml
-    ContactDetailNameView.qml
-    ContactDetailOnlineAccountsView.qml
-    ContactDetailOrganizationsView.qml
-    ContactDetailPhoneNumbersView.qml
-    ContactDetailPhoneNumberView.qml
     ContactDetailSyncTargetView.qml
-    ContactDetailWithTypeView.qml
     ContactFetchError.qml
-    ContactHeaderView.qml
     ContactView.qml
 )
 
 
=== modified file 'src/imports/ContactView/ContactDetailSyncTargetView.qml'
--- src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-08-15 21:50:36 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.2
 import Ubuntu.Components 1.1
 import QtContacts 5.0
+import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeView {
     id: root
 
=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-07-28 16:59:18 +0000
+++ src/imports/ContactView/ContactView.qml	2014-08-15 21:50:36 +0000
@@ -15,37 +15,19 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0
 import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Contacts 0.1 as ContactsUI
 import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Contacts 0.1
 
-Page {
+ContactPreviewPage {
     id: root
     objectName: "contactViewPage"
 
-    property QtObject contact: null
     property alias model: contactFetch.model
     // used by main page to open the contact view on app startup
     property string contactId: ""
     property string addPhoneToContact: ""
 
-    function formatNameToDisplay(contact) {
-        if (!contact) {
-            return ""
-        }
-        if (contact.name) {
-            var detail = contact.name
-            return detail.firstName +" " + detail.lastName
-        } else if (contact.displayLabel && contact.displayLabel.label && contact.displayLabel.label !== "") {
-            return contact.displayLabel.label
-        } else {
-            return ""
-        }
-    }
-
-    title: formatNameToDisplay(contact)
     onActiveChanged: {
         if (active) {
             //WORKAROUND: to correct scroll back the page
@@ -60,98 +42,20 @@
         }
     }
 
-    Flickable {
-        id: flickable
-
-        flickableDirection: Flickable.VerticalFlick
-        anchors.fill: parent
-        //WORKAROUND: There is a bug on SDK page that causes the page to appear flicked with small contents
-        // see bug #1223050
-        contentHeight: Math.max(contents.height, parent.height) + units.gu(2)
-        contentWidth: parent.width
-        visible: !busyIndicator.visible
-
-        Column {
-            id: contents
-
-            height: childrenRect.height
-            anchors {
-                top: parent.top
-                topMargin: units.gu(2)
-                left: parent.left
-                right: parent.right
-            }
-
-            ContactDetailAvatarView {
-                contact: root.contact
-                anchors.left: parent.left
-                height: implicitHeight
-                width: implicitWidth
-            }
-
-            ContactDetailPhoneNumbersView {
-                objectName: "phones"
-
-                contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailEmailsView {
-                objectName: "emails"
-
-                contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailOnlineAccountsView {
-                contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailAddressesView {
-                contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailOrganizationsView {
-                contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailSyncTargetView {
-                contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
+    extensions: ContactDetailSyncTargetView {
+        contact: root.contact
+        anchors {
+            left: parent.left
+            right: parent.right
         }
+        height: implicitHeight
     }
 
     ActivityIndicator {
         id: busyIndicator
 
+        parent: root
+
         running: (root.contact === null) && contactFetch.running
         visible: running
         anchors.centerIn: parent
@@ -161,7 +65,7 @@
         id: fetchErrorDialog
     }
 
-    ContactsUI.ContactFetch {
+    ContactFetch {
         id: contactFetch
 
         onContactRemoved: {
 
=== removed file 'src/imports/ContentHubProxy.qml.moved'
--- src/imports/ContentHubProxy.qml.moved	2014-07-28 23:12:24 +0000
+++ src/imports/ContentHubProxy.qml.moved	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * 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/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Content 0.1 as ContentHub
-
-QtObject {
-    property QtObject pageStack: null
-    property list<QtObject> objects: [
-        Connections {
-            target: ContentHub.ContentHub
-            onExportRequested: {
-                // enter in pick mode
-                pageStack.push(Qt.createComponent("ContactList/ContactListPage.qml"),
-                               {pickMode: true,
-                                contentHubTransfer: transfer})
-            }
-            onImportRequested: {
-                if (transfer.state === ContentHub.ContentTransfer.Charged) {
-                    var urls = []
-                    for(var i=0; i < transfer.items.length; i++) {
-                        urls.push(transfer.items[i].url)
-                    }
-                    pageStack.contactList.importContact(urls)
-                }
-            }
-        }
-    ]
-}
 
=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-07-28 23:12:24 +0000
+++ src/imports/MainWindow.qml	2014-08-15 21:50:36 +0000
@@ -130,7 +130,7 @@
             text: mainWindow.modelErrorMessage
 
             Button {
-                text: "Cancel"
+                text: i18n.tr("Cancel")
                 gradient: UbuntuColors.greyGradient
                 onClicked: PopupUtils.close(dialogue)
             }
@@ -165,11 +165,4 @@
             mainStack.contactListPage.returnToNormalState()
         }
     }
-
-    Image {
-        source: Qt.resolvedUrl("grid.jpg")
-        asynchronous: true
-        anchors.fill: parent
-        opacity: 0.3
-    }
 }
 
=== renamed file 'src/imports/ContactView/ActionButton.qml' => 'src/imports/Ubuntu/Contacts/ActionButton.qml'
=== renamed file 'src/imports/ContactView/BasicFieldView.qml' => 'src/imports/Ubuntu/Contacts/BasicFieldView.qml'
--- src/imports/ContactView/BasicFieldView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/BasicFieldView.qml	2014-08-15 21:50:36 +0000
@@ -17,8 +17,6 @@
 import QtQuick 2.2
 import Ubuntu.Components 1.1
 
-import "../Common"
-
  Item {
     id: root
 
 
=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-07-31 10:46:27 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-08-15 21:50:36 +0000
@@ -1,27 +1,42 @@
 set(CONTACT_COMPONENTS_PLUGIN "ubuntu-contacts-qml")
 
 set(CONTACT_COMPONENTS_QMLS
-    ContactList.js
+    ActionButton.qml
+    BasicFieldView.qml
     ContactAvatar.qml
     ContactDelegate.qml
+    ContactDetailAddressesView.qml
+    ContactDetailAvatarView.qml
+    ContactDetailBase.qml
+    ContactDetailEmailsView.qml
+    ContactDetailGroupBase.qml
+    ContactDetailGroupWithTypeBase.qml
+    ContactDetailGroupWithTypeView.qml
+    ContactDetailOnlineAccountsView.qml
     ContactDetailOnlineAccountTypeModel.qml
+    ContactDetailOrganizationsView.qml
+    ContactDetailPhoneNumbersView.qml
     ContactDetailPhoneNumberTypeModel.qml
+    ContactDetailPhoneNumberView.qml
     ContactDetailPickerPhoneNumberDelegate.qml
+    ContactDetailWithTypeView.qml
     ContactFetch.qml
+    ContactList.js
     ContactListView.qml
+    ContactPreviewPage.qml
+    ContactSimpleListView.qml
     Contacts.js
-    ContactSimpleListView.qml
-    DialogButtons.qml
+    FastScroll.js
     FastScroll.qml
-    FastScroll.js
+    ListItemWithActionsCheckBox.qml
     ListItemWithActions.qml
-    ListItemWithActionsCheckBox.qml
     MostCalledModel.qml
     MultipleSelectionListView.qml
     MultipleSelectionVisualModel.qml
     PageWithBottomEdge.qml
+    qmldir
     SubtitledWithColors.qml
-    qmldir
+    VCardParser.qml
 )
 
 set(CONTACT_COMPONENTS_SRC
@@ -60,3 +75,4 @@
 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/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-08-15 21:50:36 +0000
@@ -29,7 +29,7 @@
     property bool showAvatarPicture: (avatarUrl != fallbackAvatarUrl) || (initials.length === 0)
 
     readonly property alias initials: initialsLabel.text
-    readonly property string displayName: ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName)
+    readonly property alias displayName: initialsLabel.contactDisplayName
     readonly property alias avatarUrl: img.avatarUrl
 
     // this is necessary because the object does not monitor changes on avatarDetail object this will be very expesive and only happens in few cases,
@@ -37,6 +37,7 @@
     function reload()
     {
         img.avatarUrl = Qt.binding(function() { return ContactsJS.getAvatar(contactElement, fallbackAvatarUrl) })
+        initialsLabel.contactDisplayName = Qt.binding(function() { return ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName) })
     }
 
     radius: "medium"
@@ -46,8 +47,10 @@
         id: initialsLabel
         objectName: "avatarInitials"
 
+        property string contactDisplayName: ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName)
+
         anchors.centerIn: parent
-        text: Contacts.contactInitialsFromString(displayName)
+        text: Contacts.contactInitialsFromString(contactDisplayName)
         font.pointSize: 88
         color: UbuntuColors.lightAubergine
         visible: (img.status != Image.Ready)
 
=== renamed file 'src/imports/ContactView/ContactDetailAddressesView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailAddressesView.qml'
--- src/imports/ContactView/ContactDetailAddressesView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailAddressesView.qml	2014-08-15 21:50:36 +0000
@@ -21,7 +21,7 @@
 ContactDetailGroupWithTypeView {
     id: root
 
-    title: i18n.tr("Address")
+    title: i18n.dtr("address-book-app", "Address")
     defaultIcon: "image://theme/location"
     detailType: QtContacts.ContactDetail.Address
     fields: [ QtContacts.Address.Street,
 
=== renamed file 'src/imports/ContactView/ContactDetailAvatarView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailAvatarView.qml'
--- src/imports/ContactView/ContactDetailAvatarView.qml	2014-07-28 23:12:24 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailAvatarView.qml	2014-08-15 21:50:36 +0000
@@ -16,10 +16,6 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
-import Ubuntu.Components 1.1
-import Ubuntu.Contacts 0.1 as ContactsUI
-
-import "../Common"
 
 ContactDetailBase {
     id: root
@@ -30,39 +26,14 @@
     Connections {
         id: connections
 
-        function updateTarget()
-        {
-            if (root.contact) {
-                var avatarDetail = root.contact.detail(ContactDetail.Avatar)
-                if (avatarDetail) {
-                    return avatarDetail
-                } else  {
-                    return root.contact
-                }
-            }
-            return null
-        }
-
-        target: updateTarget()
+        target: avatar.contactElement
         ignoreUnknownSignals: true
-        onContactChanged: {
-            var avatarDetail = root.contact.detail(ContactDetail.Avatar)
-            if (avatarDetail) {
-                avatar.reload()
-                connections.target = avatarDetail
-            }
-        }
-        onDetailChanged: {
-            var avatarDetail = root.contact.detail(ContactDetail.Avatar)
-            if (avatarDetail === null) {
-                connections.target = root.contact
-            }
-            avatar.reload()
-        }
+        onContactChanged: avatar.reload()
     }
 
-    ContactsUI.ContactAvatar {
+    ContactAvatar {
         id: avatar
+        objectName: "contactAvatarDetail"
 
         contactElement: root.contact
         anchors {
 
=== renamed file 'src/imports/Common/ContactDetailBase.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailBase.qml'
--- src/imports/Common/ContactDetailBase.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailBase.qml	2014-08-15 21:50:36 +0000
@@ -16,7 +16,6 @@
 
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
-import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Empty {
 
=== renamed file 'src/imports/ContactView/ContactDetailEmailsView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailEmailsView.qml'
=== renamed file 'src/imports/Common/ContactDetailGroupBase.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailGroupBase.qml'
--- src/imports/Common/ContactDetailGroupBase.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailGroupBase.qml	2014-08-15 21:50:36 +0000
@@ -15,8 +15,6 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
 
 FocusScope {
     id: root
 
=== renamed file 'src/imports/Common/ContactDetailGroupWithTypeBase.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeBase.qml'
--- src/imports/Common/ContactDetailGroupWithTypeBase.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeBase.qml	2014-08-15 21:50:36 +0000
@@ -15,7 +15,6 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
 import QtContacts 5.0 as QtContacts
 
 ContactDetailGroupBase {
 
=== renamed file 'src/imports/ContactView/ContactDetailGroupWithTypeView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeView.qml'
--- src/imports/ContactView/ContactDetailGroupWithTypeView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeView.qml	2014-08-15 21:50:36 +0000
@@ -19,8 +19,6 @@
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtContacts 5.0 as QtContacts
 
-import "../Common"
-
 ContactDetailGroupWithTypeBase {
     id: root
 
 
=== renamed file 'src/imports/ContactView/ContactDetailOnlineAccountsView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountsView.qml'
--- src/imports/ContactView/ContactDetailOnlineAccountsView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountsView.qml	2014-08-15 21:50:36 +0000
@@ -17,9 +17,6 @@
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
 import Ubuntu.Components 1.1
-import Ubuntu.Contacts 0.1
-
-import "../Common"
 
 ContactDetailGroupWithTypeView {
     detailType: QtContacts.ContactDetail.OnlineAccount
 
=== renamed file 'src/imports/ContactView/ContactDetailOrganizationsView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailOrganizationsView.qml'
--- src/imports/ContactView/ContactDetailOrganizationsView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailOrganizationsView.qml	2014-08-15 21:50:36 +0000
@@ -16,15 +16,12 @@
 
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
-import Ubuntu.Components 1.1
-import Ubuntu.Contacts 0.1
 
-//import "../Common"
 
 ContactDetailGroupWithTypeView {
     id: root
 
-    title: i18n.tr("Professional details")
+    title: i18n.tr("Professional Details")
     defaultIcon: "image://theme/location"
     detailType: QtContacts.ContactDetail.Organization
     typeModel: null
 
=== renamed file 'src/imports/ContactView/ContactDetailPhoneNumberView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberView.qml'
--- src/imports/ContactView/ContactDetailPhoneNumberView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberView.qml	2014-08-15 21:50:36 +0000
@@ -15,10 +15,6 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
-import QtContacts 5.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import "../Common"
 
 ContactDetailBase {
     id: root
 
=== renamed file 'src/imports/ContactView/ContactDetailPhoneNumbersView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailPhoneNumbersView.qml'
--- src/imports/ContactView/ContactDetailPhoneNumbersView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPhoneNumbersView.qml	2014-08-15 21:50:36 +0000
@@ -16,10 +16,6 @@
 
 import QtQuick 2.2
 import QtContacts 5.0 as QtContacts
-import Ubuntu.Components 1.1
-import Ubuntu.Contacts 0.1
-
-import "../Common"
 
 ContactDetailGroupWithTypeView {
     id: root
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2014-07-31 10:46:27 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2014-08-15 21:50:36 +0000
@@ -79,7 +79,7 @@
                     right: parent.right
                 }
 
-                text: i18n.tr("Add number...")
+                text: i18n.dtr("address-book-app", "Add number...")
                 color: UbuntuColors.lightAubergine
             }
             visible: phoneNumberEntries.count == 0
 
=== renamed file 'src/imports/ContactView/ContactDetailWithTypeView.qml' => 'src/imports/Ubuntu/Contacts/ContactDetailWithTypeView.qml'
--- src/imports/ContactView/ContactDetailWithTypeView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailWithTypeView.qml	2014-08-15 21:50:36 +0000
@@ -15,11 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
 import QtContacts 5.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-import "../Common"
 
 ContactDetailBase {
     id: root
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-31 20:16:08 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-08-15 21:50:36 +0000
@@ -427,7 +427,7 @@
                     Label {
                         anchors.fill: parent
                         verticalAlignment: Text.AlignVCenter
-                        text: i18n.tr("Frequently called")
+                        text: i18n.dtr("address-book-app", "Frequently called")
                         font.pointSize: 76
                     }
                     ListItem.ThinDivider {
 
=== added file 'src/imports/Ubuntu/Contacts/ContactPreviewPage.qml'
--- src/imports/Ubuntu/Contacts/ContactPreviewPage.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/ContactPreviewPage.qml	2014-08-15 21:50:36 +0000
@@ -0,0 +1,138 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.2
+import QtContacts 5.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Contacts 0.1 as ContactsUI
+import Ubuntu.Components.Popups 1.0 as Popups
+
+Page {
+    id: root
+
+    property QtObject contact: null
+    property alias extensions: extensionsContents.children
+
+    function formatNameToDisplay(contact) {
+        if (!contact) {
+            return ""
+        }
+        if (contact.name) {
+            var detail = contact.name
+            return (detail.firstName + " " + detail.lastName).trim()
+        } else if (contact.displayLabel && contact.displayLabel.label && contact.displayLabel.label !== "") {
+            return contact.displayLabel.label
+        } else {
+            return ""
+        }
+    }
+
+    title: formatNameToDisplay(contact)
+
+    Flickable {
+        id: flickable
+
+        flickableDirection: Flickable.VerticalFlick
+        anchors.fill: parent
+        //WORKAROUND: There is a bug on SDK page that causes the page to appear flicked with small contents
+        // see bug #1223050
+        contentHeight: Math.max(contents.height, parent.height) + units.gu(2)
+        contentWidth: parent.width
+
+        Column {
+            id: contents
+
+            height: childrenRect.height
+            anchors {
+                top: parent.top
+                topMargin: units.gu(2)
+                left: parent.left
+                right: parent.right
+            }
+
+            ContactDetailAvatarView {
+                contact: root.contact
+                anchors.left: parent.left
+                height: implicitHeight
+                width: implicitWidth
+            }
+
+            ContactDetailPhoneNumbersView {
+                objectName: "phones"
+
+                contact: root.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailEmailsView {
+                objectName: "emails"
+
+                contact: root.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailOnlineAccountsView {
+                contact: root.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailAddressesView {
+                objectName: "addresses"
+
+                contact: root.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailOrganizationsView {
+                objectName: "organizations"
+
+                contact: root.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            Item {
+                id: extensionsContents
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: childrenRect.height
+            }
+        }
+    }
+}
 
=== removed file 'src/imports/Ubuntu/Contacts/DialogButtons.qml'
--- src/imports/Ubuntu/Contacts/DialogButtons.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/Contacts/DialogButtons.qml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * 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/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-Rectangle {
-    id: root
-
-    signal reject()
-    signal accept()
-
-    property alias acceptAction: accept.action
-    property alias rejectAction: reject.action
-
-    color: "gray"
-
-    Button {
-        id: reject
-        objectName: "DialogButtons.rejectButton"
-
-        action: Action {
-            text: i18n.dtr("address-book-app", "Cancel")
-        }
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        color: UbuntuColors.warmGrey
-        onClicked: root.reject()
-    }
-
-    Button {
-        id: accept
-        objectName: "DialogButtons.acceptButton"
-
-        action: Action {
-            text: i18n.dtr("address-book-app", "Done")
-        }
-        anchors {
-            right: parent.right
-            rightMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        onClicked: root.accept()
-    }
-}
 
=== modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml'
--- src/imports/Ubuntu/Contacts/FastScroll.qml	2014-07-24 12:42:38 +0000
+++ src/imports/Ubuntu/Contacts/FastScroll.qml	2014-08-15 21:50:36 +0000
@@ -140,7 +140,7 @@
         id: rail
 
         property bool isVisible: root.enabled &&
-                                 (listView.moving || dragArea.pressed) &&
+                                 (listView.flicking || dragArea.pressed) &&
                                  (listView.currentIndex == -1)
         anchors {
             right: parent.right
@@ -178,9 +178,9 @@
                 width: pinSize
                 verticalAlignment: Text.AlignVCenter
                 horizontalAlignment: Text.AlignHCenter
-                text: internal.fastScrolling && internal.targetSection == modelData ? "" : modelData
+                text: modelData
                 fontSize: "x-small"
-                color: internal.currentItem && (internal.currentItem.text === text) ? Theme.palette.selected.foregroundText : Theme.palette.selected.backgroundText
+                color: cursor.y === y ? "white" : Theme.palette.selected.backgroundText
                 opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
             }
         }
 
=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-07-30 08:21:52 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-08-15 21:50:36 +0000
@@ -41,6 +41,9 @@
     readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
     readonly property alias swipping: mainItemMoving.running
 
+    /* internal */
+    property var _visibleRightSideActions: filterVisibleActions(rightSideActions)
+
     signal itemClicked(var mouse)
     signal itemPressAndHold(var mouse)
 
@@ -48,12 +51,12 @@
     {
         var actionFullWidth = actionWidth + units.gu(2)
         var xOffset = Math.abs(main.x)
-        var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+        var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
 
         if (index < 1) {
             main.x = 0
-        } else if (index === rightSideActions.length) {
-            main.x = -rightActionsView.width
+        } else if (index === _visibleRightSideActions.length) {
+            main.x = -(rightActionsView.width - units.gu(2))
         } else {
             main.x = -(actionFullWidth * index)
         }
@@ -100,15 +103,15 @@
 
     function updateActiveAction()
     {
-        if ((main.x <= -root.actionWidth) &&
-            (main.x > -rightActionsView.width)) {
+        if ((main.x <= -(root.actionWidth + units.gu(2))) &&
+            (main.x > -(rightActionsView.width - units.gu(2)))) {
             var actionFullWidth = actionWidth + units.gu(2)
             var xOffset = Math.abs(main.x)
-            var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+            var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
             index = index - 1
             if (index > -1) {
                 root.activeItem = rightActionsRepeater.itemAt(index)
-                root.activeAction = root.rightSideActions[index]
+                root.activeAction = root._visibleRightSideActions[index]
             }
         } else {
             root.activeAction = null
@@ -120,6 +123,18 @@
         main.x = 0
     }
 
+    function filterVisibleActions(actions)
+    {
+        var visibleActions = []
+        for(var i = 0; i < actions.length; i++) {
+            var action = actions[i]
+            if (action.visible) {
+                visibleActions.push(action)
+            }
+        }
+        return visibleActions
+    }
+
     states: [
         State {
             name: "select"
@@ -167,31 +182,35 @@
         }
     }
 
-    Item {
+    Rectangle {
        id: rightActionsView
 
        anchors {
            top: main.top
            left: main.right
-           leftMargin: units.gu(1)
            bottom: main.bottom
        }
-       visible: rightSideActions.length > 0
-       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + actionThreshold : 0
+       visible: _visibleRightSideActions.length > 0
+       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
+       color: "white"
        Row {
-           anchors.fill: parent
+           anchors{
+               top: parent.top
+               left: parent.left
+               leftMargin: units.gu(2)
+               right: parent.right
+               rightMargin: units.gu(2)
+               bottom: parent.bottom
+           }
            spacing: units.gu(2)
            Repeater {
                id: rightActionsRepeater
 
-               model: rightSideActions
+               model: _visibleRightSideActions
                Item {
                    property alias image: img
 
-                   anchors {
-                       top: parent.top
-                       bottom: parent.bottom
-                   }
+                   height: rightActionsView.height
                    width: root.actionWidth
 
                    Icon {
@@ -200,10 +219,10 @@
                        anchors.centerIn: parent
                        width: units.gu(3)
                        height: units.gu(3)
-                       name: iconName
+                       name: modelData.iconName
                        color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? UbuntuColors.lightAubergine : Theme.palette.selected.background
                    }
-               }
+              }
            }
        }
     }
@@ -317,14 +336,14 @@
     MouseArea {
         id: mouseArea
 
-        property bool locked: root.locked || ((root.leftSideAction === null) && (root.rightSideActions.count === 0))
+        property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0))
         property bool manual: false
 
         anchors.fill: parent
         drag {
             target: locked ? null : main
             axis: Drag.XAxis
-            minimumX: rightActionsView.visible ? -(rightActionsView.width + root.actionThreshold) : 0
+            minimumX: rightActionsView.visible ? -(rightActionsView.width) : 0
             maximumX: leftActionView.visible ? leftActionView.width : 0
         }
 
@@ -348,7 +367,7 @@
                 var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
                 if (actionIndex !== -1) {
                     root.activeItem = rightActionsRepeater.itemAt(actionIndex)
-                    root.activeAction = root.rightSideActions[actionIndex]
+                    root.activeAction = root._visibleRightSideActions[actionIndex]
                     triggerAction.start()
                     return
                 }
 
=== added file 'src/imports/Ubuntu/Contacts/VCardParser.qml'
--- src/imports/Ubuntu/Contacts/VCardParser.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/VCardParser.qml	2014-08-15 21:50:36 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 QtContacts 5.0
+
+QtObject {
+    id: root
+
+    property string vCardUrl
+    property alias contacts: contactsModel.contacts
+    property var _model
+
+    signal vcardParsed(int error)
+
+    function clearModel()
+    {
+        if (contactsModel.contacts.length === 0)
+            return;
+
+        var ids = []
+        for(var i=0, iMax=contactsModel.contacts.length; i < iMax; i++) {
+            ids.push(contactsModel.contacts[i].contactId)
+        }
+        contactsModel.removeContacts(ids)
+    }
+
+
+
+    _model: ContactModel {
+        id: contactsModel
+
+        manager: "memory"
+
+        onImportCompleted: vcardParsed(error)
+    }
+
+    onVCardUrlChanged: {
+        if (vCardUrl.length > 0) {
+            clearModel()
+            contactsModel.importContacts(vCardUrl)
+        }
+    }
+}
 
=== modified file 'src/imports/Ubuntu/Contacts/qmldir'
--- src/imports/Ubuntu/Contacts/qmldir	2014-07-31 10:46:27 +0000
+++ src/imports/Ubuntu/Contacts/qmldir	2014-08-15 21:50:36 +0000
@@ -7,19 +7,36 @@
 ContactDetailPhoneNumberTypeModel 0.1 ContactDetailPhoneNumberTypeModel.qml
 ContactFetch 0.1 ContactFetch.qml
 ContactListView 0.1 ContactListView.qml
+ContactPreviewPage 0.1 ContactPreviewPage.qml
 ListItemWithActions 0.1 ListItemWithActions.qml
 MultipleSelectionListView 0.1 MultipleSelectionListView.qml
 PageWithBottomEdge 0.1 PageWithBottomEdge.qml
-
-internal ContactSimpleListView ContactSimpleListView.qml
+VCardParser 0.1 VCardParser.qml
+
+# this is necessary for contact app does not use this on external apps
+ActionButton 0.1 ActionButton.qml
+ContactDetailBase 0.1 ContactDetailBase.qml
+ContactDetailGroupBase 0.1 ContactDetailGroupBase.qml
+ContactDetailGroupWithTypeBase 0.1 ContactDetailGroupWithTypeBase.qml
+ContactDetailGroupWithTypeView 0.1 ContactDetailGroupWithTypeView.qml
+
+internal BasicFieldView BasicFieldView.qml
+internal ContactAvatar ContactAvatar.qml
 internal ContactDelegate ContactDelegate.qml
+internal ContactDetailAddressesView ContactDetailAddressesView.qml
+internal ContactDetailAvatarView ContactDetailAvatarView.qml
+internal ContactDetailEmailsView ContactDetailEmailsView.qml
+internal ContactDetailOnlineAccountsView ContactDetailOnlineAccountsView.qml
+internal ContactDetailOrganizationsView ContactDetailOrganizationsView.qml
+internal ContactDetailPhoneNumbersView ContactDetailPhoneNumbersView.qml
+internal ContactDetailPhoneNumberView ContactDetailPhoneNumberView.qml
 internal ContactDetailPickerPhoneNumberDelegate ContactDetailPickerPhoneNumberDelegate.qml
-internal DialogButtons DialogButtons.qml
-internal OrganicView OrganicView.qml
+internal ContactDetailWithTypeView ContactDetailWithTypeView.qml
 internal ContactList ContactList.js
+internal ContactSimpleListView ContactSimpleListView.qml
 internal ContactJs Contacts.js
+internal FastScrollJs FastScroll.js
 internal FastScroll FastScroll.qml
-internal FastScrollJs FastScroll.js
 internal ListItemWithActionsCheckBox ListItemWithActionsCheckBox.qml
 internal MostCalledModel MostCalledModel.qml
 internal SubtitledWithColors SubtitledWithColors.qml
 
=== modified file 'tests/data/CMakeLists.txt'
--- tests/data/CMakeLists.txt	2013-12-12 15:55:57 +0000
+++ tests/data/CMakeLists.txt	2014-08-15 21:50:36 +0000
@@ -1,3 +1,5 @@
+project(test_data)
+
 set(AUTOPILOT_DATA
     vcard.vcf
 )
 
=== added file 'tests/data/vcard_single.vcf'
--- tests/data/vcard_single.vcf	1970-01-01 00:00:00 +0000
+++ tests/data/vcard_single.vcf	2014-08-15 21:50:36 +0000
@@ -0,0 +1,16 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Gump;Forrest;;Mr.
+FN:Forrest Gump
+ORG:Bubba Gump Shrimp Co.
+TITLE:Shrimp Man
+PHOTO;VALUE=URL;http://assets.ubuntu.com/sites/ubuntu/1166/u/img/pictograms/picto-pack/picto-canonical.svg
+TEL;TYPE=WORK,VOICE:(111) 555-12121
+TEL;TYPE=HOME,VOICE:[phone]
+ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
+LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America
+ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America
+LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America
+EMAIL;TYPE=PREF,INTERNET:[e-mail]
+REV:2008-04-24T19:52:43Z
+END:VCARD
 
=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2014-07-17 15:51:20 +0000
+++ tests/qml/CMakeLists.txt	2014-08-15 21:50:36 +0000
@@ -24,6 +24,8 @@
     declare_qml_test("contact_editor" tst_ContactEditor.qml)
     declare_qml_test("contact_avatar" tst_ContactAvatar.qml)
     declare_qml_test("list_with_actions" tst_ListWithActions.qml)
+    declare_qml_test("contact_preview_page" tst_ContactPreviewPage.qml)
+    declare_qml_test("vcard_parser" tst_VCardParser.qml)
 else()
     if (NOT QMLTESTRUNNER_BIN)
         message(WARNING "Qml tests disabled: qmltestrunner not found")
@@ -37,5 +39,7 @@
     tst_ContactEditor.qml
     tst_ContactAvatar.qml
     tst_ListWithActions.qml
+    tst_ContactPreviewPage.qml
+    tst_VCardParser.qml
 )
 add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})
 
=== added file 'tests/qml/tst_ContactPreviewPage.qml'
--- tests/qml/tst_ContactPreviewPage.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_ContactPreviewPage.qml	2014-08-15 21:50:36 +0000
@@ -0,0 +1,208 @@
+/*
+ * 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.Test 0.1
+import QtContacts 5.0
+import Ubuntu.Components 1.1
+import Ubuntu.Contacts 0.1
+
+import "ContactUtil.js" as ContactUtilJS
+
+Item {
+    id: root
+
+    function createContactWithName() {
+        var details = [
+           {detail: 'Name', field: 'firstName', value: 'Fulano'},
+        ];
+        return ContactUtilJS.createContact(details, root)
+    }
+
+    function createContactWithNameAndAvatar() {
+        var details = [
+           {detail: 'Name', field: 'firstName', value: 'Fulano'},
+           {detail: 'Avatar', field: 'imageUrl', value: 'image://theme/address-book-app'}
+        ];
+        return ContactUtilJS.createContact(details, root)
+    }
+
+    VCardParser {
+        id: vcardParser
+
+        vCardUrl: Qt.resolvedUrl("../data/vcard_single.vcf")
+    }
+
+
+    width: units.gu(40)
+    height: units.gu(80)
+
+    MainView {
+        id: mainView
+        anchors.fill: parent
+        useDeprecatedToolbar: false
+
+        ContactPreviewPage {
+            id: contactPreviewPage
+            anchors.fill: parent
+        }
+    }
+
+
+    UbuntuTestCase {
+        id: contactPreviewPageTestCase
+        name: 'contactPreviewPageTestCase'
+
+        when: windowShown
+
+        function findChildOfType(obj, typeName) {
+            var childs = new Array(0)
+            var result = new Array(0)
+            childs.push(obj)
+            while (childs.length > 0) {
+                var objTypeName = String(childs[0]).split("_")[0]
+                if (objTypeName === typeName) {
+                    result.push(childs[0])
+                }
+                for (var i in childs[0].children) {
+                    childs.push(childs[0].children[i])
+                }
+                childs.splice(0, 1)
+            }
+            return result
+        }
+
+
+        function init()
+        {
+            waitForRendering(mainView);
+            contactPreviewPage.contact = null
+        }
+
+        function test_preview_contact_with_name()
+        {
+            contactPreviewPage.contact = createContactWithName()
+            tryCompare(contactPreviewPage, "title", "Fulano")
+        }
+
+        function test_preview_contact_with_name_and_avatar()
+        {
+            contactPreviewPage.contact = createContactWithNameAndAvatar()
+            tryCompare(contactPreviewPage, "title", "Fulano")
+            var avatarField = findChild(root, "contactAvatarDetail")
+            tryCompare(avatarField, "avatarUrl", "image://theme/address-book-app")
+        }
+
+        function test_preview_with_full_contact()
+        {
+            compare(vcardParser.contacts.length, 1)
+            var contact =  vcardParser.contacts[0]
+            console.debug("Contact: " + contact.phoneNumber.number)
+            contactPreviewPage.contact = contact
+            tryCompare(contactPreviewPage, "title", "Forrest Gump")
+            // PhoneNumbers
+            // TEL;TYPE=WORK,VOICE:(111) 555-12121
+            // TEL;TYPE=HOME,VOICE:[phone]
+
+            // number of phones
+            var phoneNumberGroup = findChild(root, "phones")
+            var phoneNumbers = findChildOfType(phoneNumberGroup, "BasicFieldView")
+            compare(phoneNumbers.length, 2)
+
+            // first phone
+            var phoneNumber = findChild(phoneNumberGroup, "label_phoneNumber_0.0")
+            var phoneNumberType =  findChild(phoneNumberGroup, "type_phoneNumber_0")
+            compare(phoneNumber.text, "(111) 555-12121")
+            compare(phoneNumberType.text, "Work")
+
+            // second phone
+            phoneNumber = findChild(phoneNumberGroup, "label_phoneNumber_1.0")
+            phoneNumberType =  findChild(phoneNumberGroup, "type_phoneNumber_1")
+            compare(phoneNumber.text, "[phone]")
+            compare(phoneNumberType.text, "Home")
+
+            // E-mails
+            // EMAIL;TYPE=PREF,INTERNET:[e-mail]
+
+            // number of e-mails
+            var emailGroup = findChild(root, "emails")
+            var emails = findChildOfType(emailGroup, "BasicFieldView")
+            compare(emails.length, 1)
+
+            // e-mail address
+            var email = findChild(emailGroup, "label_emailAddress_0.0")
+            var emailType =  findChild(emailGroup, "type_email_0")
+            compare(email.text, "[e-mail]")
+            compare(emailType.text, "Home")
+
+            // Address
+            // ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
+            // ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America
+
+            // number of addresses
+            var addressGroup = findChild(root, "addresses")
+            var addresses = findChildOfType(addressGroup, "BasicFieldView")
+            compare(addresses.length, 2)
+
+            // first address
+            var address_street = findChild(addressGroup, "label_streetAddress_0.0")
+            var address_locality = findChild(addressGroup, "label_localityAddress_0.1")
+            var address_region = findChild(addressGroup, "label_regionAddress_0.2")
+            var address_postCode = findChild(addressGroup, "label_postcodeAddress_0.3")
+            var address_country = findChild(addressGroup, "label_countryAddress_0.4")
+            var address_type =  findChild(addressGroup, "type_address_0")
+            compare(address_street.text, "100 Waters Edge")
+            compare(address_locality.text, "Baytown")
+            compare(address_region.text, "LA")
+            compare(address_postCode.text, "30314")
+            compare(address_country.text, "United States of America")
+            compare(address_type.text, "Work")
+
+            // second address
+            address_street = findChild(addressGroup, "label_streetAddress_1.0")
+            address_locality = findChild(addressGroup, "label_localityAddress_1.1")
+            address_region = findChild(addressGroup, "label_regionAddress_1.2")
+            address_postCode = findChild(addressGroup, "label_postcodeAddress_1.3")
+            address_country = findChild(addressGroup, "label_countryAddress_1.4")
+            address_type =  findChild(addressGroup, "type_address_1")
+            compare(address_street.text, "42 Plantation St.")
+            compare(address_locality.text, "Baytown")
+            compare(address_region.text, "LA")
+            compare(address_postCode.text, "30314")
+            compare(address_country.text, "United States of America")
+            compare(address_type.text, "Home")
+
+            // Organization
+            // ORG:Bubba Gump Shrimp Co.
+            // TITLE:Shrimp Man
+
+            // number of organizations
+            var orgGroup = findChild(root, "organizations")
+            var orgs = findChildOfType(orgGroup, "BasicFieldView")
+            compare(orgs.length, 1)
+
+            var org_name = findChild(orgGroup, "label_orgName_0.0")
+            var org_role = findChild(orgGroup, "label_orgRole_0.1")
+            var org_title = findChild(orgGroup, "label_orgTitle_0.2")
+
+            compare(org_name.text, "Bubba Gump Shrimp Co.")
+            compare(org_role.text, "")
+            compare(org_title.text, "Shrimp Man")
+        }
+    }
+}
+
 
=== modified file 'tests/qml/tst_ListWithActions.qml'
--- tests/qml/tst_ListWithActions.qml	2014-07-20 20:26:54 +0000
+++ tests/qml/tst_ListWithActions.qml	2014-08-15 21:50:36 +0000
@@ -46,7 +46,7 @@
             anchors.fill: parent
 
             Repeater {
-                model: 5
+                model: 3
 
                 ListItemWithActions {
                     id: listWithActions
@@ -60,7 +60,7 @@
                     triggerActionOnMouseRelease: true
                     Rectangle {
                         anchors.fill: parent
-                        color: "blue"
+                        color: "green"
                     }
 
                     leftSideAction: Action {
@@ -95,7 +95,7 @@
             }
 
             Repeater {
-                model: 5
+                model: 3
 
                 ListItemWithActions {
                     id: listWithNoRightActions
@@ -109,6 +109,33 @@
                     triggerActionOnMouseRelease: true
                     Rectangle {
                         anchors.fill: parent
+                        color: "pink"
+                    }
+
+                    leftSideAction: Action {
+                        objectName: "deleteAction2"
+
+                        iconName: "delete"
+                        onTriggered: itemList.actionTriggered(deleteAction, value)
+                    }
+                }
+            }
+
+            Repeater {
+                model: 3
+
+                ListItemWithActions {
+                    id: listWithInvisibleActions
+                    objectName: "listWithInvisibleActions"+ index
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: units.gu(8)
+                    triggerActionOnMouseRelease: true
+                    Rectangle {
+                        anchors.fill: parent
                         color: "blue"
                     }
 
@@ -118,6 +145,35 @@
                         iconName: "delete"
                         onTriggered: itemList.actionTriggered(deleteAction, value)
                     }
+
+                    rightSideActions: [
+                        Action {
+                            id: messageAction2
+
+                            iconName: "message"
+                            onTriggered: itemList.actionTriggered(messageAction2)
+                        },
+                        Action {
+                            id: shareAction2
+
+                            iconName: "share"
+                            visible: false
+                            onTriggered: itemList.actionTriggered(shareAction2)
+                        },
+                        Action {
+                            id: contactAction2
+
+                            iconName: "stock_contact"
+                            onTriggered: itemList.actionTriggered(contactAction2)
+                        },
+                        Action {
+                            id: infoAction2
+
+                            iconName: "info"
+                            visible: false
+                            onTriggered: itemList.actionTriggered(shareAction2)
+                        }
+                    ]
                 }
             }
         }
@@ -277,5 +333,15 @@
             var mainItem = findChild(item, "mainItem")
             compare(mainItem.x, 0)
         }
+
+        function test_not_visibleActions()
+        {
+            var item = swipeToLeft("listWithInvisibleActions2", -1, true)
+            compare(item._visibleRightSideActions.length, 2)
+
+            // check if only 2 actions is visible
+            var mainItem = findChild(item, "mainItem")
+            tryCompare(mainItem, "x", (item.actionWidth * -2) - units.gu(6))
+        }
     }
 }
 
=== added file 'tests/qml/tst_VCardParser.qml'
--- tests/qml/tst_VCardParser.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_VCardParser.qml	2014-08-15 21:50:36 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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.Test 0.1
+import QtContacts 5.0
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(80)
+
+    property var vcardParserComponent
+    property var spy
+
+    UbuntuTestCase {
+        id: vcardParser
+        name: 'vcardParserTestCase'
+
+        function init()
+        {
+            vcardParserComponent = Qt.createQmlObject('import Ubuntu.Contacts 0.1; VCardParser{ }', root);
+            spy = Qt.createQmlObject('import QtTest 1.0; SignalSpy{ }', root);
+            spy.target = vcardParserComponent
+            spy.signalName = "vcardParsed"
+        }
+
+        function cleanup()
+        {
+            if (vcardParserComponent) {
+                vcardParserComponent.destroy()
+                vcardParserComponent = null
+            }
+            if (spy) {
+                spy.destroy()
+                spy = null
+            }
+        }
+
+        function test_import_file()
+        {
+            vcardParserComponent.vCardUrl = Qt.resolvedUrl("../data/vcard.vcf")
+            tryCompare(spy, "count", 1)
+            compare(spy.signalArguments[0][0], ContactModel.ImportNoError)
+            compare(vcardParserComponent.contacts.length, 3)
+        }
+    }
+}