diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index d66c7dceb..ec2045616 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Sendt hastighed + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Klik her: <a href="%1">%1</a> 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index bc670b24f..dff29fbd4 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Gesendete Framerate + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Klicken Sie hier: <a href="%1">%1</a> 'Start' : Button label for starting the conference. START + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 379b6a424..ae9e6989d 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Sent framerate + + callErrorHangUp + Remote party hanged up the call. + CallSipAddress @@ -3521,6 +3525,21 @@ Click here: <a href="%1">%1</a> 'Start' : Button label for starting the conference. Start + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + Ending call + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + Outgoing call + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + Incoming call + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 1fb7405b0..c8f47e42f 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Tasa de frames enviados + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Haga clic aquí: <a href="%1">%1 </a> 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 570ea6152..64a0a4999 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -377,6 +377,10 @@ callStatsSentFramerate FPS envoyées + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Cliquez ici : <a href="%1">%1</a> 'Start' : Button label for starting the conference. LANCER + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 71e0aae3c..0c1df3857 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Küldött képkockasebesség + + callErrorHangUp + + CallSipAddress @@ -3485,6 +3489,21 @@ Kattintson ide: <a href="%1">%1</a> 'Start' : Button label for starting the conference. Indítás + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index bbe4d1fff..9a7d1599c 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Framerate di invio + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Clicca: <a href="%1">%1</a> 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index d3d741f23..b5c26fc9e 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -377,6 +377,10 @@ callStatsSentFramerate 送信フレームレート + + callErrorHangUp + + CallSipAddress @@ -3485,6 +3489,21 @@ 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 4043261ce..f0dc45b52 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Išsiųstas kadrų dažnis + + callErrorHangUp + + CallSipAddress @@ -3511,6 +3515,21 @@ Spustelėkite čia: <a href="%1">%1</a> 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 92bcd0f09..cc012e671 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Framerate enviado + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Clique aqui: <a href="%1">%1 </a> 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 7e61dc4ce..fe810bd00 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Исходящая частота кадров + + callErrorHangUp + + CallSipAddress @@ -3511,6 +3515,21 @@ 'Start' : Button label for starting the conference. Начать + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 152297c92..2e7dea96c 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Skickad bildfrekvens + + callErrorHangUp + + CallSipAddress @@ -3498,6 +3502,21 @@ Klicka här: <a href="%1">%1</a> 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 16bcd99aa..5bb65f10e 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Giden çerçeve oranı + + callErrorHangUp + + CallSipAddress @@ -3485,6 +3489,21 @@ Buraya tıklayın: <a href="%1">%1</a> 'Start' : Button label for starting the conference. BAŞLAT + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 83ae43862..93b67dc79 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -377,6 +377,10 @@ callStatsSentFramerate Вихідна частота кадрів + + callErrorHangUp + + CallSipAddress @@ -3511,6 +3515,21 @@ 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index c33b47c94..465c8dbc7 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -377,6 +377,10 @@ callStatsSentFramerate 发送的帧率 + + callErrorHangUp + + CallSipAddress @@ -3485,6 +3489,21 @@ 'Start' : Button label for starting the conference. + + endCallStatus + "Ending call" : status of the call in waiting room when the call end. + + + + outgoingCallStatus + "Outgoing call" : status of the call in waiting room when user is calling. + + + + incomingCallStatus + "Incoming call" : status of the call in waiting room when user receive a call. + + ZrtpTokenAuthentication diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp index c036f0971..3c36fe736 100644 --- a/linphone-app/src/components/call/CallModel.cpp +++ b/linphone-app/src/components/call/CallModel.cpp @@ -340,6 +340,7 @@ void CallModel::acceptWithVideo () { } void CallModel::terminate () { + mEndByUser = true; CoreManager *core = CoreManager::getInstance(); core->lockVideoRender(); if(mCall) @@ -655,6 +656,10 @@ void CallModel::setCallErrorFromReason (linphone::Reason reason) { case linphone::Reason::NotAcceptable: mCallError = tr("callErrorNotAcceptable"); break; + case linphone::Reason::None: + if(!mEndByUser) + mCallError = tr("callErrorHangUp"); + break; default: break; } diff --git a/linphone-app/src/components/call/CallModel.hpp b/linphone-app/src/components/call/CallModel.hpp index 991a10b1e..047704fdb 100644 --- a/linphone-app/src/components/call/CallModel.hpp +++ b/linphone-app/src/components/call/CallModel.hpp @@ -305,6 +305,7 @@ private: bool mIsInConference = false; + bool mEndByUser = false; bool mPausedByRemote = false; bool mPausedByUser = false; bool mRecording = false; diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.js b/linphone-app/ui/views/App/Calls/CallsWindow.js index da5280712..8a14a0032 100644 --- a/linphone-app/ui/views/App/Calls/CallsWindow.js +++ b/linphone-app/ui/views/App/Calls/CallsWindow.js @@ -97,8 +97,8 @@ function getContent (call, conferenceInfoModel) { console.log("incall") return incall } - if (status === CallModel.CallStatusOutgoing || status === CallModel.CallStatusEnded) { - console.log("Is conference ? "+call.isConference) + if (status === CallModel.CallStatusOutgoing || (status === CallModel.CallStatusEnded && call.callError != '' )) { + console.log("waitingRoom. Is conference ? "+call.isConference) return waitingRoom } diff --git a/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml index feaf4b01a..708b2ad4a 100644 --- a/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml +++ b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml @@ -25,7 +25,7 @@ Item { property bool isRightReducedLayout: false property bool isLeftReducedLayout: false property bool cameraEnabled: true - property bool showMe : !(callModel && callModel.pausedByUser) + property bool showMe : !(callModel && callModel.pausedByUser) && (callModel.isConference || callModel.localVideoEnabled) property int participantCount: callModel.isConference ? allDevices.count : 2 onParticipantCountChanged: {console.log("Conf count: " +participantCount);allDevices.updateCurrentDevice()} diff --git a/linphone-app/ui/views/App/Calls/WaitingRoom.qml b/linphone-app/ui/views/App/Calls/WaitingRoom.qml index a91958156..f6ea94c65 100644 --- a/linphone-app/ui/views/App/Calls/WaitingRoom.qml +++ b/linphone-app/ui/views/App/Calls/WaitingRoom.qml @@ -62,10 +62,13 @@ Rectangle { Layout.alignment: Qt.AlignCenter text: mainItem.callModel ? mainItem.isEnding - ? "Ending call" + //: "Ending call" : status of the call in waiting room when the call end. + ? qsTr("endCallStatus") : mainItem.callModel.isOutgoing - ? "Outgoing call" - : "Incoming call" + //: "Outgoing call" : status of the call in waiting room when user is calling. + ? qsTr("outgoingCallStatus") + //: "Incoming call" : status of the call in waiting room when user receive a call. + : qsTr("incomingCallStatus") : '' color: WaitingRoomStyle.title.color font.pointSize: WaitingRoomStyle.title.pointSize @@ -80,7 +83,7 @@ Rectangle { font.pointSize: WaitingRoomStyle.elapsedTime.pointSize horizontalAlignment: Text.AlignHCenter width: parent.width - visible: mainItem.callModel && mainItem.isEnding + visible: mainItem.callModel && !mainItem.isEnding Timer { interval: 1000 repeat: true