mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-03 22:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(Settings): add an option to disable call pause

Browse source
This commit is contained in:
Ronan Abhamon 2018-08-01 16:12:35 +02:00
parent e3c20a4731
commit d802577cda
43 changed files with 105 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/languages/ar.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/az.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/az@latin.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/cs.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/de.ts
View file

@ -404,7 +404,7 @@
<translation>ANRUF WEITERLEITEN</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>ANRUF PAUSIEREN</translation>
</message>
</context>
@ -1251,6 +1251,10 @@ Server URL ist nicht konfiguriert.</translation>
<source>keepCallsWindowInBackgroundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/de_DE.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/el.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/en.ts
View file

@ -404,7 +404,7 @@
<translation>TRANSFER CALL</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>PAUSE CALL</translation>
</message>
</context>
@ -1256,6 +1256,10 @@ your friend&apos;s SIP address or username.</translation>
<source>keepCallsWindowInBackgroundLabel</source>
<translation>Keep calls window in background</translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation>Call pause enabled</translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/es.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/es_AR.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/fi.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/fr.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/fr_FR.ts
View file

@ -404,7 +404,7 @@
<translation>TRANSFERER L&apos;APPEL</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>PAUSE</translation>
</message>
</context>
@ -1254,6 +1254,10 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>keepCallsWindowInBackgroundLabel</source>
<translation>Fenêtre d&apos;appels en tâche de fond</translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation>Autoriser la mise en pause</translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/he.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/hu.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/it.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/ja.ts
View file

@ -404,7 +404,7 @@
<translation>電話を転送する</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>電話を保留する</translation>
</message>
</context>
@ -1251,6 +1251,10 @@
<source>keepCallsWindowInBackgroundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/ka.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/ko_KR.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/lt.ts
View file

@ -404,7 +404,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>PRISTABDYTI SKAMBUTĮ</translation>
</message>
</context>
@ -1256,6 +1256,10 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą.</translation>
<source>keepCallsWindowInBackgroundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/mk_MK.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/nb_NO.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/nl.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/pl.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/pl_PL.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/pt_BR.ts
View file

@ -404,7 +404,7 @@
<translation>TRANSFERIR LIGAÇÃO</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>PAUSAR LIGAÇÃO</translation>
</message>
</context>
@ -1256,6 +1256,10 @@ o endereço SIP ou nome de usuário do seu amigo.</translation>
<source>keepCallsWindowInBackgroundLabel</source>
<translation>Manter as janelas de chamada em segundo plano</translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

6
assets/languages/ru.ts
View file

@ -404,7 +404,7 @@
<translation>ПЕРНАПРАВИТЬ ВЫЗОВ</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>ПРИОСТАНОВИТЬ ВЫЗОВ</translation>
</message>
</context>
@ -1254,6 +1254,10 @@
<source>keepCallsWindowInBackgroundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/ru_RU.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/sr.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

6
assets/languages/sv.ts
View file

@ -404,7 +404,7 @@
<translation>ÖVERFÖR SAMTAL</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>PAUSA SAMTAL</translation>
</message>
</context>
@ -1253,6 +1253,10 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>keepCallsWindowInBackgroundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

6
assets/languages/tr.ts
View file

@ -404,7 +404,7 @@
<translation>ÇAĞRIYI AKTAR</translation>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation>ÇAĞRIYI DURAKLAT</translation>
</message>
</context>
@ -1253,6 +1253,10 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin.</translation>
<source>keepCallsWindowInBackgroundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>callPauseEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

2
assets/languages/uk.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/zh-Hant.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/zh.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/zh_CN.GB2312.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/zh_CN.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

2
assets/languages/zh_TW.ts
View file

@ -402,7 +402,7 @@
<translation type="unfinished"/>
</message>
<message>
<source>pauseCall</source>
<source>callPause</source>
<translation type="unfinished"/>
</message>
</context>

9
src/components/settings/SettingsModel.cpp
View file

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

5
src/components/settings/SettingsModel.hpp
View file

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

4
ui/modules/Linphone/Calls/Calls.js
View file

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

1
ui/views/App/Calls/Incall.qml
View file

@ -409,6 +409,7 @@ Rectangle {
enabled: !call.pausedByUser
icon: 'pause'
updating: incall.call.updating
visible: SettingsModel.callPauseEnabled
onClicked: incall.call.pausedByUser = enabled

1
ui/views/App/Calls/IncallFullscreenWindow.qml
View file

@ -364,6 +364,7 @@ Window {
enabled: !call.pausedByUser
icon: 'pause'
updating: call.updating
visible: SettingsModel.callPauseEnabled
onClicked: window.exit(function () { call.pausedByUser = enabled })
}

14
ui/views/App/Settings/SettingsCallsChat.qml
View file

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