feat(app): calls in progress

This commit is contained in:
Ronan Abhamon 2017-01-23 13:58:20 +01:00
parent 552f2c84c2
commit 2e8929f645
5 changed files with 27 additions and 7 deletions

View file

@ -126,6 +126,7 @@ void CallModel::setPausedByUser (bool status) {
bool CallModel::getVideoOutputEnabled () const {
// TODO
return false;
}
void CallModel::setVideoOutputEnabled (bool status) {

View file

@ -15,6 +15,7 @@ Window {
// ---------------------------------------------------------------------------
readonly property bool chatIsOpened: !rightPaned.isClosed()
readonly property var call: calls.selectedCall
readonly property var sipAddress: {
if (call) {
@ -24,6 +25,16 @@ Window {
// ---------------------------------------------------------------------------
function openChat () {
rightPaned.open()
}
function closeChat () {
rightPaned.close()
}
// ---------------------------------------------------------------------------
minimumHeight: CallsWindowStyle.minimumHeight
minimumWidth: CallsWindowStyle.minimumWidth
title: CallsWindowStyle.title
@ -97,6 +108,8 @@ Window {
// -------------------------------------------------------------------------
childB: Paned {
id: rightPaned
anchors.fill: parent
closingEdge: Qt.RightEdge
defaultClosed: true

View file

@ -11,6 +11,10 @@ import App.Styles 1.0
// =============================================================================
Rectangle {
id: incall
// ---------------------------------------------------------------------------
property var call
property var _contactObserver: SipAddressesModel.getContactObserver(sipAddress)
@ -195,18 +199,19 @@ Rectangle {
ActionButton {
icon: 'hangup'
onClicked: Call.terminate()
}
ActionSwitch {
enabled: !call.parent.parent.isClosed()
enabled: CallsWindow.chatIsOpened
icon: 'chat'
onClicked: {
var parent = call.parent.parent
onClicked: {
if (enabled) {
parent.close()
CallsWindow.closeChat()
} else {
parent.open()
CallsWindow.openChat()
}
}
}

View file

@ -10,7 +10,7 @@ import App.Styles 1.0
AbstractStartingCall {
GridLayout {
columns: parent.width < 415 && call.videoOutputEnabled ? 1 : 2
columns: parent.width < StartingCallStyle.low && call.videoOutputEnabled ? 1 : 2
rowSpacing: ActionBarStyle.spacing
anchors {

View file

@ -12,6 +12,7 @@ QtObject {
property int containerMargins: 20
property int iconSize: 40
property int leftButtonsGroupMargin: 50
property int lowWidth: 415
property int rightButtonsGroupMargin: 50
property QtObject avatar: QtObject {
@ -31,7 +32,7 @@ QtObject {
}
property QtObject userVideo: QtObject {
property int width: 130
property int height: 90
property int width: 130
}
}