Commit 4939fadd authored by Ronan's avatar Ronan

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

parent ec112a8e
......@@ -405,6 +405,7 @@
<file>ui/views/App/Styles/Calls/CallStyle.qml</file>
<file>ui/views/App/Styles/Calls/CallsWindowStyle.qml</file>
<file>ui/views/App/Styles/Calls/ConferenceManagerStyle.qml</file>
<file>ui/views/App/Styles/Calls/ConferenceStyle.qml</file>
<file>ui/views/App/Styles/Main/AboutStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml</file>
......
......@@ -33,7 +33,7 @@ Rectangle {
Layout.fillWidth: true
Layout.leftMargin: CallStyle.header.leftMargin
Layout.rightMargin: CallStyle.header.rightMargin
Layout.preferredHeight: CallStyle.header.conferenceDescription.height
Layout.preferredHeight: ConferenceStyle.description.height
ActionBar {
id: leftActions
......@@ -49,15 +49,15 @@ Rectangle {
horizontalAlignment: Text.AlignHCenter
text: qsTr('conferenceTitle')
color: CallStyle.header.conferenceDescription.color
color: ConferenceStyle.description.color
font {
bold: true
pointSize: CallStyle.header.conferenceDescription.fontSize
pointSize: ConferenceStyle.description.fontSize
}
height: parent.height
width: parent.width - rightActions.width - leftActions.width - CallStyle.header.conferenceDescription.width
width: parent.width - rightActions.width - leftActions.width - ConferenceStyle.description.width
}
// -----------------------------------------------------------------------
......@@ -93,47 +93,66 @@ Rectangle {
Layout.fillHeight: true
Layout.margins: CallStyle.container.margins
GridView {
id: grid
anchors.fill: parent
cellHeight: 145
cellWidth: 154
cellHeight: ConferenceStyle.grid.cell.height
cellWidth: ConferenceStyle.grid.cell.width
model: ConferenceModel {
id: conference
}
delegate: ColumnLayout {
readonly property string sipAddress: $call.sipAddress
readonly property var sipAddressObserver: SipAddressesModel.getSipAddressObserver(sipAddress)
delegate: Item {
height: grid.cellHeight
width: grid.cellWidth
ContactDescription {
id: contactDescription
Column {
readonly property string sipAddress: $call.sipAddress
readonly property var sipAddressObserver: SipAddressesModel.getSipAddressObserver(sipAddress)
anchors {
fill: parent
margins: ConferenceStyle.grid.spacing
}
Layout.preferredHeight: 35
Layout.fillWidth: true
spacing: ConferenceStyle.grid.cell.spacing
horizontalTextAlignment: Text.AlignHCenter
sipAddress: parent.sipAddressObserver.sipAddress
username: LinphoneUtils.getContactUsername(parent.sipAddressObserver.contact || parent.sipAddress)
}
ContactDescription {
id: contactDescription
height: ConferenceStyle.grid.cell.contactDescription.height
width: parent.width
horizontalTextAlignment: Text.AlignHCenter
sipAddress: parent.sipAddressObserver.sipAddress
username: LinphoneUtils.getContactUsername(parent.sipAddressObserver.contact || parent.sipAddress)
}
Avatar {
readonly property int size: Math.min(parent.width, parent.height - contactDescription.height - parent.spacing)
anchors.horizontalCenter: parent.horizontalCenter
height: size
width: size
backgroundColor: CallStyle.container.avatar.backgroundColor
foregroundColor: $call.status === CallModel.CallStatusPaused
? CallStyle.container.pause.color
: 'transparent'
Avatar {
height: parent.width
width: parent.width
image: {
var contact = parent.sipAddressObserver.contact
if (contact) {
return contact.vcard.avatar
}
}
backgroundColor: CallStyle.container.avatar.backgroundColor
foregroundColor: incall.call.status === CallModel.CallStatusPaused
? CallStyle.container.pause.color
: 'transparent'
image: parent.sipAddressObserver.contact && parent.sipAddressObserver.contact.vcard.avatar
username: contactDescription.username
username: contactDescription.username
}
}
}
}
......@@ -155,32 +174,6 @@ Rectangle {
}
spacing: ActionBarStyle.spacing
Row {
spacing: CallStyle.actionArea.vu.spacing
VuMeter {
Timer {
interval: 50
repeat: true
running: micro.enabled
onTriggered: parent.value = conference.microVu
}
enabled: micro.enabled
}
ActionSwitch {
id: micro
enabled: !conference.microMuted
icon: 'micro'
iconSize: CallStyle.actionArea.iconSize
onClicked: conference.microMuted = enabled
}
}
}
ActionBar {
......
......@@ -66,13 +66,6 @@ QtObject {
property int width: 150
}
property QtObject conferenceDescription: QtObject {
property color color: Colors.x
property int fontSize: 12
property int height: 60
property int width: 150
}
property QtObject elapsedTime: QtObject {
property color color: Colors.j
property int fontSize: 10
......
pragma Singleton
import QtQuick 2.7
import Common 1.0
// =============================================================================
QtObject {
property QtObject description: QtObject {
property color color: Colors.x
property int fontSize: 12
property int height: 60
property int width: 150
}
property QtObject grid: QtObject {
property int spacing: 5
property QtObject cell: QtObject {
property int height: 145
property int spacing: 5
property int width: 154
property QtObject contactDescription: QtObject {
property int height: 35
}
}
}
}
......@@ -7,6 +7,7 @@ module App.Styles
singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton ConferenceManagerStyle 1.0 Calls/ConferenceManagerStyle.qml
singleton ConferenceStyle 1.0 Calls/ConferenceStyle.qml
singleton ActivateLinphoneSipAccountWithEmailStyle 1.0 Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
singleton AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml
......
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