mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-23 06:38:07 +00:00
feat(Calls): StartingOutgoingCall in progress
This commit is contained in:
Ronan Abhamon
parent
77651510ae
commit
c2efc8f65b
9 changed files with 195 additions and 106 deletions
|
|
@ -1,17 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="96px" height="86px" viewBox="0 0 96 86" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>chat_add</title>
|
||||
<title>footer_chat</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="OUTILS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1438.000000, -6678.000000)">
|
||||
<g id="chat_add" sketch:type="MSLayerGroup" transform="translate(1426.000000, 6661.000000)">
|
||||
<g id="add_chat" transform="translate(15.000000, 20.000000)" stroke="#444444" stroke-width="5" sketch:type="MSShapeGroup" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M58.042,68.217 C52.621,70.69 46.491,72.083 40,72.083 C35.519,72.083 31.215,71.422 27.193,70.197 C27.195,70.17 15.238,82.821 4.54747351e-12,79.419 C4.54747351e-12,79.419 14.921,75.061 11.535,61.877 L11.426,61.267 C4.357,54.764 4.54747351e-12,45.862 4.54747351e-12,36.042 C4.54747351e-12,16.137 17.91,0 40,0 C62.089,0 80,16.137 80,36.042 C80,37.178 79.942,38.302 79.828,39.411 M21.375,29.662 L58.519,29.662 L21.375,29.662 Z M21.375,42.421 L58.519,42.421 L21.375,42.421 Z M58.843,68.319 C65.894,75.34 77.322,75.335 84.373,68.319 C91.425,61.299 91.425,49.926 84.373,42.907 C77.322,35.892 65.894,35.887 58.843,42.907 C51.793,49.923 51.793,61.302 58.843,68.319 L58.843,68.319 Z M81.135,55.616 L62.364,55.611 L81.135,55.616 Z M71.748,64.999 L71.752,46.228 L71.748,64.999 Z" id="Add-chat-icon"></path>
|
||||
</g>
|
||||
<rect id="Rectangle-232-Copy-25" opacity="0" fill-opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="120" height="120"></rect>
|
||||
<g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1892.000000, -17604.000000)">
|
||||
<g id="footer_chat" sketch:type="MSLayerGroup" transform="translate(1886.000000, 17599.000000)">
|
||||
<path d="M34.2995349,73.2744186 C34.2986047,73.2744186 23.1767442,85.0437209 9,81.8781395 C9,81.8781395 22.8818605,77.824186 19.732093,65.56 L19.6306977,64.9925581 C13.0548837,58.9432558 9,50.6632558 9,41.5274419 C9,23.0111628 25.6623256,8 46.2102326,8 C66.7590698,8 83.4195349,23.0111628 83.4195349,41.5274419 C83.4195349,60.0437209 66.7590698,75.0539535 46.2102326,75.0539535 C42.0427907,75.0539535 38.0381395,74.4390698 34.2976744,73.3004651 L34.2995349,73.2744186 L34.2995349,73.2744186 Z M28.8855814,35.5934884 L63.4381395,35.5934884 L28.8855814,35.5934884 Z M28.8855814,47.4613953 L63.4381395,47.4613953 L28.8855814,47.4613953 Z" stroke="#000000" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" sketch:type="MSShapeGroup"></path>
|
||||
<rect id="Rectangle-250-Copy-11" fill-opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="90" height="90"></rect>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.7 KiB |
15
tests/imgs/micro.svg
Normal file
15
tests/imgs/micro.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="86px" height="110px" viewBox="0 0 86 110" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>micro_default</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="OUTILS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1684.000000, -19406.000000)">
|
||||
<g id="micro_default" sketch:type="MSLayerGroup" transform="translate(1650.000000, 19384.000000)">
|
||||
<path d="M60.7415676,80.266982 C60.7415676,88.9543413 67.8156399,96.000931 76.537898,96.000931 C85.2628081,96.000931 92.3368803,88.9543413 92.3368803,80.266982 L92.3368803,40.7392333 C92.3368803,32.0465898 85.2628081,25 76.537898,25 C67.8156399,25 60.7415676,32.0465898 60.7415676,40.7392333 L60.7415676,80.266982 L60.7415676,80.266982 Z M106.449223,61.0784338 L106.449223,78.2510285 C106.449223,94.7102452 93.0568843,108.047772 76.537898,108.047772 M76.537898,108.047772 L76.537898,126.604849 L76.537898,108.047772 Z M67.2308853,128.67893 L85.8488887,128.67893 L67.2308853,128.67893 Z M46.6278985,61.0784338 L46.6278985,78.2510285 C46.6278985,94.7102452 60.0202377,108.047772 76.539224,108.047772 M37,116.691536 L117,36.9873932 L37,116.691536 Z" id="micro_off" stroke="#444444" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" sketch:type="MSShapeGroup"></path>
|
||||
<rect id="Rectangle-250-Copy-6" fill-opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="154" height="154"></rect>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
15
tests/imgs/speaker.svg
Normal file
15
tests/imgs/speaker.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="81px" height="76px" viewBox="0 0 81 76" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>speaker_default</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="OUTILS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1687.000000, -19654.000000)">
|
||||
<g id="speaker_default" sketch:type="MSLayerGroup" transform="translate(1650.000000, 19615.000000)">
|
||||
<path d="M40.6037277,91.6756079 L62.7723729,91.6756079 L87.7430251,112 L87.7430251,42 L62.7723729,62.3232222 L40,62.3232222 L40,91.6756079 L40.6037277,91.6756079 L40.6037277,91.6756079 Z M100.025925,83.8736525 C104.044857,79.900727 104.044857,73.4605164 100.025925,69.4899306 M109.562455,89.6552185 C116.811923,82.4908498 116.813107,70.8715635 109.562455,63.7071948" id="speaker_on" stroke="#444444" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" sketch:type="MSShapeGroup"></path>
|
||||
<rect id="Rectangle-250-Copy-7" fill-opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="154" height="154"></rect>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -22,7 +22,9 @@
|
|||
<file>imgs/linphone.png</file>
|
||||
<file>imgs/lost_incoming_call.svg</file>
|
||||
<file>imgs/lost_outgoing_call.svg</file>
|
||||
<file>imgs/micro.svg</file>
|
||||
<file>imgs/right_arrow.svg</file>
|
||||
<file>imgs/speaker.svg</file>
|
||||
<file>imgs/valid.svg</file>
|
||||
<file>languages/en.qm</file>
|
||||
<file>languages/fr.qm</file>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,10 @@ Rectangle {
|
|||
|
||||
anchors.fill: parent
|
||||
color: PopupStyle.backgroundColor
|
||||
layer.enabled: true
|
||||
layer.effect: PopupShadow { }
|
||||
|
||||
layer {
|
||||
enabled: true
|
||||
effect: PopupShadow { }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ Window {
|
|||
resizeAInPriority: true
|
||||
|
||||
// Call.
|
||||
childA: StartingIncomingCall {
|
||||
childA: StartingOutgoingCall {
|
||||
anchors.fill: parent
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,96 @@
|
|||
import QtQuick 2.7
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
Item {
|
||||
import Linphone 1.0
|
||||
|
||||
Rectangle {
|
||||
default property alias actionArea: actionArea.data
|
||||
property alias callType: callType.text
|
||||
property alias sipAddress: contactDescription.sipAddress
|
||||
property alias username: contactDescription.username
|
||||
property alias avatarImage: image.source
|
||||
|
||||
color: '#EAEAEA'
|
||||
|
||||
ColumnLayout {
|
||||
anchors {
|
||||
fill: parent
|
||||
margins: 20
|
||||
}
|
||||
|
||||
spacing: 0
|
||||
|
||||
// Call type.
|
||||
Column {
|
||||
Layout.fillWidth: true
|
||||
|
||||
Text {
|
||||
id: callType
|
||||
|
||||
color: '#8E8E8E'
|
||||
font.bold: true
|
||||
font.pointSize: 17
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
width: parent.width
|
||||
}
|
||||
|
||||
Text {
|
||||
color: '#8E8E8E'
|
||||
font.bold: true
|
||||
font.pointSize: 17
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: '...'
|
||||
width: parent.width
|
||||
}
|
||||
}
|
||||
|
||||
// Contact area.
|
||||
Item {
|
||||
id: contactContainer
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Item {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
implicitHeight: contactDescription.height + image.height
|
||||
width: parent.width
|
||||
|
||||
ContactDescription {
|
||||
id: contactDescription
|
||||
|
||||
height: 60
|
||||
horizontalTextAlignment: Text.AlignHCenter
|
||||
width: parent.width
|
||||
}
|
||||
|
||||
RoundedImage {
|
||||
id: image
|
||||
|
||||
function _computeImageSize () {
|
||||
var height = contactContainer.height - contactDescription.height
|
||||
var width = contactContainer.width
|
||||
|
||||
var size = height < 400 ? height : 400
|
||||
return size < width ? size : width
|
||||
}
|
||||
|
||||
anchors.top: contactDescription.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
height: _computeImageSize()
|
||||
width: height
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Actions area.
|
||||
Item {
|
||||
id: actionArea
|
||||
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 80
|
||||
Layout.topMargin: 20
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,102 +1,25 @@
|
|||
import QtQuick 2.7
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
import Linphone 1.0
|
||||
|
||||
Rectangle {
|
||||
color: '#EAEAEA'
|
||||
StartingCall {
|
||||
avatarImage: "qrc:/imgs/cat_contact.jpg"
|
||||
callType: 'INCOMING CALL'
|
||||
sipAddress: 'mister-meow@sip-linphone.org'
|
||||
username: 'Mister Meow'
|
||||
|
||||
ColumnLayout {
|
||||
anchors {
|
||||
fill: parent
|
||||
margins: 20
|
||||
ActionBar {
|
||||
anchors.centerIn: parent
|
||||
iconSize: 40
|
||||
|
||||
ActionButton {
|
||||
icon: 'cam'
|
||||
}
|
||||
|
||||
spacing: 0
|
||||
|
||||
// Call type.
|
||||
Column {
|
||||
Layout.fillWidth: true
|
||||
|
||||
Text {
|
||||
color: '#8E8E8E'
|
||||
font.bold: true
|
||||
font.pointSize: 17
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: 'INCOMING CALL'
|
||||
width: parent.width
|
||||
}
|
||||
|
||||
Text {
|
||||
color: '#8E8E8E'
|
||||
font.bold: true
|
||||
font.pointSize: 17
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: '...'
|
||||
width: parent.width
|
||||
}
|
||||
ActionButton {
|
||||
icon: 'call'
|
||||
}
|
||||
|
||||
// Contact area.
|
||||
Item {
|
||||
id: contactContainer
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Item {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
implicitHeight: contactDescription.height + image.height
|
||||
width: parent.width
|
||||
|
||||
ContactDescription {
|
||||
id: contactDescription
|
||||
|
||||
height: 60
|
||||
horizontalTextAlignment: Text.AlignHCenter
|
||||
sipAddress: 'mister-meow@sip-linphone.org'
|
||||
username: 'Mister Meow'
|
||||
width: parent.width
|
||||
}
|
||||
|
||||
RoundedImage {
|
||||
id: image
|
||||
|
||||
function _computeImageSize () {
|
||||
var height = contactContainer.height - contactDescription.height
|
||||
var width = contactContainer.width
|
||||
|
||||
var size = height < 400 ? height : 400
|
||||
return size < width ? size : width
|
||||
}
|
||||
|
||||
anchors.top: contactDescription.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
height: _computeImageSize()
|
||||
source: "qrc:/imgs/cat_contact.jpg"
|
||||
width: height
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Actions area.
|
||||
ActionBar {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.bottomMargin: 20
|
||||
Layout.topMargin: 20
|
||||
iconSize: 40
|
||||
|
||||
ActionButton {
|
||||
icon: 'cam'
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'call'
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'hangup'
|
||||
}
|
||||
ActionButton {
|
||||
icon: 'hangup'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,50 @@
|
|||
import QtQuick 2.7
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
Item {
|
||||
import Linphone 1.0
|
||||
|
||||
StartingCall {
|
||||
avatarImage: "qrc:/imgs/cat_contact.jpg"
|
||||
callType: 'OUTGOING CALL'
|
||||
sipAddress: 'mister-meow@sip-linphone.org'
|
||||
username: 'Mister Meow'
|
||||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
spacing: 0
|
||||
|
||||
ActionBar {
|
||||
iconSize: 40
|
||||
|
||||
ActionButton {
|
||||
icon: 'micro'
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'speaker'
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'cam'
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Cam.
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
}
|
||||
|
||||
ActionBar {
|
||||
iconSize: 40
|
||||
|
||||
ActionButton {
|
||||
icon: 'hangup'
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'chat'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue