diff --git a/resources.qrc b/resources.qrc
index 37166ba43..235a56bc2 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -368,6 +368,7 @@
ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml
ui/modules/Linphone/TelKeypad/TelKeypadButton.qml
+ ui/modules/Linphone/TelKeypad/TelKeypad.js
ui/modules/Linphone/TelKeypad/TelKeypad.qml
ui/modules/Linphone/Timeline/Timeline.js
ui/modules/Linphone/Timeline/Timeline.qml
diff --git a/ui/modules/Linphone/TelKeypad/TelKeypad.js b/ui/modules/Linphone/TelKeypad/TelKeypad.js
new file mode 100644
index 000000000..8b4c3b191
--- /dev/null
+++ b/ui/modules/Linphone/TelKeypad/TelKeypad.js
@@ -0,0 +1,51 @@
+// =============================================================================
+// `TelKeypad.qml` Logic.
+// =============================================================================
+
+.import Linphone.Styles 1.0 as LinphoneStyles
+
+.import 'qrc:/ui/scripts/Utils/utils.js' as Utils
+
+// =============================================================================
+
+function mapKeyToButtonIndex (key) {
+ // Digits.
+ if (key === 48) {
+ return 13
+ }
+
+ if (key >= 49 && key <= 57) {
+ return (key - 49) + parseInt((key - 49) / 3)
+ }
+
+ // A, B, C and D.
+ if (key >= 65 && key <= 68) {
+ return (key - 65) * 4 + 3
+ }
+
+ // *
+ if (key === 42) {
+ return 12
+ }
+
+ // #
+ if (key === 35) {
+ return 14
+ }
+}
+
+function sendDtmf (index) {
+ var children = grid.children[index]
+
+ children.color = LinphoneStyles.TelKeypadStyle.button.color.pressed
+ children.clicked()
+
+ var timeout = children._timeout
+ if (timeout) {
+ Utils.clearTimeout(timeout)
+ }
+
+ children._timeout = Utils.setTimeout(dragBox, 100, (function (index) {
+ grid.children[index].color = LinphoneStyles.TelKeypadStyle.button.color.normal
+ }).bind(dragBox, index))
+}
diff --git a/ui/modules/Linphone/TelKeypad/TelKeypad.qml b/ui/modules/Linphone/TelKeypad/TelKeypad.qml
index 37ebc9f73..b3dd30e2c 100644
--- a/ui/modules/Linphone/TelKeypad/TelKeypad.qml
+++ b/ui/modules/Linphone/TelKeypad/TelKeypad.qml
@@ -3,7 +3,8 @@ import QtQuick.Layouts 1.3
import Common 1.0
import Linphone.Styles 1.0
-import Utils 1.0
+
+import 'TelKeypad.js' as Logic
// =============================================================================
@@ -23,6 +24,14 @@ Rectangle {
height: TelKeypadStyle.height
width: TelKeypadStyle.width
+ Keys.onPressed: {
+ var index = Logic.mapKeyToButtonIndex(event.key)
+ if (index != null) {
+ event.accepted = true;
+ Logic.sendDtmf(index)
+ }
+ }
+
// ---------------------------------------------------------------------------
GridLayout {
@@ -82,24 +91,11 @@ Rectangle {
_mouseX = mouse.x
_mouseY = mouse.y
_id = parseInt(_mouseX / (parent.width / grid.columns)) + parseInt(_mouseY / (parent.height / grid.rows)) * grid.columns
+
+ telKeypad.focus = true
}
- onReleased: {
- if (Math.abs(_mouseX - mouse.x) <= delta && Math.abs(_mouseY - mouse.y) <= delta) {
- var children = grid.children[_id]
-
- children.color = TelKeypadStyle.button.color.pressed
- children.clicked()
-
- var timeout = children._timeout
- if (timeout) {
- Utils.clearTimeout(timeout)
- }
-
- children._timeout = Utils.setTimeout(this, 100, (function (id) {
- grid.children[id].color = TelKeypadStyle.button.color.normal
- }).bind(this, _id))
- }
- }
+ onReleased: Math.abs(_mouseX - mouse.x) <= delta && Math.abs(_mouseY - mouse.y) <= delta &&
+ Logic.sendDtmf(_id)
}
}