Merge lp:~tiagosh/dialer-app/fix-1225060 into lp:dialer-app

[Tiago Salem Herrmann]

Replace the current contact/phone number by the dtmf string on the live call view.

Replace the current contact/phone number by the dtmf string on the live call view.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/62/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

works well.
One issue is numbers go offscreen if you enter too many.
Consider limiting the numbers that are entered and start removing from the beginning of string so that new numbers don't go offscreen. guess the size limit would need to be somewhat dependent on the screen size/resolution.

review: Needs Fixing

[lp:~tiagosh/dialer-app/fix-1225060]

52. By Tiago Salem Herrmann on 2013-10-01

drop the first character when the string can't fit the page header

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/68/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

works well

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2013-09-27 17:35:35 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2013-10-01 19:06:02 +0000
@@ -30,6 +30,7 @@
     id: liveCall
 
     property QtObject call: callManager.foregroundCall
+    property string dtmfEntry: ""
     property alias number: contactWatcher.phoneNumber
     property bool onHold: call ? call.held : false
     property bool isSpeaker: call ? call.speaker : false
@@ -51,7 +52,7 @@
     }
 
     // TRANSLATORS: %1 is the duration of the call
-    title: contactWatcher.alias != "" ? contactWatcher.alias : contactWatcher.phoneNumber
+    title: dtmfLabelHelper.text !== "" ? dtmfLabelHelper.text : contactWatcher.alias != "" ? contactWatcher.alias : contactWatcher.phoneNumber
     tools: ToolbarItems {
         opened: false
         locked: true
@@ -63,6 +64,26 @@
         }
     }
 
+    // FIXME: this invisible label is only used for
+    // calculating the size of the screen and resizing
+    // the dtmf string accordingly so it can fit the page header
+    Label {
+        id: dtmfLabelHelper
+        visible: false
+        text: dtmfEntry
+        anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
+        anchors.right: parent.right
+        anchors.rightMargin: units.gu(4)
+        fontSize: "x-large"
+        onTextChanged: {
+            if(paintedWidth > width) {
+                // drop the first number
+                dtmfEntry = dtmfEntry.substr(1)
+            }
+        }
+    }
+
     Item {
         id: helper
         function updateSubTypeLabel() {
@@ -191,6 +212,7 @@
             onKeyPressed: {
                 //keypadEntry.value += label
                 if (call) {
+                    dtmfEntry += label
                     call.sendDTMF(label)
                 }
             }