diff --git a/dialer/contents/ui/Call/AnswerSwipe.qml b/dialer/contents/ui/Call/AnswerSwipe.qml index 92fb1474..1bd235a5 100644 --- a/dialer/contents/ui/Call/AnswerSwipe.qml +++ b/dialer/contents/ui/Call/AnswerSwipe.qml @@ -43,6 +43,28 @@ MouseArea { anchors.fill: parent radius: height color: Qt.rgba((handlePosition > root.width/2 ? 0.6 : 0)+0.2, (handlePosition < root.width/2 ? 0.6 : 0)+0.2, 0.2, Math.abs(handlePosition - (root.width/2)) / answerHandle.width/2); + + PlasmaCore.IconItem { + source: "call-start" + width: icon.width + height: width + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: units.largeSpacing + } + } + PlasmaCore.IconItem { + source: "call-stop" + width: icon.width + height: width + anchors { + verticalCenter: parent.verticalCenter + right: parent.right + leftMargin: units.largeSpacing + } + } + Rectangle { id: answerHandle x: parent.width/2 - width/2 @@ -51,6 +73,7 @@ MouseArea { radius: width color: Qt.rgba(0.2, 0.8, 0.2, 1) PlasmaCore.IconItem { + id: icon source: "call-start" width: parent.width * 0.7 height: width diff --git a/dialer/contents/ui/Dialer.qml b/dialer/contents/ui/Dialer.qml index 7a6b286e..02ec4e05 100644 --- a/dialer/contents/ui/Dialer.qml +++ b/dialer/contents/ui/Dialer.qml @@ -113,19 +113,17 @@ Item { source: "call-start" callback: call } - DialerButton { + Item { Layout.minimumWidth: dialPadArea.width/3 Layout.fillWidth: true Layout.fillHeight: true - enabled: status.text.length > 0 - opacity: enabled ? 1 : 0.5 - text: i18n("Call") - callback: call } DialerIconButton { Layout.fillWidth: true Layout.fillHeight: true Layout.minimumWidth: dialPadArea.width/3 + enabled: status.text.length > 0 + opacity: enabled ? 1 : 0.5 source: "edit-clear" callback: function() { if (status.text.length > 0) { diff --git a/dialer/contents/ui/main.qml b/dialer/contents/ui/main.qml index a1d3c62a..17bc24cb 100644 --- a/dialer/contents/ui/main.qml +++ b/dialer/contents/ui/main.qml @@ -22,6 +22,7 @@ import QtQuick.Controls 1.3 import QtQuick.Layouts 1.1 import org.nemomobile.voicecall 1.0 import MeeGo.QOfono 0.2 +import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras ApplicationWindow {