mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-30 18:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to call only when registered or not in Settings. Deactivated by default.

Browse source
This commit is contained in:
Julien Wadel 2021-08-09 11:15:51 +02:00
parent f0ec8daed0
commit 79703ea51b
21 changed files with 188 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1693,6 +1693,16 @@ Klik her: <a href="%1">%1</a>
<source>encryptionMandatoryLabel</source>
<translation>Krydning er obligatorisk</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1693,6 +1693,16 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>Verschlüsselung ist obligatorisch</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1698,6 +1698,16 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>Encryption is mandatory</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation>Hide empty chat rooms</translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation>Call when registered</translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1693,6 +1693,16 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>El cifrado es obligatorio</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1693,6 +1693,16 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>Chiffrement obligatoire</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1687,6 +1687,16 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>A titkosítás kötelező</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1693,6 +1693,16 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>La crittografia è obbligatoria</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1687,6 +1687,16 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<source>encryptionMandatoryLabel</source>
<translation>暗号化を必須にする</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1699,6 +1699,16 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>Šifravimas yra privalomas</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1693,6 +1693,16 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>A criptografia é obrigatória</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1699,6 +1699,16 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<source>encryptionMandatoryLabel</source>
<translation>Регистрация обязательна</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1693,6 +1693,16 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>Kryptering är obligatorisk</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1687,6 +1687,16 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>encryptionMandatoryLabel</source>
<translation>Şifreleme zorunludur</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1699,6 +1699,16 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<source>encryptionMandatoryLabel</source>
<translation>Обов&apos;язковий заселення</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

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

@ -1687,6 +1687,16 @@ Ephemeral message is only supported in conference based chat room!&apos;</extrac
<source>encryptionMandatoryLabel</source>
<translation>硬化是强制性的</translation>
</message>
<message>
<source>hideEmptyChatRoomsLabel</source>
<extracomment>&apos;Hide empty chat rooms&apos; : Label for a switch to choose if Linphone hide empty chat rooms</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>waitRegistrationForCallLabel</source>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

4
linphone-app/src/components/calls/CallsListModel.cpp
View file

@ -120,7 +120,7 @@ void CallsListModel::launchAudioCall (const QString &sipAddress, const QHash<QSt
CallModel::setRecordFile(params, Utils::coreStringToAppString(address->getUsername()));
shared_ptr<linphone::ProxyConfig> currentProxyConfig = core->getDefaultProxyConfig();
if(currentProxyConfig){
if(currentProxyConfig->getState() == linphone::RegistrationState::Ok)
if(!CoreManager::getInstance()->getSettingsModel()->getWaitRegistrationForCall() || currentProxyConfig->getState() == linphone::RegistrationState::Ok)
core->inviteAddressWithParams(address, params);
else{
QObject * context = new QObject();
@ -157,7 +157,7 @@ void CallsListModel::launchSecureAudioCall (const QString &sipAddress, LinphoneE
shared_ptr<linphone::ProxyConfig> currentProxyConfig = core->getDefaultProxyConfig();
params->setMediaEncryption(LinphoneEnums::toLinphone(encryption));
if(currentProxyConfig){
if(currentProxyConfig->getState() == linphone::RegistrationState::Ok)
if(!CoreManager::getInstance()->getSettingsModel()->getWaitRegistrationForCall() || currentProxyConfig->getState() == linphone::RegistrationState::Ok)
core->inviteAddressWithParams(address, params);
else{
QObject * context = new QObject();

11
linphone-app/src/components/settings/SettingsModel.cpp
View file

@ -622,6 +622,17 @@ void SettingsModel::setHideEmptyChatRooms(const bool& status){
mConfig->setInt("misc", "hide_empty_chat_rooms", status);
emit hideEmptyChatRoomsChanged(status);
}
// -----------------------------------------------------------------------------
bool SettingsModel::getWaitRegistrationForCall() const{
return !!mConfig->getInt(UiSection, "call_wait_registration", 0);
}
void SettingsModel::setWaitRegistrationForCall(const bool& status){
mConfig->setInt(UiSection, "call_wait_registration", status);
emit waitRegistrationForCallChanged(status);
}
// -----------------------------------------------------------------------------

7
linphone-app/src/components/settings/SettingsModel.hpp
View file

@ -105,7 +105,8 @@ class SettingsModel : public QObject {
Q_PROPERTY(bool chatEnabled READ getChatEnabled WRITE setChatEnabled NOTIFY chatEnabledChanged)
Q_PROPERTY(bool hideEmptyChatRooms READ getHideEmptyChatRooms WRITE setHideEmptyChatRooms NOTIFY hideEmptyChatRoomsChanged)
Q_PROPERTY(bool waitRegistrationForCall READ getWaitRegistrationForCall WRITE setWaitRegistrationForCall NOTIFY waitRegistrationForCallChanged)// Allow call only if the current proxy has been registered
Q_PROPERTY(bool conferenceEnabled READ getConferenceEnabled WRITE setConferenceEnabled NOTIFY conferenceEnabledChanged)
Q_PROPERTY(bool chatNotificationSoundEnabled READ getChatNotificationSoundEnabled WRITE setChatNotificationSoundEnabled NOTIFY chatNotificationSoundEnabledChanged)
@ -325,6 +326,9 @@ public:
bool getHideEmptyChatRooms() const;
void setHideEmptyChatRooms(const bool& data);
bool getWaitRegistrationForCall() const;
void setWaitRegistrationForCall(const bool& data);
bool getConferenceEnabled () const;
void setConferenceEnabled (bool status);
@ -542,6 +546,7 @@ signals:
void chatEnabledChanged (bool status);
void hideEmptyChatRoomsChanged (bool status);
void waitRegistrationForCallChanged (bool status);
void conferenceEnabledChanged (bool status);

1
linphone-app/ui/modules/Common/Form/Fields/TextField.qml
View file

@ -17,6 +17,7 @@ Controls.TextField {
property string error: ''
property var tools
property QtObject textFieldStyle : TextFieldStyle.normal
onTextFieldStyleChanged: if( !textFieldStyle) textFieldStyle = TextFieldStyle.normal
// ---------------------------------------------------------------------------

1
linphone-app/ui/modules/Common/Form/Switch.qml
View file

@ -13,6 +13,7 @@ Controls.Switch {
property bool enabled: true
property QtObject indicatorStyle : SwitchStyle.normal
onIndicatorStyleChanged: if( !indicatorStyle) indicatorStyle = SwitchStyle.normal
// ---------------------------------------------------------------------------

19
linphone-app/ui/views/App/Settings/SettingsCallsChat.qml
View file

@ -187,9 +187,21 @@ TabContainer {
}
FormLine {
visible: SettingsModel.callRecorderEnabled || SettingsModel.developerSettingsEnabled
FormGroup {
//: 'Call when registered' : Label on switch to choose if calls are make when the current proxy is registered
label: qsTr('waitRegistrationForCallLabel')
Switch {
id: waitRegistrationForCall
checked: SettingsModel.waitRegistrationForCall
onClicked: SettingsModel.waitRegistrationForCall = !checked
}
}
FormGroup {
visible: SettingsModel.callRecorderEnabled || SettingsModel.developerSettingsEnabled
label: qsTr('automaticallyRecordCallsLabel')
Switch {
@ -198,6 +210,7 @@ TabContainer {
onClicked: SettingsModel.automaticallyRecordCalls = !checked
}
}
}
}
@ -268,7 +281,8 @@ TabContainer {
}
FormLine {
FormGroup {
label: 'Hide empty chat rooms'
//: 'Hide empty chat rooms' : Label for a switch to choose if Linphone hide empty chat rooms
label: qsTr('hideEmptyChatRoomsLabel')
Switch {
id: hideEmptyChatRooms
@ -278,6 +292,7 @@ TabContainer {
onClicked: SettingsModel.hideEmptyChatRooms = !checked
}
}
}
FormLine {