diff --git a/tests/src/components/call/CallModel.cpp b/tests/src/components/call/CallModel.cpp index e70a436fb..11a8e1cf5 100644 --- a/tests/src/components/call/CallModel.cpp +++ b/tests/src/components/call/CallModel.cpp @@ -126,6 +126,7 @@ void CallModel::setPausedByUser (bool status) { bool CallModel::getVideoOutputEnabled () const { // TODO + return false; } void CallModel::setVideoOutputEnabled (bool status) { diff --git a/tests/ui/views/App/Calls/CallsWindow.qml b/tests/ui/views/App/Calls/CallsWindow.qml index df6baaccf..fd53d785c 100644 --- a/tests/ui/views/App/Calls/CallsWindow.qml +++ b/tests/ui/views/App/Calls/CallsWindow.qml @@ -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 diff --git a/tests/ui/views/App/Calls/Incall.qml b/tests/ui/views/App/Calls/Incall.qml index 82d4353a4..ccb42512c 100644 --- a/tests/ui/views/App/Calls/Incall.qml +++ b/tests/ui/views/App/Calls/Incall.qml @@ -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() } } } diff --git a/tests/ui/views/App/Calls/OutgoingCall.qml b/tests/ui/views/App/Calls/OutgoingCall.qml index b9ae4daed..3f8b37f8e 100644 --- a/tests/ui/views/App/Calls/OutgoingCall.qml +++ b/tests/ui/views/App/Calls/OutgoingCall.qml @@ -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 { diff --git a/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml b/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml index e5dbf2531..637869d67 100644 --- a/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml +++ b/tests/ui/views/App/Styles/Calls/StartingCallStyle.qml @@ -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 } }