Fix examples/qmlcontacts and bring it back to life.

Adapts the example to new enum values for detail types.
Adaptation to field values still missing.
It also fixes a layout issue in the ToolBar.

Change-Id: Icb87c8b9fe7874be1dc379f04ae0dcd78d4e579a
Reviewed-by: Andy Cox <andrew.cox@nokia.com>

3 files changed, 70 insertions, 6 deletions

diff --git a/examples/qmlcontacts/contents/ContactView.qml b/examples/qmlcontacts/contents/ContactView.qml
index 3166e512c..31c484fab 100644
--- a/examples/qmlcontacts/contents/ContactView.qml
+++ b/examples/qmlcontacts/contents/ContactView.qml
@@ -41,6 +41,7 @@
 
 import QtQuick 2.0
 import QtContacts 5.0
+import "enumhelper.js" as EnumHelper
 
 Item {
     property variant contact
@@ -226,7 +227,7 @@ Item {
                     width: detailView.width - 6;
                     height: 30
                     horizontalAlignment: Text.AlignHCenter
-                    text: modelData.definitionName;
+                    text: EnumHelper.detailTypeToString(modelData.type);
                     verticalAlignment: Text.AlignVCenter
                     color: "white";
                     font.weight: Font.Bold
@@ -235,7 +236,7 @@ Item {
                     id: fieldView
 
                     property variant detail: modelData
-                    model: modelData.fieldNames
+                    model: detail.fields.length
 
                     delegate:
                         Item {
@@ -247,7 +248,7 @@ Item {
                                 height: 20;
                                 anchors.margins: 3
                                 anchors.left: parent.left
-                                text: modelData
+                                text: fieldView.detail.fields[index]
                                 color: "white"
                             }
                             Text {
@@ -257,7 +258,7 @@ Item {
                                 anchors.rightMargin: 3
                                 height: 30
                                 color: "white"
-                                text: fieldView.detail.value(modelData).toString()
+                                text: fieldView.detail.value(parseInt(fieldName.text))
                             }
                         }
                 }
diff --git a/examples/qmlcontacts/contents/ToolBar.qml b/examples/qmlcontacts/contents/ToolBar.qml
index 43522ac5b..3732d9a46 100644
--- a/examples/qmlcontacts/contents/ToolBar.qml
+++ b/examples/qmlcontacts/contents/ToolBar.qml
@@ -63,8 +63,6 @@ Item {
             color: "black"
             width: 35
             height: 20
-            anchors.left: parent.left//; anchors.leftMargin: 0
-            anchors.verticalCenter: parent.verticalCenter
             Text {
                 id: fpsText
                 color: "white"
diff --git a/examples/qmlcontacts/contents/enumhelper.js b/examples/qmlcontacts/contents/enumhelper.js
new file mode 100644
index 000000000..91ae886f4
--- /dev/null
+++ b/examples/qmlcontacts/contents/enumhelper.js
@@ -0,0 +1,65 @@
+function detailTypeToString(detailType) {
+    switch (detailType) {
+    case ContactDetail.Address:
+        return "Address";
+    case ContactDetail.Anniversary:
+        return "Anniversary";
+    case ContactDetail.Avatar:
+        return "Avatar";
+    case ContactDetail.Birthday:
+        return "Birthday";
+    case ContactDetail.DisplayLabel:
+        return "DisplayLabel";
+    case ContactDetail.Email:
+        return "Email";
+    case ContactDetail.ExtendedDetail:
+        return "ExtDetail";
+    case ContactDetail.Family:
+        return "Family";
+    case ContactDetail.Favorite:
+        return "Favorite";
+    case ContactDetail.Gender:
+        return "Gender";
+    case ContactDetail.Geolocation:
+        return "GeoLocation";
+    case ContactDetail.GlobalPresence:
+        return "GlobalPresence";
+    case ContactDetail.Guid:
+        return "Guid";
+    case ContactDetail.Hobby:
+        return "Hobby";
+    case ContactDetail.Name:
+        return "Name";
+    case ContactDetail.NickName:
+        return "NickName";
+    case ContactDetail.Note:
+        return "Note";
+    case ContactDetail.OnlineAccount:
+        return "OnlineAccount";
+    case ContactDetail.Organization:
+        return "Organization";
+    case ContactDetail.PersonId:
+        return "PersonId";
+    case ContactDetail.PhoneNumber:
+        return "PhoneNumber";
+    case ContactDetail.Presence:
+        return "Presence";
+    case ContactDetail.Ringtone:
+        return "Ringtone";
+    case ContactDetail.SyncTarget:
+        return "SyncTarget";
+    case ContactDetail.Tag:
+        return "Tag";
+    case ContactDetail.Timestamp:
+        return "Timestamp";
+    case ContactDetail.Type:
+        return "Type";
+    case ContactDetail.Url:
+        return "Url";
+    case ContactDetail.Version:
+        return "Version";
+    default:
+        console.log("UNKNOWN TYPE: " + detailType)
+        return "Unknown"
+    }
+}