mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-07 14:44:01 +00:00
feat(app): calls views in progress
This commit is contained in:
Ronan Abhamon
parent
e07748ba0b
commit
854cbeb674
12 changed files with 130 additions and 7 deletions
13
tests/assets/images/micro_on_hovered.svg
Normal file
13
tests/assets/images/micro_on_hovered.svg
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>micro_off</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="micro_off">
|
||||
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#D0D8DE"></path>
|
||||
<path d="M15.680106,21.1588052 C15.680106,23.2272241 17.3725587,24.9049836 19.4593354,24.9049836 C21.5467466,24.9049836 23.2391993,23.2272241 23.2391993,21.1588052 L23.2391993,11.7474365 C23.2391993,9.67775946 21.5467466,8 19.4593354,8 C17.3725587,8 15.680106,9.67775946 15.680106,11.7474365 L15.680106,21.1588052 L15.680106,21.1588052 Z M26.6155393,16.5901033 L26.6155393,20.6788163 C26.6155393,24.5976774 23.4114583,27.7732791 19.4593354,27.7732791 M19.4593354,27.7732791 L19.4593354,32.1916307 L19.4593354,27.7732791 Z M17.2326577,32.6854594 L21.6869648,32.6854594 L17.2326577,32.6854594 Z M12.3034487,16.5901033 L12.3034487,20.6788163 C12.3034487,24.5976774 15.5075297,27.7732791 19.4596526,27.7732791 M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
13
tests/assets/images/micro_on_normal.svg
Normal file
13
tests/assets/images/micro_on_normal.svg
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>micro_on</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="micro_on">
|
||||
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#4B5964"></path>
|
||||
<path d="M15.680106,21.1588052 C15.680106,23.2272241 17.3725587,24.9049836 19.4593354,24.9049836 C21.5467466,24.9049836 23.2391993,23.2272241 23.2391993,21.1588052 L23.2391993,11.7474365 C23.2391993,9.67775946 21.5467466,8 19.4593354,8 C17.3725587,8 15.680106,9.67775946 15.680106,11.7474365 L15.680106,21.1588052 L15.680106,21.1588052 Z M26.6155393,16.5901033 L26.6155393,20.6788163 C26.6155393,24.5976774 23.4114583,27.7732791 19.4593354,27.7732791 M19.4593354,27.7732791 L19.4593354,32.1916307 L19.4593354,27.7732791 Z M17.2326577,32.6854594 L21.6869648,32.6854594 L17.2326577,32.6854594 Z M12.3034487,16.5901033 L12.3034487,20.6788163 C12.3034487,24.5976774 15.5075297,27.7732791 19.4596526,27.7732791" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
13
tests/assets/images/micro_on_pressed.svg
Normal file
13
tests/assets/images/micro_on_pressed.svg
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>micro_off_clic</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="micro_off_clic">
|
||||
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#FF5E00"></path>
|
||||
<path d="M15.680106,21.1588052 C15.680106,23.2272241 17.3725587,24.9049836 19.4593354,24.9049836 C21.5467466,24.9049836 23.2391993,23.2272241 23.2391993,21.1588052 L23.2391993,11.7474365 C23.2391993,9.67775946 21.5467466,8 19.4593354,8 C17.3725587,8 15.680106,9.67775946 15.680106,11.7474365 L15.680106,21.1588052 L15.680106,21.1588052 Z M26.6155393,16.5901033 L26.6155393,20.6788163 C26.6155393,24.5976774 23.4114583,27.7732791 19.4593354,27.7732791 M19.4593354,27.7732791 L19.4593354,32.1916307 L19.4593354,27.7732791 Z M17.2326577,32.6854594 L21.6869648,32.6854594 L17.2326577,32.6854594 Z M12.3034487,16.5901033 L12.3034487,20.6788163 C12.3034487,24.5976774 15.5075297,27.7732791 19.4596526,27.7732791 M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
14
tests/assets/images/speaker_on_hovered.svg
Normal file
14
tests/assets/images/speaker_on_hovered.svg
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>speaker_off</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="speaker_off">
|
||||
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#D0D8DE"></path>
|
||||
<path d="M10.1559954,23.7737278 L15.8840871,23.7737278 L22.3361811,29 L22.3361811,11 L15.8840871,16.2259714 L10,16.2259714 L10,23.7737278 L10.1559954,23.7737278 L10.1559954,23.7737278 Z M25.5099238,21.7675107 C26.548364,20.7459012 26.548364,19.0898471 25.5099238,18.0688393 M27.9740401,23.254199 C29.8472089,21.4119328 29.8475148,18.4241163 27.9740401,16.5818501" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
<path d="M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
13
tests/assets/images/speaker_on_normal.svg
Normal file
13
tests/assets/images/speaker_on_normal.svg
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>speaker_on</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="speaker_on">
|
||||
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#4B5964"></path>
|
||||
<path d="M10.1559954,23.7737278 L15.8840871,23.7737278 L22.3361811,29 L22.3361811,11 L15.8840871,16.2259714 L10,16.2259714 L10,23.7737278 L10.1559954,23.7737278 L10.1559954,23.7737278 Z M25.5099238,21.7675107 C26.548364,20.7459012 26.548364,19.0898471 25.5099238,18.0688393 M27.9740401,23.254199 C29.8472089,21.4119328 29.8475148,18.4241163 27.9740401,16.5818501" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
14
tests/assets/images/speaker_on_pressed.svg
Normal file
14
tests/assets/images/speaker_on_pressed.svg
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>speaker_off_clic</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="speaker_off_clic">
|
||||
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#FF5E00"></path>
|
||||
<path d="M10.1559954,23.7737278 L15.8840871,23.7737278 L22.3361811,29 L22.3361811,11 L15.8840871,16.2259714 L10,16.2259714 L10,23.7737278 L10.1559954,23.7737278 L10.1559954,23.7737278 Z M25.5099238,21.7675107 C26.548364,20.7459012 26.548364,19.0898471 25.5099238,18.0688393 M27.9740401,23.254199 C29.8472089,21.4119328 29.8475148,18.4241163 27.9740401,16.5818501" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
<path d="M10,29.8313182 L29.1397841,10.8541412 L10,29.8313182 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -44,10 +44,16 @@
|
|||
<file>assets/images/led_red.svg</file>
|
||||
<file>assets/images/led_white.svg</file>
|
||||
<file>assets/images/linphone.png</file>
|
||||
<file>assets/images/micro_on_hovered.svg</file>
|
||||
<file>assets/images/micro_on_normal.svg</file>
|
||||
<file>assets/images/micro_on_pressed.svg</file>
|
||||
<file>assets/images/missed_incoming_call.svg</file>
|
||||
<file>assets/images/missed_outgoing_call.svg</file>
|
||||
<file>assets/images/outgoing_call.svg</file>
|
||||
<file>assets/images/search.svg</file>
|
||||
<file>assets/images/speaker_on_hovered.svg</file>
|
||||
<file>assets/images/speaker_on_normal.svg</file>
|
||||
<file>assets/images/speaker_on_pressed.svg</file>
|
||||
<file>assets/images/tooltip_arrow_bottom.svg</file>
|
||||
<file>assets/images/tooltip_arrow_left.svg</file>
|
||||
<file>assets/images/tooltip_arrow_right.svg</file>
|
||||
|
|
@ -71,6 +77,7 @@
|
|||
<file>ui/modules/Common/Form/AbstractTextButton.qml</file>
|
||||
<file>ui/modules/Common/Form/ActionBar.qml</file>
|
||||
<file>ui/modules/Common/Form/ActionButton.qml</file>
|
||||
<file>ui/modules/Common/Form/ActionSwitch.qml</file>
|
||||
<file>ui/modules/Common/Form/CheckBoxText.qml</file>
|
||||
<file>ui/modules/Common/Form/ExclusiveButtons.qml</file>
|
||||
<file>ui/modules/Common/Form/ListForm.qml</file>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ Button {
|
|||
// `icon`_pressed, `icon`_hovered and `icon`_normal.
|
||||
property string icon
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
function _getIcon () {
|
||||
if (!useStates) {
|
||||
return button.icon
|
||||
|
|
@ -29,6 +31,8 @@ Button {
|
|||
)
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
background: Rectangle {
|
||||
color: 'transparent'
|
||||
}
|
||||
|
|
|
|||
27
tests/ui/modules/Common/Form/ActionSwitch.qml
Normal file
27
tests/ui/modules/Common/Form/ActionSwitch.qml
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
import QtQuick 2.7
|
||||
|
||||
// ===================================================================
|
||||
|
||||
Item {
|
||||
property alias useStates: actionButton.useStates
|
||||
property int iconSize // Optionnal.
|
||||
property string icon
|
||||
|
||||
property bool enabled: true
|
||||
|
||||
signal onClicked
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
height: iconSize || parent.iconSize || parent.height
|
||||
width: iconSize || parent.iconSize || parent.height
|
||||
|
||||
ActionButton {
|
||||
id: actionButton
|
||||
|
||||
anchors.fill: parent
|
||||
icon: parent.icon + (parent.enabled ? '_on' : '_off')
|
||||
|
||||
onClicked: parent.onClicked
|
||||
}
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@ ForceScrollBar 1.0 ForceScrollBar.qml
|
|||
# Form
|
||||
ActionBar 1.0 Form/ActionBar.qml
|
||||
ActionButton 1.0 Form/ActionButton.qml
|
||||
ActionSwitch 1.0 Form/ActionSwitch.qml
|
||||
CheckBoxText 1.0 Form/CheckBoxText.qml
|
||||
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
|
||||
LightButton 1.0 Form/LightButton.qml
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ Window {
|
|||
resizeAInPriority: true
|
||||
|
||||
// Call.
|
||||
childA: IncomingCall {
|
||||
childA: OutgoingCall {
|
||||
anchors.fill: parent
|
||||
sipAddress: 'sip:erwan.croze@sip.linphone.org'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,15 +8,19 @@ AbstractCall {
|
|||
: 'OUTGOING AUDIO CALL'
|
||||
|
||||
ActionBar {
|
||||
anchors.centerIn: parent
|
||||
iconSize: 40
|
||||
anchors {
|
||||
left: parent.left
|
||||
leftMargin: 50
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
iconSize: 40
|
||||
|
||||
ActionButton {
|
||||
icon: 'video_call_accept'
|
||||
ActionSwitch {
|
||||
icon: 'micro'
|
||||
}
|
||||
|
||||
ActionButton {
|
||||
icon: 'call_accept'
|
||||
ActionSwitch {
|
||||
icon: 'speaker'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue