Commit 2e8929f6 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(app): calls in progress

parent 552f2c84
...@@ -126,6 +126,7 @@ void CallModel::setPausedByUser (bool status) { ...@@ -126,6 +126,7 @@ void CallModel::setPausedByUser (bool status) {
bool CallModel::getVideoOutputEnabled () const { bool CallModel::getVideoOutputEnabled () const {
// TODO // TODO
return false;
} }
void CallModel::setVideoOutputEnabled (bool status) { void CallModel::setVideoOutputEnabled (bool status) {
......
...@@ -15,6 +15,7 @@ Window { ...@@ -15,6 +15,7 @@ Window {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
readonly property bool chatIsOpened: !rightPaned.isClosed()
readonly property var call: calls.selectedCall readonly property var call: calls.selectedCall
readonly property var sipAddress: { readonly property var sipAddress: {
if (call) { if (call) {
...@@ -24,6 +25,16 @@ Window { ...@@ -24,6 +25,16 @@ Window {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function openChat () {
rightPaned.open()
}
function closeChat () {
rightPaned.close()
}
// ---------------------------------------------------------------------------
minimumHeight: CallsWindowStyle.minimumHeight minimumHeight: CallsWindowStyle.minimumHeight
minimumWidth: CallsWindowStyle.minimumWidth minimumWidth: CallsWindowStyle.minimumWidth
title: CallsWindowStyle.title title: CallsWindowStyle.title
...@@ -97,6 +108,8 @@ Window { ...@@ -97,6 +108,8 @@ Window {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
childB: Paned { childB: Paned {
id: rightPaned
anchors.fill: parent anchors.fill: parent
closingEdge: Qt.RightEdge closingEdge: Qt.RightEdge
defaultClosed: true defaultClosed: true
......
...@@ -11,6 +11,10 @@ import App.Styles 1.0 ...@@ -11,6 +11,10 @@ import App.Styles 1.0
// ============================================================================= // =============================================================================
Rectangle { Rectangle {
id: incall
// ---------------------------------------------------------------------------
property var call property var call
property var _contactObserver: SipAddressesModel.getContactObserver(sipAddress) property var _contactObserver: SipAddressesModel.getContactObserver(sipAddress)
...@@ -195,18 +199,19 @@ Rectangle { ...@@ -195,18 +199,19 @@ Rectangle {
ActionButton { ActionButton {
icon: 'hangup' icon: 'hangup'
onClicked: Call.terminate()
} }
ActionSwitch { ActionSwitch {
enabled: !call.parent.parent.isClosed() enabled: CallsWindow.chatIsOpened
icon: 'chat' icon: 'chat'
onClicked: {
var parent = call.parent.parent
onClicked: {
if (enabled) { if (enabled) {
parent.close() CallsWindow.closeChat()
} else { } else {
parent.open() CallsWindow.openChat()
} }
} }
} }
......
...@@ -10,7 +10,7 @@ import App.Styles 1.0 ...@@ -10,7 +10,7 @@ import App.Styles 1.0
AbstractStartingCall { AbstractStartingCall {
GridLayout { GridLayout {
columns: parent.width < 415 && call.videoOutputEnabled ? 1 : 2 columns: parent.width < StartingCallStyle.low && call.videoOutputEnabled ? 1 : 2
rowSpacing: ActionBarStyle.spacing rowSpacing: ActionBarStyle.spacing
anchors { anchors {
......
...@@ -12,6 +12,7 @@ QtObject { ...@@ -12,6 +12,7 @@ QtObject {
property int containerMargins: 20 property int containerMargins: 20
property int iconSize: 40 property int iconSize: 40
property int leftButtonsGroupMargin: 50 property int leftButtonsGroupMargin: 50
property int lowWidth: 415
property int rightButtonsGroupMargin: 50 property int rightButtonsGroupMargin: 50
property QtObject avatar: QtObject { property QtObject avatar: QtObject {
...@@ -31,7 +32,7 @@ QtObject { ...@@ -31,7 +32,7 @@ QtObject {
} }
property QtObject userVideo: QtObject { property QtObject userVideo: QtObject {
property int width: 130
property int height: 90 property int height: 90
property int width: 130
} }
} }
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