Commit 05b6b43e authored by Ronan's avatar Ronan
Browse files

feat(app): calls views in progress

parent 10c7ee4b
......@@ -38,8 +38,6 @@ Button {
}
hoverEnabled: true
// Ugly hack, use current size, ActionBar size,
// or other parent height.
height: iconSize || parent.iconSize || parent.height
width: iconSize || parent.iconSize || parent.height
......
......@@ -21,6 +21,7 @@ Item {
anchors.fill: parent
icon: parent.icon + (parent.enabled ? '_on' : '_off')
iconSize: parent.iconSize
onClicked: parent.clicked()
}
......
......@@ -77,7 +77,7 @@ Window {
anchors.fill: parent
closingEdge: Qt.RightEdge
defaultClosed: true
minimumLeftLimit: 380
minimumLeftLimit: 395
minimumRightLimit: 300
resizeAInPriority: true
......@@ -85,6 +85,7 @@ Window {
childA: Incall {
anchors.fill: parent
sipAddress: 'sip:erwan.croze@sip.linphone.org'
isVideoCall: true
}
// Chat.
......
......@@ -2,6 +2,7 @@ import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common 1.0
import Common.Styles 1.0
import Linphone 1.0
import LinphoneUtils 1.0
......@@ -118,33 +119,41 @@ Rectangle {
Item {
Layout.fillWidth: true
Layout.preferredHeight: StartingCallStyle.actionAreaHeight + 10
Layout.preferredHeight: StartingCallStyle.actionAreaHeight
ActionBar {
GridLayout {
anchors {
left: parent.left
leftMargin: StartingCallStyle.leftButtonsGroupMargin
verticalCenter: parent.verticalCenter
}
iconSize: StartingCallStyle.iconSize
rowSpacing: ActionBarStyle.spacing
columns: call.width < 645 && isVideoCall ? 2 : 4
ActionSwitch {
icon: 'micro'
iconSize: StartingCallStyle.iconSize
onClicked: enabled = !enabled
}
ActionSwitch {
icon: 'speaker'
iconSize: StartingCallStyle.iconSize
onClicked: enabled = !enabled
}
ActionSwitch {
icon: 'camera'
iconSize: StartingCallStyle.iconSize
onClicked: enabled = !enabled
}
ActionButton {
Layout.preferredHeight: StartingCallStyle.iconSize
Layout.preferredWidth: StartingCallStyle.iconSize
icon: 'options'
iconSize: StartingCallStyle.iconSize
}
}
......@@ -152,7 +161,7 @@ Rectangle {
anchors.centerIn: parent
color: 'red'
height: StartingCallStyle.userVideo.height
visible: true
visible: call.width >= 550
width: StartingCallStyle.userVideo.width
}
......
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common 1.0
import Common.Styles 1.0
import App.Styles 1.0
......@@ -12,21 +14,27 @@ AbstractStartingCall {
? qsTr('outgoingVideoCall')
: qsTr('outgoingAudioCall')
ActionBar {
GridLayout {
rowSpacing: ActionBarStyle.spacing
columns: parent.width < 415 && isVideoCall ? 1 : 2
anchors {
left: parent.left
leftMargin: StartingCallStyle.leftButtonsGroupMargin
verticalCenter: parent.verticalCenter
}
iconSize: StartingCallStyle.iconSize
ActionSwitch {
icon: 'micro'
iconSize: StartingCallStyle.iconSize
onClicked: enabled = !enabled
}
ActionSwitch {
icon: 'speaker'
iconSize: StartingCallStyle.iconSize
onClicked: enabled = !enabled
}
}
......
......@@ -12,7 +12,7 @@ QtObject {
property int containerMargins: 20
property int iconSize: 40
property int leftButtonsGroupMargin: 50
property int rightButtonsGroupMargin: 85
property int rightButtonsGroupMargin: 50
property QtObject avatar: QtObject {
property color backgroundColor: Colors.w
......
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