diff --git a/assets/languages/ar.ts b/assets/languages/ar.ts index f4b82f292..852985631 100644 --- a/assets/languages/ar.ts +++ b/assets/languages/ar.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/az.ts b/assets/languages/az.ts index 363dfc746..a4f9a2d96 100644 --- a/assets/languages/az.ts +++ b/assets/languages/az.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/az@latin.ts b/assets/languages/az@latin.ts index e5971464a..3c3a07dd6 100644 --- a/assets/languages/az@latin.ts +++ b/assets/languages/az@latin.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/cs.ts b/assets/languages/cs.ts index 7d0052502..ddb849f5b 100644 --- a/assets/languages/cs.ts +++ b/assets/languages/cs.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/de.ts b/assets/languages/de.ts index 7c2dfc8fb..4946ca048 100644 --- a/assets/languages/de.ts +++ b/assets/languages/de.ts @@ -404,7 +404,7 @@ ANRUF WEITERLEITEN - pauseCall + callPause ANRUF PAUSIEREN @@ -1251,6 +1251,10 @@ Server URL ist nicht konfiguriert. keepCallsWindowInBackgroundLabel + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/de_DE.ts b/assets/languages/de_DE.ts index 88e15585d..dfaf6c9d9 100644 --- a/assets/languages/de_DE.ts +++ b/assets/languages/de_DE.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/el.ts b/assets/languages/el.ts index 3c261f7f0..7d5b7b0f4 100644 --- a/assets/languages/el.ts +++ b/assets/languages/el.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/en.ts b/assets/languages/en.ts index 3226086ca..85f4d9e47 100644 --- a/assets/languages/en.ts +++ b/assets/languages/en.ts @@ -404,7 +404,7 @@ TRANSFER CALL - pauseCall + callPause PAUSE CALL @@ -1256,6 +1256,10 @@ your friend's SIP address or username. keepCallsWindowInBackgroundLabel Keep calls window in background + + callPauseEnabledLabel + Call pause enabled + SettingsNetwork diff --git a/assets/languages/es.ts b/assets/languages/es.ts index a81a9defb..4a837a2a4 100644 --- a/assets/languages/es.ts +++ b/assets/languages/es.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/es_AR.ts b/assets/languages/es_AR.ts index c1280fc3c..74581cfca 100644 --- a/assets/languages/es_AR.ts +++ b/assets/languages/es_AR.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/fi.ts b/assets/languages/fi.ts index 36e4629fd..b2989be73 100644 --- a/assets/languages/fi.ts +++ b/assets/languages/fi.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/fr.ts b/assets/languages/fr.ts index a4c0055c8..829ddb297 100644 --- a/assets/languages/fr.ts +++ b/assets/languages/fr.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/fr_FR.ts b/assets/languages/fr_FR.ts index b460a7f45..bb992efb0 100644 --- a/assets/languages/fr_FR.ts +++ b/assets/languages/fr_FR.ts @@ -404,7 +404,7 @@ TRANSFERER L'APPEL - pauseCall + callPause PAUSE @@ -1254,6 +1254,10 @@ Cliquez ici : <a href="%1">%1</a> keepCallsWindowInBackgroundLabel Fenêtre d'appels en tâche de fond + + callPauseEnabledLabel + Autoriser la mise en pause + SettingsNetwork diff --git a/assets/languages/he.ts b/assets/languages/he.ts index fa1f31eae..73f06ca6e 100644 --- a/assets/languages/he.ts +++ b/assets/languages/he.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/hu.ts b/assets/languages/hu.ts index 6367ac1ce..b6ba7da4b 100644 --- a/assets/languages/hu.ts +++ b/assets/languages/hu.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/it.ts b/assets/languages/it.ts index 167457733..5ab9b1309 100644 --- a/assets/languages/it.ts +++ b/assets/languages/it.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/ja.ts b/assets/languages/ja.ts index e0930a73d..e6244474f 100644 --- a/assets/languages/ja.ts +++ b/assets/languages/ja.ts @@ -404,7 +404,7 @@ 電話を転送する - pauseCall + callPause 電話を保留する @@ -1251,6 +1251,10 @@ keepCallsWindowInBackgroundLabel + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/ka.ts b/assets/languages/ka.ts index 89a0e0c3d..6577fa552 100644 --- a/assets/languages/ka.ts +++ b/assets/languages/ka.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/ko_KR.ts b/assets/languages/ko_KR.ts index 4bb332c86..f0655c034 100644 --- a/assets/languages/ko_KR.ts +++ b/assets/languages/ko_KR.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/lt.ts b/assets/languages/lt.ts index 024391bd6..d5743e437 100644 --- a/assets/languages/lt.ts +++ b/assets/languages/lt.ts @@ -404,7 +404,7 @@ - pauseCall + callPause PRISTABDYTI SKAMBUTĮ @@ -1256,6 +1256,10 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą. keepCallsWindowInBackgroundLabel + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/mk_MK.ts b/assets/languages/mk_MK.ts index 199dc7ff7..b68a5c71a 100644 --- a/assets/languages/mk_MK.ts +++ b/assets/languages/mk_MK.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/nb_NO.ts b/assets/languages/nb_NO.ts index 34462ca0c..50df6ce6f 100644 --- a/assets/languages/nb_NO.ts +++ b/assets/languages/nb_NO.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/nl.ts b/assets/languages/nl.ts index c1563649c..fc3ac8afb 100644 --- a/assets/languages/nl.ts +++ b/assets/languages/nl.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/pl.ts b/assets/languages/pl.ts index e5d42decd..b55fe4a29 100644 --- a/assets/languages/pl.ts +++ b/assets/languages/pl.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/pl_PL.ts b/assets/languages/pl_PL.ts index c61592ab1..9a2602aed 100644 --- a/assets/languages/pl_PL.ts +++ b/assets/languages/pl_PL.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/pt_BR.ts b/assets/languages/pt_BR.ts index 88bb164ee..2faee73f7 100644 --- a/assets/languages/pt_BR.ts +++ b/assets/languages/pt_BR.ts @@ -404,7 +404,7 @@ TRANSFERIR LIGAÇÃO - pauseCall + callPause PAUSAR LIGAÇÃO @@ -1256,6 +1256,10 @@ o endereço SIP ou nome de usuário do seu amigo. keepCallsWindowInBackgroundLabel Manter as janelas de chamada em segundo plano + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/ru.ts b/assets/languages/ru.ts index dc46f41a3..2c5725cad 100644 --- a/assets/languages/ru.ts +++ b/assets/languages/ru.ts @@ -404,7 +404,7 @@ ПЕРНАПРАВИТЬ ВЫЗОВ - pauseCall + callPause ПРИОСТАНОВИТЬ ВЫЗОВ @@ -1254,6 +1254,10 @@ keepCallsWindowInBackgroundLabel + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/ru_RU.ts b/assets/languages/ru_RU.ts index e92ddc758..09d14a106 100644 --- a/assets/languages/ru_RU.ts +++ b/assets/languages/ru_RU.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/sr.ts b/assets/languages/sr.ts index 06df7d082..288fdf20e 100644 --- a/assets/languages/sr.ts +++ b/assets/languages/sr.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/sv.ts b/assets/languages/sv.ts index 0c758f09a..0efe83d57 100644 --- a/assets/languages/sv.ts +++ b/assets/languages/sv.ts @@ -404,7 +404,7 @@ ÖVERFÖR SAMTAL - pauseCall + callPause PAUSA SAMTAL @@ -1253,6 +1253,10 @@ Klicka här: <a href="%1">%1</a> keepCallsWindowInBackgroundLabel + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/tr.ts b/assets/languages/tr.ts index 32697d44a..b170e46f4 100644 --- a/assets/languages/tr.ts +++ b/assets/languages/tr.ts @@ -404,7 +404,7 @@ ÇAĞRIYI AKTAR - pauseCall + callPause ÇAĞRIYI DURAKLAT @@ -1253,6 +1253,10 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. keepCallsWindowInBackgroundLabel + + callPauseEnabledLabel + + SettingsNetwork diff --git a/assets/languages/uk.ts b/assets/languages/uk.ts index b1cfbf0ba..d0203e54d 100644 --- a/assets/languages/uk.ts +++ b/assets/languages/uk.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/zh-Hant.ts b/assets/languages/zh-Hant.ts index a621ce44b..2ec3cd5d0 100644 --- a/assets/languages/zh-Hant.ts +++ b/assets/languages/zh-Hant.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/zh.ts b/assets/languages/zh.ts index 90d63946a..3f78d8e50 100644 --- a/assets/languages/zh.ts +++ b/assets/languages/zh.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/zh_CN.GB2312.ts b/assets/languages/zh_CN.GB2312.ts index f79396991..48e5340b4 100644 --- a/assets/languages/zh_CN.GB2312.ts +++ b/assets/languages/zh_CN.GB2312.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/zh_CN.ts b/assets/languages/zh_CN.ts index 9d4127dc0..7a60d1c9a 100644 --- a/assets/languages/zh_CN.ts +++ b/assets/languages/zh_CN.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/assets/languages/zh_TW.ts b/assets/languages/zh_TW.ts index b88b09212..653313ba1 100644 --- a/assets/languages/zh_TW.ts +++ b/assets/languages/zh_TW.ts @@ -402,7 +402,7 @@ - pauseCall + callPause diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index 098740a4f..b3f3e0149 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -409,6 +409,15 @@ void SettingsModel::setAutomaticallyRecordCalls (bool status) { // ----------------------------------------------------------------------------- +bool SettingsModel::getCallPauseEnabled () const { + return !!mConfig->getInt(UiSection, "call_pause_enabled", 1); +} + +void SettingsModel::setCallPauseEnabled (bool status) { + mConfig->setInt(UiSection, "call_pause_enabled", status); + emit callPauseEnabledChanged(status); +} + bool SettingsModel::getMuteMicrophoneEnabled () const { return !!mConfig->getInt(UiSection, "mute_microphone_enabled", 1); } diff --git a/src/components/settings/SettingsModel.hpp b/src/components/settings/SettingsModel.hpp index b194a3826..ab7b3944c 100644 --- a/src/components/settings/SettingsModel.hpp +++ b/src/components/settings/SettingsModel.hpp @@ -91,6 +91,7 @@ class SettingsModel : public QObject { Q_PROPERTY(bool callRecorderEnabled READ getCallRecorderEnabled WRITE setCallRecorderEnabled NOTIFY callRecorderEnabledChanged); Q_PROPERTY(bool automaticallyRecordCalls READ getAutomaticallyRecordCalls WRITE setAutomaticallyRecordCalls NOTIFY automaticallyRecordCallsChanged); + Q_PROPERTY(bool callPauseEnabled READ getCallPauseEnabled WRITE setCallPauseEnabled NOTIFY callPauseEnabledChanged); Q_PROPERTY(bool muteMicrophoneEnabled READ getMuteMicrophoneEnabled WRITE setMuteMicrophoneEnabled NOTIFY muteMicrophoneEnabledChanged); Q_PROPERTY(bool chatEnabled READ getChatEnabled WRITE setChatEnabled NOTIFY chatEnabledChanged); @@ -280,6 +281,9 @@ public: bool getAutomaticallyRecordCalls () const; void setAutomaticallyRecordCalls (bool status); + bool getCallPauseEnabled () const; + void setCallPauseEnabled (bool status); + bool getMuteMicrophoneEnabled () const; void setMuteMicrophoneEnabled (bool status); @@ -473,6 +477,7 @@ signals: void callRecorderEnabledChanged (bool status); void automaticallyRecordCallsChanged (bool status); + void callPauseEnabledChanged (bool status); void muteMicrophoneEnabledChanged (bool status); void chatEnabledChanged (bool status); diff --git a/ui/modules/Linphone/Calls/Calls.js b/ui/modules/Linphone/Calls/Calls.js index 3232b0627..4e5a0c78e 100644 --- a/ui/modules/Linphone/Calls/Calls.js +++ b/ui/modules/Linphone/Calls/Calls.js @@ -22,7 +22,7 @@ function getParams (call) { return { actions: [{ handler: (function () { call.pausedByUser = true }), - name: qsTr('pauseCall') + name: qsTr('callPause') }, { handler: call.askForTransfer, name: qsTr('transferCall') @@ -74,7 +74,7 @@ function getParams (call) { name: qsTr('resumeCall') } : { handler: (function () { call.pausedByUser = true }), - name: qsTr('pauseCall') + name: qsTr('callPause') }), { handler: call.askForTransfer, name: qsTr('transferCall') diff --git a/ui/views/App/Calls/Incall.qml b/ui/views/App/Calls/Incall.qml index 313985b48..e34e1b8d6 100644 --- a/ui/views/App/Calls/Incall.qml +++ b/ui/views/App/Calls/Incall.qml @@ -409,6 +409,7 @@ Rectangle { enabled: !call.pausedByUser icon: 'pause' updating: incall.call.updating + visible: SettingsModel.callPauseEnabled onClicked: incall.call.pausedByUser = enabled diff --git a/ui/views/App/Calls/IncallFullscreenWindow.qml b/ui/views/App/Calls/IncallFullscreenWindow.qml index bcafba18f..8c512ba86 100644 --- a/ui/views/App/Calls/IncallFullscreenWindow.qml +++ b/ui/views/App/Calls/IncallFullscreenWindow.qml @@ -364,6 +364,7 @@ Window { enabled: !call.pausedByUser icon: 'pause' updating: call.updating + visible: SettingsModel.callPauseEnabled onClicked: window.exit(function () { call.pausedByUser = enabled }) } diff --git a/ui/views/App/Settings/SettingsCallsChat.qml b/ui/views/App/Settings/SettingsCallsChat.qml index ba23a39b3..8305930f9 100644 --- a/ui/views/App/Settings/SettingsCallsChat.qml +++ b/ui/views/App/Settings/SettingsCallsChat.qml @@ -150,6 +150,20 @@ TabContainer { } } + FormGroup { + label: qsTr('callPauseEnabledLabel') + + Switch { + checked: SettingsModel.callPauseEnabled + + onClicked: SettingsModel.callPauseEnabled = !checked + } + } + } + + FormLine { + visible: SettingsModel.developerSettingsEnabled + FormGroup { label: qsTr('muteMicrophoneEnabledLabel')