Commit 1a491130 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(ui/views/App/Calls/ConferenceManager): in progress

parent 3a93ac85
...@@ -17,7 +17,15 @@ Window { ...@@ -17,7 +17,15 @@ Window {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
property var call: calls.selectedCall // `{}` is a workaround to avoid `TypeError: Cannot read property...`.
property var call: calls.selectedCall || ({
isOutgoing: true,
sipAddress: '',
recording: false,
updating: true,
videoEnabled: false
})
readonly property bool chatIsOpened: !rightPaned.isClosed() readonly property bool chatIsOpened: !rightPaned.isClosed()
property string sipAddress: call ? call.sipAddress : '' property string sipAddress: call ? call.sipAddress : ''
......
...@@ -123,22 +123,27 @@ Rectangle { ...@@ -123,22 +123,27 @@ Rectangle {
ActionButton { ActionButton {
icon: 'screenshot' icon: 'screenshot'
visible: call.videoEnabled visible: incall.call.videoEnabled
onClicked: call.takeSnapshot() onClicked: incall.call.takeSnapshot()
} }
ActionSwitch { ActionSwitch {
enabled: call.recording enabled: incall.call.recording
icon: 'record' icon: 'record'
useStates: false useStates: false
onClicked: !enabled ? call.startRecording() : call.stopRecording() onClicked: {
var call = incall.call
return !enabled
? call.startRecording()
: call.stopRecording()
}
} }
ActionButton { ActionButton {
icon: 'fullscreen' icon: 'fullscreen'
visible: call.videoEnabled visible: incall.call.videoEnabled
onClicked: Logic.showFullscreen() onClicked: Logic.showFullscreen()
} }
...@@ -179,7 +184,7 @@ Rectangle { ...@@ -179,7 +184,7 @@ Rectangle {
Avatar { Avatar {
backgroundColor: CallStyle.container.avatar.backgroundColor backgroundColor: CallStyle.container.avatar.backgroundColor
foregroundColor: call.status === CallModel.CallStatusPaused foregroundColor: incall.call.status === CallModel.CallStatusPaused
? CallStyle.container.pause.color ? CallStyle.container.pause.color
: 'transparent' : 'transparent'
image: _sipAddressObserver.contact && _sipAddressObserver.contact.vcard.avatar image: _sipAddressObserver.contact && _sipAddressObserver.contact.vcard.avatar
...@@ -200,7 +205,7 @@ Rectangle { ...@@ -200,7 +205,7 @@ Rectangle {
text: '▐ ▌' text: '▐ ▌'
textFormat: Text.RichText textFormat: Text.RichText
visible: call.status === CallModel.CallStatusPaused visible: incall.call.status === CallModel.CallStatusPaused
} }
} }
} }
...@@ -210,7 +215,7 @@ Rectangle { ...@@ -210,7 +215,7 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
active: call.videoEnabled && !_fullscreen active: incall.call.videoEnabled && !_fullscreen
sourceComponent: camera sourceComponent: camera
Component { Component {
...@@ -259,7 +264,7 @@ Rectangle { ...@@ -259,7 +264,7 @@ Rectangle {
repeat: true repeat: true
running: micro.enabled running: micro.enabled
onTriggered: parent.value = call.microVu onTriggered: parent.value = incall.call.microVu
} }
enabled: micro.enabled enabled: micro.enabled
...@@ -272,7 +277,7 @@ Rectangle { ...@@ -272,7 +277,7 @@ Rectangle {
icon: 'micro' icon: 'micro'
iconSize: CallStyle.actionArea.iconSize iconSize: CallStyle.actionArea.iconSize
onClicked: call.microMuted = enabled onClicked: incall.call.microMuted = enabled
} }
} }
...@@ -285,7 +290,7 @@ Rectangle { ...@@ -285,7 +290,7 @@ Rectangle {
repeat: true repeat: true
running: speaker.enabled running: speaker.enabled
onTriggered: parent.value = call.speakerVu onTriggered: parent.value = incall.call.speakerVu
} }
enabled: speaker.enabled enabled: speaker.enabled
...@@ -303,12 +308,12 @@ Rectangle { ...@@ -303,12 +308,12 @@ Rectangle {
} }
ActionSwitch { ActionSwitch {
enabled: call.videoEnabled enabled: incall.call.videoEnabled
icon: 'camera' icon: 'camera'
iconSize: CallStyle.actionArea.iconSize iconSize: CallStyle.actionArea.iconSize
updating: call.updating updating: incall.call.updating
onClicked: call.videoEnabled = !enabled onClicked: incall.call.videoEnabled = !enabled
TooltipArea { TooltipArea {
text: qsTr('pendingRequestLabel') text: qsTr('pendingRequestLabel')
...@@ -335,7 +340,7 @@ Rectangle { ...@@ -335,7 +340,7 @@ Rectangle {
height: CallStyle.actionArea.userVideo.height height: CallStyle.actionArea.userVideo.height
width: CallStyle.actionArea.userVideo.width width: CallStyle.actionArea.userVideo.width
active: incall.width >= CallStyle.actionArea.lowWidth && call.videoEnabled && !_fullscreen active: incall.width >= CallStyle.actionArea.lowWidth && incall.call.videoEnabled && !_fullscreen
sourceComponent: cameraPreview sourceComponent: cameraPreview
Component { Component {
...@@ -360,9 +365,9 @@ Rectangle { ...@@ -360,9 +365,9 @@ Rectangle {
ActionSwitch { ActionSwitch {
enabled: !call.pausedByUser enabled: !call.pausedByUser
icon: 'pause' icon: 'pause'
updating: call.updating updating: incall.call.updating
onClicked: call.pausedByUser = enabled onClicked: incall.call.pausedByUser = enabled
TooltipArea { TooltipArea {
text: qsTr('pendingRequestLabel') text: qsTr('pendingRequestLabel')
...@@ -373,7 +378,7 @@ Rectangle { ...@@ -373,7 +378,7 @@ Rectangle {
ActionButton { ActionButton {
icon: 'hangup' icon: 'hangup'
onClicked: call.terminate() onClicked: incall.call.terminate()
} }
ActionButton { ActionButton {
......
...@@ -126,7 +126,7 @@ ApplicationWindow { ...@@ -126,7 +126,7 @@ ApplicationWindow {
} }
Column { Column {
width: MainWindowStyle.autoAnswerStatus.width Layout.preferredWidth: MainWindowStyle.autoAnswerStatus.width
Icon { Icon {
icon: SettingsModel.autoAnswerStatus icon: SettingsModel.autoAnswerStatus
...@@ -176,6 +176,7 @@ ApplicationWindow { ...@@ -176,6 +176,7 @@ ApplicationWindow {
ActionButton { ActionButton {
icon: 'new_conference' icon: 'new_conference'
iconSize: MainWindowStyle.newConferenceSize
onClicked: Logic.openConferenceManager() onClicked: Logic.openConferenceManager()
} }
......
...@@ -8,6 +8,7 @@ import Linphone.Styles 1.0 ...@@ -8,6 +8,7 @@ import Linphone.Styles 1.0
QtObject { QtObject {
property int menuBurgerSize: 16 property int menuBurgerSize: 16
property int newConferenceSize: 40
property int minimumHeight: 610 property int minimumHeight: 610
property int minimumWidth: 950 property int minimumWidth: 950
property int width: 950 property int width: 950
......
linphone @ 974daa4b
Subproject commit 38638e543d1641ff637f32c4424f61684c861cea Subproject commit 974daa4bb5b8011cf90b1adfb99cf09e9f349cb9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment