From 67c41ecd4d9aa9d2e66ffae8a96ea0694c486ad8 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Mon, 20 Apr 2015 19:44:22 +0200 Subject: [PATCH] split the active call and dialer pages --- dialer/contents/ui/Call/CallPage.qml | 136 +++++++++++++++++++++++++++ dialer/contents/ui/Dialer.qml | 132 +------------------------- dialer/contents/ui/main.qml | 8 ++ 3 files changed, 146 insertions(+), 130 deletions(-) create mode 100644 dialer/contents/ui/Call/CallPage.qml diff --git a/dialer/contents/ui/Call/CallPage.qml b/dialer/contents/ui/Call/CallPage.qml new file mode 100644 index 00000000..f43e1c1b --- /dev/null +++ b/dialer/contents/ui/Call/CallPage.qml @@ -0,0 +1,136 @@ +/* + * Copyright 2014 Aaron Seigo + * Copyright 2014 Marco Martin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, or + * (at your option) any later version. + * + * 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 Library General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +import QtQuick 2.0 +import QtQuick.Layouts 1.1 +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.components 2.0 as PlasmaComponents +import org.nemomobile.voicecall 1.0 + +Item { + id: callPage + + state: voiceCallmanager.activeVoiceCall ? voiceCallmanager.activeVoiceCall.statusText : "disconnected" + property color textColor: "white" + property bool enableButtons: calling + + property string providerId: voiceCallmanager.providers.id(0) + + function secondsToTimeString(seconds) { + seconds = Math.floor(seconds/1000) + var h = Math.floor(seconds / 3600); + var m = Math.floor((seconds - (h * 3600)) / 60); + var s = seconds - h * 3600 - m * 60; + if(h < 10) h = '0' + h; + if(m < 10) m = '0' + m; + if(s < 10) s = '0' + s; + return '' + h + ':' + m + ':' + s; + } + + + ColumnLayout { + id: activeCallUi + spacing: 10 + + anchors { + fill: parent + margins: 20 + } + + Item { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.minimumHeight: parent.height/2 + Rectangle { + height: Math.min(parent.width, parent.height) + width: height + radius: 5 + anchors.centerIn: parent + PlasmaCore.IconItem { + anchors { + fill: parent + centerIn: parent + margins: 20 + } + source: "im-user" + } + } + } + Text { + Layout.fillWidth: true + Layout.minimumHeight: implicitHeight + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + font.pixelSize: one.font.pixelSize + color: textColor + text: voiceCallmanager.activeVoiceCall ? voiceCallmanager.activeVoiceCall.lineId : "" + } + Text { + Layout.fillWidth: true + Layout.minimumHeight: implicitHeight + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + font.pixelSize: theme.smallestFont.pixelSize + color: textColor + text: voiceCallmanager.activeVoiceCall ? secondsToTimeString(voiceCallmanager.activeVoiceCall.duration) : '' + } + PlasmaComponents.ButtonRow { + exclusive: false + spacing: 0 + Layout.alignment: Qt.AlignHCenter + PlasmaComponents.ToolButton { + id: muteButton + flat: false + iconSource: voiceCallmanager.isMicrophoneMuted ? "audio-volume-muted" : "audio-volume-high" + onClicked: { + voiceCallmanager.isMicrophoneMuted = !voiceCallmanager.isMicrophoneMuted; + } + } + PlasmaComponents.ToolButton { + id: dialerButton + flat: false + iconSource: "input-keyboard" + onClicked: { + print("show dialer") + } + } + } + + + + //TODO: swipe thing instead + PlasmaComponents.Button { + text: "Answer" + onClicked: { + if (voiceCallmanager.activeVoiceCall) { + voiceCallmanager.activeVoiceCall.answer(); + } + } + } + PlasmaComponents.Button { + text: "Hangup" + onClicked: { + if (voiceCallmanager.activeVoiceCall) { + voiceCallmanager.activeVoiceCall.hangup(); + } + } + } + } +} diff --git a/dialer/contents/ui/Dialer.qml b/dialer/contents/ui/Dialer.qml index fda8a458..d9278cf3 100644 --- a/dialer/contents/ui/Dialer.qml +++ b/dialer/contents/ui/Dialer.qml @@ -27,9 +27,7 @@ import org.nemomobile.voicecall 1.0 Item { id: dialer - state: voiceCallmanager.activeVoiceCall ? voiceCallmanager.activeVoiceCall.statusText : "disconnected" property color textColor: "white" - property bool calling: false // needs to be connected to a system service property bool enableButtons: calling property alias numberEntryText: status.text @@ -40,15 +38,13 @@ Item { } function call() { - if (!calling) { + if (!voiceCallmanager.activeVoiceCall) { console.log("Calling: " + status.text); - dialer.calling = true; voiceCallmanager.dial(providerId, status.text); } else { console.log("Hanging up: " + status.text); status.text = ''; - dialer.calling = false; var call = voiceCallmanager.activeVoiceCall; if (call) { call.hangup(); @@ -61,28 +57,8 @@ Item { status.text = "+41 76 555 5555" } - function secondsToTimeString(seconds) { - seconds = Math.floor(seconds/1000) - var h = Math.floor(seconds / 3600); - var m = Math.floor((seconds - (h * 3600)) / 60); - var s = seconds - h * 3600 - m * 60; - if(h < 10) h = '0' + h; - if(m < 10) m = '0' + m; - if(s < 10) s = '0' + s; - return '' + h + ':' + m + ':' + s; - } - - Behavior on opacity { - NumberAnimation { properties: "opacity"; duration: 100 } - } - - MouseArea { - anchors.fill: parent - } - ColumnLayout { id: dialPadArea - visible: dialer.state == "disconnected" anchors { fill: parent @@ -130,7 +106,7 @@ Item { } DialerIconButton { id: callButton - source: dialer.calling ? "call-stop" : "call-start" + source: "call-start" callback: call } DialerIconButton { @@ -138,110 +114,6 @@ Item { callback: function() { if (status.text.length > 0) { status.text = status.text.substr(0, status.text.length - 1); - } else { - dialer.calling = true; - dialer.calling = false; - } - } - } - } - } - - ColumnLayout { - id: activeCallUi - spacing: 10 - visible: dialer.state != "disconnected" - - anchors { - fill: parent - margins: 20 - } - - Item { - Layout.fillWidth: true - Layout.fillHeight: true - Layout.minimumHeight: parent.height/2 - Rectangle { - height: Math.min(parent.width, parent.height) - width: height - radius: 5 - anchors.centerIn: parent - PlasmaCore.IconItem { - anchors { - fill: parent - centerIn: parent - margins: 20 - } - source: "im-user" - } - } - } - Text { - Layout.fillWidth: true - Layout.minimumHeight: implicitHeight - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - font.pixelSize: one.font.pixelSize - color: textColor - text: voiceCallmanager.activeVoiceCall ? voiceCallmanager.activeVoiceCall.lineId : "" - } - Text { - Layout.fillWidth: true - Layout.minimumHeight: implicitHeight - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - font.pixelSize: theme.smallestFont.pixelSize - color: textColor - text: voiceCallmanager.activeVoiceCall ? secondsToTimeString(voiceCallmanager.activeVoiceCall.duration) : '' - } - RowLayout { - Layout.minimumHeight: parent.height / 3 - - Layout.fillWidth: true - Layout.fillHeight: true - - DialerIconButton { - Layout.fillWidth: true - Layout.fillHeight: true - source: dialer.state == "incoming" ? "call-start" : (voiceCallmanager.isMicrophoneMuted ? "audio-volume-muted" : "audio-volume-high") - Rectangle { - z: -1 - color: dialer.state == "incoming" ? "green" : "white" - opacity: 0.5 - radius: 5 - anchors { - fill: parent - } - } - - callback: function () { - if (dialer.state == "incoming") { - if (voiceCallmanager.activeVoiceCall) { - voiceCallmanager.activeVoiceCall.answer(); - } - } else { - voiceCallmanager.isMicrophoneMuted = !voiceCallmanager.isMicrophoneMuted; - } - } - } - - DialerIconButton { - Layout.fillWidth: true - Layout.fillHeight: true - source: "call-stop" - Rectangle { - z: -1 - color: "red" - opacity: 0.5 - radius: 5 - anchors { - fill: parent - } - } - - callback: function () { - if (voiceCallmanager.activeVoiceCall) { - voiceCallmanager.activeVoiceCall.hangup(); } } } diff --git a/dialer/contents/ui/main.qml b/dialer/contents/ui/main.qml index e8feb49d..9bf85b0a 100644 --- a/dialer/contents/ui/main.qml +++ b/dialer/contents/ui/main.qml @@ -32,6 +32,14 @@ ApplicationWindow { property int status: voiceCallmanager.activeVoiceCall ? voiceCallmanager.activeVoiceCall.status : 0 + onStatusChanged: { + if (status > 0) { + stackView.push(Qt.resolvedUrl("Call/CallPage.qml")); + } else { + stackView.pop(); + } + } + OfonoManager { id: ofonoManager onAvailableChanged: {