mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep ending call view if remote hanged up.

Browse source 
Display waiting room on ending call only if there is an ending message(hang up or error).
Hide preview in 1-1 when no video.
Fix : Hide duration in ending call.
Fix missing translations.
This commit is contained in:
Julien Wadel 2022-08-25 16:52:55 +02:00
parent bd97a25e86
commit 9b2867ad41
20 changed files with 301 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
linphone-app/assets/languages/da.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Sendt hastighed</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Klik her: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/de.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Gesendete Framerate</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished">START</translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/en.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Sent framerate</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation>Remote party hanged up the call.</translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3521,6 +3525,21 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation>Start</translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation>Ending call</translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation>Outgoing call</translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation>Incoming call</translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/es.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Tasa de frames enviados</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/fr_FR.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>FPS envoyées</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished">LANCER</translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/hu.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Küldött képkockasebesség</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3485,6 +3489,21 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished">Indítás</translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/it.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Framerate di invio</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/ja.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>送信フレームレート</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3485,6 +3489,21 @@
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/lt.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Išsiųstas kadrų dažnis</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3511,6 +3515,21 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/pt_BR.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Framerate enviado</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/ru.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Исходящая частота кадров</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3511,6 +3515,21 @@
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation>Начать</translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/sv.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Skickad bildfrekvens</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3498,6 +3502,21 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/tr.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Giden çerçeve oranı</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3485,6 +3489,21 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished">BAŞLAT</translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/uk.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>Вихідна частота кадрів</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3511,6 +3515,21 @@
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

19
linphone-app/assets/languages/zh_CN.ts
View file

@ -377,6 +377,10 @@
<source>callStatsSentFramerate</source>
<translation>发送的帧率</translation>
</message>
<message>
<source>callErrorHangUp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CallSipAddress</name>
@ -3485,6 +3489,21 @@
<extracomment>&apos;Start&apos; : Button label for starting the conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>endCallStatus</source>
<extracomment>&quot;Ending call&quot; : status of the call in waiting room when the call end.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallStatus</source>
<extracomment>&quot;Outgoing call&quot; : status of the call in waiting room when user is calling.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>incomingCallStatus</source>
<extracomment>&quot;Incoming call&quot; : status of the call in waiting room when user receive a call.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ZrtpTokenAuthentication</name>

5
linphone-app/src/components/call/CallModel.cpp
View file

@ -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;
}

1
linphone-app/src/components/call/CallModel.hpp
View file

@ -305,6 +305,7 @@ private:
bool mIsInConference = false;
bool mEndByUser = false;
bool mPausedByRemote = false;
bool mPausedByUser = false;
bool mRecording = false;

4
linphone-app/ui/views/App/Calls/CallsWindow.js
View file

@ -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
}

2
linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
View file

@ -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()}

11
linphone-app/ui/views/App/Calls/WaitingRoom.qml
View file

@ -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