diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts
index 2c0684480..765cb394a 100644
--- a/linphone-app/assets/languages/cs.ts
+++ b/linphone-app/assets/languages/cs.ts
@@ -1516,7 +1516,7 @@ Adresa URL serveru není nakonfigurována.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.V současné době jste mimo schůzku.
@@ -1564,6 +1564,11 @@ Adresa URL serveru není nakonfigurována.
'The call is not ready. Please Wait...' : Waiting message for starting a call.Hovor není připraven. Počkejte prosím…
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts
index ce471871f..851402e24 100644
--- a/linphone-app/assets/languages/da.ts
+++ b/linphone-app/assets/languages/da.ts
@@ -1506,7 +1506,7 @@ Server url ikke konfigureret.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1554,6 +1554,11 @@ Server url ikke konfigureret.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts
index ef46d724d..d92c70a19 100644
--- a/linphone-app/assets/languages/de.ts
+++ b/linphone-app/assets/languages/de.ts
@@ -1506,7 +1506,7 @@ Server URL ist nicht konfiguriert.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1554,6 +1554,11 @@ Server URL ist nicht konfiguriert.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts
index d2ce23caf..5ebc7a49f 100644
--- a/linphone-app/assets/languages/en.ts
+++ b/linphone-app/assets/languages/en.ts
@@ -1506,8 +1506,8 @@ Server URL not configured.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
- You are currently out of the meeting.
+ 'You have paused the call.' : Pause message in call.
+ You have paused the call.incallPauseHint
@@ -1554,6 +1554,11 @@ Server URL not configured.
'The call is not ready. Please Wait...' : Waiting message for starting a call.The call is not ready. Please Wait…
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+ Call has been paused by remote.
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts
index 6135219ec..54df21709 100644
--- a/linphone-app/assets/languages/es.ts
+++ b/linphone-app/assets/languages/es.ts
@@ -1506,7 +1506,7 @@ URL del servidor no configurada.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1554,6 +1554,11 @@ URL del servidor no configurada.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts
index a0bae6fac..113e317c3 100644
--- a/linphone-app/assets/languages/fr_FR.ts
+++ b/linphone-app/assets/languages/fr_FR.ts
@@ -1506,7 +1506,7 @@ URL du serveur non configurée.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.Vous êtes actuellement en dehors de l'appel de groupe.
@@ -1554,6 +1554,11 @@ URL du serveur non configurée.
'The call is not ready. Please Wait...' : Waiting message for starting a call.La réunion est en cours de préparation. Veuillez patienter…
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts
index d14c4a481..74a9b40e5 100644
--- a/linphone-app/assets/languages/hu.ts
+++ b/linphone-app/assets/languages/hu.ts
@@ -1496,7 +1496,7 @@ A kiszolgáló URL-je nincs konfigurálva.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1544,6 +1544,11 @@ A kiszolgáló URL-je nincs konfigurálva.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts
index bdbd96a55..087967de3 100644
--- a/linphone-app/assets/languages/it.ts
+++ b/linphone-app/assets/languages/it.ts
@@ -1506,7 +1506,7 @@ URL del server non configurato.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.Ora sei fuori dalla conferenza.
@@ -1554,6 +1554,11 @@ URL del server non configurato.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts
index 9dfd636b0..997d4b43c 100644
--- a/linphone-app/assets/languages/ja.ts
+++ b/linphone-app/assets/languages/ja.ts
@@ -1496,7 +1496,7 @@
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.あなたは現在ミーティングから外れています。
@@ -1544,6 +1544,11 @@
'The call is not ready. Please Wait...' : Waiting message for starting a call.通話は始まっていません。しばらくお待ちください…
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts
index 8cbc3caa1..b77a5f152 100644
--- a/linphone-app/assets/languages/lt.ts
+++ b/linphone-app/assets/languages/lt.ts
@@ -1516,7 +1516,7 @@ Nesukonfigūruotas serverio url.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1564,6 +1564,11 @@ Nesukonfigūruotas serverio url.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts
index ce3851a4c..5ed1f8b4b 100644
--- a/linphone-app/assets/languages/pt_BR.ts
+++ b/linphone-app/assets/languages/pt_BR.ts
@@ -1506,7 +1506,7 @@ URL do servidor não configurado.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.Está atualmente fora da reunião.
@@ -1554,6 +1554,11 @@ URL do servidor não configurado.
'The call is not ready. Please Wait...' : Waiting message for starting a call.A chamada não está pronta. Por favor, aguarde…
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts
index b5a57f92e..c5f749a6e 100644
--- a/linphone-app/assets/languages/ru.ts
+++ b/linphone-app/assets/languages/ru.ts
@@ -1516,7 +1516,7 @@
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.В настоящее время вы вне встречи.
@@ -1564,6 +1564,11 @@
'The call is not ready. Please Wait...' : Waiting message for starting a call.Звонок не готов. Подождите...
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts
index 9fb36ceea..7501cef84 100644
--- a/linphone-app/assets/languages/sv.ts
+++ b/linphone-app/assets/languages/sv.ts
@@ -1506,7 +1506,7 @@ Serverwebbadressen är inte konfigurerad.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1554,6 +1554,11 @@ Serverwebbadressen är inte konfigurerad.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts
index 8906850e2..9a78c1b2d 100644
--- a/linphone-app/assets/languages/tr.ts
+++ b/linphone-app/assets/languages/tr.ts
@@ -1496,7 +1496,7 @@ Sunucu url'si yapılandırılmadı.
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1544,6 +1544,11 @@ Sunucu url'si yapılandırılmadı.
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts
index 2b6651f9a..2d9afc206 100644
--- a/linphone-app/assets/languages/uk.ts
+++ b/linphone-app/assets/languages/uk.ts
@@ -1516,7 +1516,7 @@
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1564,6 +1564,11 @@
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts
index 18979edd1..8fc753102 100644
--- a/linphone-app/assets/languages/zh_CN.ts
+++ b/linphone-app/assets/languages/zh_CN.ts
@@ -1496,7 +1496,7 @@
incallPauseWarning
- 'You are currently out of the conference.' : Pause message in video conference.
+ 'You have paused the call.' : Pause message in call.
@@ -1544,6 +1544,11 @@
'The call is not ready. Please Wait...' : Waiting message for starting a call.
+
+ incallRemotePauseWarning
+ 'Call has been paused by remote.' : Remote pause message in call.
+
+ IncallFullscreen
diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp
index a5ef8fa1a..310223a07 100644
--- a/linphone-app/src/components/call/CallModel.cpp
+++ b/linphone-app/src/components/call/CallModel.cpp
@@ -512,7 +512,7 @@ void CallModel::handleCallStateChanged (const shared_ptr &call,
setCallErrorFromReason(call->getReason());
stopAutoAnswerTimer();
stopRecording();
- mPausedByRemote = false;
+ setPausedByRemote(false);
break;
case linphone::Call::State::StreamsRunning: {
@@ -521,7 +521,7 @@ void CallModel::handleCallStateChanged (const shared_ptr &call,
startRecording();
mWasConnected = true;
}
- mPausedByRemote = false;
+ setPausedByRemote(false);
updateConferenceVideoLayout();
setCallId(QString::fromStdString(mCall->getCallLog()->getCallId()));
updateEncryption();
@@ -530,12 +530,12 @@ void CallModel::handleCallStateChanged (const shared_ptr &call,
case linphone::Call::State::Connected: getConferenceSharedModel();
case linphone::Call::State::Referred:
case linphone::Call::State::Released:
- mPausedByRemote = false;
+ setPausedByRemote(false);
break;
case linphone::Call::State::PausedByRemote:
mNotifyCameraFirstFrameReceived = true;
- mPausedByRemote = true;
+ setPausedByRemote(true);
break;
case linphone::Call::State::Pausing:
@@ -838,6 +838,16 @@ void CallModel::setPausedByUser (bool status) {
}
}
+bool CallModel::getPausedByRemote () const {
+ return mPausedByRemote;
+}
+
+void CallModel::setPausedByRemote (bool status) {
+ if(mPausedByRemote != status){
+ mPausedByRemote = status;
+ emit pausedByRemoteChanged();
+ }
+}
// -----------------------------------------------------------------------------
bool CallModel::getRemoteVideoEnabled () const {
shared_ptr params = mCall->getRemoteParams();
diff --git a/linphone-app/src/components/call/CallModel.hpp b/linphone-app/src/components/call/CallModel.hpp
index cb6473a8e..95ea3574e 100644
--- a/linphone-app/src/components/call/CallModel.hpp
+++ b/linphone-app/src/components/call/CallModel.hpp
@@ -71,6 +71,7 @@ class CallModel : public QObject {
Q_PROPERTY(float microVolumeGain READ getMicroVolumeGain WRITE setMicroVolumeGain NOTIFY microVolumeGainChanged)
Q_PROPERTY(bool pausedByUser READ getPausedByUser WRITE setPausedByUser NOTIFY statusChanged)
+ Q_PROPERTY(bool pausedByRemote READ getPausedByRemote WRITE setPausedByRemote NOTIFY pausedByRemoteChanged)
Q_PROPERTY(bool videoEnabled READ getVideoEnabled WRITE setVideoEnabled NOTIFY statusChanged)
Q_PROPERTY(bool localVideoEnabled READ getLocalVideoEnabled WRITE setVideoEnabled NOTIFY statusChanged)
Q_PROPERTY(bool cameraEnabled READ getCameraEnabled WRITE setCameraEnabled NOTIFY statusChanged)
@@ -231,6 +232,7 @@ signals:
void isPQZrtpChanged();
void speakerVolumeGainChanged (float volume);
void microVolumeGainChanged (float volume);
+ void pausedByRemoteChanged();
void cameraFirstFrameReceived (unsigned int width, unsigned int height);
@@ -280,6 +282,9 @@ public:
bool getPausedByUser () const;
void setPausedByUser (bool status);
+ bool getPausedByRemote () const;
+ void setPausedByRemote (bool status);
+
bool getLocalVideoEnabled () const;
bool getVideoEnabled () const;
diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
index 7436c5e19..bcf55a4eb 100644
--- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
+++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
@@ -33,7 +33,7 @@ Avatar {
Component.onDestruction: _sipAddressObserver=null// Need to set it to null because of not calling destructor if not.
backgroundColor: CallStyle.container.avatar.backgroundColor.color
- foregroundColor: mainItem.isPaused ? CallStyle.container.pause.color : 'transparent'
+ foregroundColor: mainItem.isPaused ? CallStyle.container.pause.colorModel.color : 'transparent'
image: {
if (_sipAddressObserver) {
diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml
index 861eb1543..c22c5e9f0 100644
--- a/linphone-app/ui/views/App/Calls/Incall.qml
+++ b/linphone-app/ui/views/App/Calls/Incall.qml
@@ -81,7 +81,7 @@ Rectangle {
anchors.fill: parent
}
anchors.fill: parent
- visible: callModel.pausedByUser
+ visible: callModel.pausedByUser || (callModel.isOneToOne && callModel.pausedByRemote)
color: IncallStyle.pauseArea.backgroundColor.color
z: 1
ColumnLayout{
@@ -94,14 +94,18 @@ Rectangle {
ActionButton{
Layout.alignment: Qt.AlignCenter
isCustom: true
- colorSet: IncallStyle.pauseArea.play
+ colorSet: callModel.pausedByUser ? IncallStyle.pauseArea.play : IncallStyle.pauseArea.pause
backgroundRadius: width/2
+ enabled: callModel.pausedByUser
onClicked: callModel.pausedByUser = !callModel.pausedByUser
}
Text{
Layout.alignment: Qt.AlignCenter
- //: 'You are currently out of the conference.' : Pause message in video conference.
- text: qsTr('incallPauseWarning')
+ text: callModel.pausedByUser
+ //: 'You have paused the call.' : Pause message in call.
+ ? qsTr('incallPauseWarning')
+ //: 'Call has been paused by remote.' : Remote pause message in call.
+ : qsTr('incallRemotePauseWarning')
font.pointSize: IncallStyle.pauseArea.title.pointSize
font.weight: IncallStyle.pauseArea.title.weight
color: IncallStyle.pauseArea.title.colorModel.color
@@ -109,8 +113,11 @@ Rectangle {
Text{
Layout.topMargin: 10
Layout.alignment: Qt.AlignCenter
+
+ text: callModel.pausedByUser
//: 'Click on play button to join it back.' : Explain what to do when being in pause in conference.
- text: qsTr('incallPauseHint')
+ ? qsTr('incallPauseHint')
+ : ''
font.pointSize: IncallStyle.pauseArea.description.pointSize
font.weight: IncallStyle.pauseArea.description.weight
color: IncallStyle.pauseArea.description.colorModel.color
diff --git a/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml
index d02291e3c..c6f8b9a9d 100644
--- a/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml
+++ b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml
@@ -64,7 +64,22 @@ QtObject {
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_n_b_fg')
property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg')
- }
+ }
+ property QtObject pause: QtObject {
+ property int iconSize: 240
+ property string icon : 'pause_custom'
+ property string name : 'paused_call'
+ property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_p_b_bg')
+ property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_p_b_bg')
+ property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg')
+ property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_n_b_bg')
+ property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg')
+ property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_p_b_fg')
+ property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_p_b_fg')
+ property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg')
+ property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_n_b_fg')
+ property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg')
+ }
}
property QtObject actionArea: QtObject {
property int height: 100