Merge lp:~tiagosh/messaging-app/fix-phone-label into lp:messaging-app

[Tiago Salem Herrmann]

include phone label to the messaging thread view title.

include phone label to the messaging thread view title.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4194
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3778/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3780/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6077/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5139

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/186/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-phone-label]

86. By Tiago Salem Herrmann on 2014-03-25

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/194/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/109
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4300
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4300/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3813
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6105
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5181

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/194/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/198/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/113
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4405
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6186
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5306

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/198/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

86. By Tiago Salem Herrmann on 2014-03-25

merge trunk

85. By Tiago Salem Herrmann on 2014-03-24

add phone label to the view title

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-03-20 18:39:45 +0000
+++ src/qml/Messages.qml	2014-03-25 12:50:42 +0000
@@ -41,6 +41,7 @@
     property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
     property bool landscape: orientationAngle == 90 || orientationAngle == 270
     property bool pendingMessage: false
+    property string phoneNumberSubTypeLabel: ""
     flickable: null
     title: {
         if (landscape) {
@@ -51,7 +52,7 @@
             if (contactWatcher.isUnknown) {
                 firstRecipient = contactWatcher.phoneNumber
             } else {
-                firstRecipient = contactWatcher.alias
+                firstRecipient = contactWatcher.alias + phoneNumberSubTypeLabel
             }
             if (participants.length == 1) {
                 return firstRecipient
@@ -68,6 +69,10 @@
         threadId = getCurrentThreadId()
     }
 
+    function updateSubTypeLabel() {
+        phoneNumberSubTypeLabel = contactWatcher.isUnknown ? "" : " - " + phoneTypeModel.get(phoneTypeModel.getTypeIndex(phoneDetail)).label
+    }
+
     function getCurrentThreadId() {
         if (participants.length == 0)
             return ""
@@ -193,7 +198,21 @@
     ContactWatcher {
         id: contactWatcher
         phoneNumber: participants.length > 0 ? participants[0] : ""
-    }
+        onIsUnknownChanged: updateSubTypeLabel();
+    }
+
+    PhoneNumber {
+        id: phoneDetail
+        contexts: contactWatcher.phoneNumberContexts
+        subTypes: contactWatcher.phoneNumberSubTypes
+        onSubTypesChanged: updateSubTypeLabel();
+        onContextsChanged: updateSubTypeLabel();
+    }
+
+    ContactDetailPhoneNumberTypeModel {
+        id: phoneTypeModel
+    }
+
 
     onParticipantsChanged: {
         threadId = getCurrentThreadId()