diff --git a/assets/languages/de.ts b/assets/languages/de.ts index bf19c9540..405893e0e 100644 --- a/assets/languages/de.ts +++ b/assets/languages/de.ts @@ -1231,7 +1231,7 @@ Klicken Sie hier: <a href="%1">%1</a> - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/assets/languages/en.ts b/assets/languages/en.ts index 9248799ee..31d7a4eae 100644 --- a/assets/languages/en.ts +++ b/assets/languages/en.ts @@ -1233,8 +1233,8 @@ your friend's SIP address or username. Enable mute microphone - outgoingCallEnabledLabel - Enable outgoing call + outgoingCallsEnabledLabel + Enable outgoing calls diff --git a/assets/languages/fr_FR.ts b/assets/languages/fr_FR.ts index 31b66d7b2..a99af9805 100644 --- a/assets/languages/fr_FR.ts +++ b/assets/languages/fr_FR.ts @@ -1231,7 +1231,7 @@ Cliquez ici : <a href="%1">%1</a> Activer les contacts - outgoingCallEnabledLabel + outgoingCallsEnabledLabel Activer les appels sortants diff --git a/assets/languages/ja.ts b/assets/languages/ja.ts index da9a43cbe..80287cbc4 100644 --- a/assets/languages/ja.ts +++ b/assets/languages/ja.ts @@ -1228,7 +1228,7 @@ - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/assets/languages/lt.ts b/assets/languages/lt.ts index c998f1cd8..e6131977d 100644 --- a/assets/languages/lt.ts +++ b/assets/languages/lt.ts @@ -1233,7 +1233,7 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą. - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/assets/languages/pt_BR.ts b/assets/languages/pt_BR.ts index 34f58a1ef..fccfe3bf3 100644 --- a/assets/languages/pt_BR.ts +++ b/assets/languages/pt_BR.ts @@ -1233,7 +1233,7 @@ o endereço SIP ou nome de usuário do seu amigo. - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/assets/languages/ru.ts b/assets/languages/ru.ts index 43066637b..5b2560f6b 100644 --- a/assets/languages/ru.ts +++ b/assets/languages/ru.ts @@ -1231,7 +1231,7 @@ - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/assets/languages/sv.ts b/assets/languages/sv.ts index 47c356948..7b1d9b169 100644 --- a/assets/languages/sv.ts +++ b/assets/languages/sv.ts @@ -1230,7 +1230,7 @@ Klicka här: <a href="%1">%1</a> - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/assets/languages/tr.ts b/assets/languages/tr.ts index 045bc75f5..75f80d6e6 100644 --- a/assets/languages/tr.ts +++ b/assets/languages/tr.ts @@ -1233,7 +1233,7 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. - outgoingCallEnabledLabel + outgoingCallsEnabledLabel diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index be2f667d4..c52702a50 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -281,13 +281,13 @@ void SettingsModel::setAutoAnswerVideoStatus (bool status) { // ----------------------------------------------------------------------------- -bool SettingsModel::getOutgoingCallEnabled () const { +bool SettingsModel::getOutgoingCallsEnabled () const { return !!mConfig->getInt(UiSection, "outgoing_call_enabled", 1); } -void SettingsModel::setOutgoingCallEnabled (bool status) { +void SettingsModel::setOutgoingCallsEnabled (bool status) { mConfig->setInt(UiSection, "outgoing_call_enabled", status); - emit outgoingCallEnabledChanged(status); + emit outgoingCallsEnabledChanged(status); } // ----------------------------------------------------------------------------- diff --git a/src/components/settings/SettingsModel.hpp b/src/components/settings/SettingsModel.hpp index 7cec093f7..0e7747c5b 100644 --- a/src/components/settings/SettingsModel.hpp +++ b/src/components/settings/SettingsModel.hpp @@ -69,7 +69,7 @@ class SettingsModel : public QObject { Q_PROPERTY(bool autoAnswerVideoStatus READ getAutoAnswerVideoStatus WRITE setAutoAnswerVideoStatus NOTIFY autoAnswerVideoStatusChanged); Q_PROPERTY(int autoAnswerDelay READ getAutoAnswerDelay WRITE setAutoAnswerDelay NOTIFY autoAnswerDelayChanged); - Q_PROPERTY(bool outgoingCallEnabled READ getOutgoingCallEnabled WRITE setOutgoingCallEnabled NOTIFY outgoingCallEnabledChanged); + Q_PROPERTY(bool outgoingCallsEnabled READ getOutgoingCallsEnabled WRITE setOutgoingCallsEnabled NOTIFY outgoingCallsEnabledChanged); Q_PROPERTY(bool callRecorderEnabled READ getCallRecorderEnabled WRITE setCallRecorderEnabled NOTIFY callRecorderEnabledChanged); @@ -222,8 +222,8 @@ public: int getAutoAnswerDelay () const; void setAutoAnswerDelay (int delay); - bool getOutgoingCallEnabled () const; - void setOutgoingCallEnabled (bool status); + bool getOutgoingCallsEnabled () const; + void setOutgoingCallsEnabled (bool status); bool getCallRecorderEnabled () const; void setCallRecorderEnabled (bool status); @@ -396,7 +396,7 @@ signals: void autoAnswerVideoStatusChanged (bool status); void autoAnswerDelayChanged (int delay); - void outgoingCallEnabledChanged (bool status); + void outgoingCallsEnabledChanged (bool status); void callRecorderEnabledChanged (bool status); diff --git a/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml index 662280133..4e30d18e2 100644 --- a/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml +++ b/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml @@ -43,14 +43,14 @@ SearchBox { searchBox.closeMenu() searchBox.launchVideoCall(entry.sipAddress) }, - visible: SettingsModel.videoSupported && SettingsModel.outgoingCallEnabled + visible: SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled }, { icon: 'call', handler: function (entry) { searchBox.closeMenu() searchBox.launchCall(entry.sipAddress) }, - visible: SettingsModel.outgoingCallEnabled + visible: SettingsModel.outgoingCallsEnabled }, { icon: SettingsModel.chatEnabled ? 'chat' : 'history', handler: function (entry) { diff --git a/ui/views/App/Calls/CallsWindow.qml b/ui/views/App/Calls/CallsWindow.qml index d6e844ee6..b98f9acd1 100644 --- a/ui/views/App/Calls/CallsWindow.qml +++ b/ui/views/App/Calls/CallsWindow.qml @@ -88,7 +88,7 @@ Window { Layout.fillWidth: true Layout.preferredHeight: CallsWindowStyle.callsList.header.height - visible: SettingsModel.outgoingCallEnabled || SettingsModel.conferenceEnabled + visible: SettingsModel.outgoingCallsEnabled || SettingsModel.conferenceEnabled LinearGradient { anchors.fill: parent @@ -113,7 +113,7 @@ Window { ActionButton { icon: 'new_call' - visible: SettingsModel.outgoingCallEnabled + visible: SettingsModel.outgoingCallsEnabled onClicked: Logic.openCallSipAddress() } diff --git a/ui/views/App/Main/Contacts.qml b/ui/views/App/Main/Contacts.qml index b9f8ea95c..94364f641 100644 --- a/ui/views/App/Main/Contacts.qml +++ b/ui/views/App/Main/Contacts.qml @@ -132,14 +132,14 @@ ColumnLayout { ActionButton { icon: 'video_call' - visible: SettingsModel.videoSupported && SettingsModel.outgoingCallEnabled + visible: SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled onClicked: actions.itemAt(0).open() } ActionButton { icon: 'call' - visible: SettingsModel.outgoingCallEnabled + visible: SettingsModel.outgoingCallsEnabled onClicked: actions.itemAt(1).open() } diff --git a/ui/views/App/Main/Conversation.qml b/ui/views/App/Main/Conversation.qml index 6c545b7a3..4850e6120 100644 --- a/ui/views/App/Main/Conversation.qml +++ b/ui/views/App/Main/Conversation.qml @@ -75,14 +75,14 @@ ColumnLayout { ActionButton { icon: 'video_call' - visible: SettingsModel.videoSupported && SettingsModel.outgoingCallEnabled + visible: SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled onClicked: CallsListModel.launchVideoCall(conversation.sipAddress) } ActionButton { icon: 'call' - visible: SettingsModel.outgoingCallEnabled + visible: SettingsModel.outgoingCallsEnabled onClicked: CallsListModel.launchAudioCall(conversation.sipAddress) } diff --git a/ui/views/App/Settings/SettingsCallsChat.qml b/ui/views/App/Settings/SettingsCallsChat.qml index 5e555d439..9e06448c6 100644 --- a/ui/views/App/Settings/SettingsCallsChat.qml +++ b/ui/views/App/Settings/SettingsCallsChat.qml @@ -105,12 +105,12 @@ TabContainer { visible: SettingsModel.developerSettingsEnabled FormGroup { - label: qsTr('outgoingCallEnabledLabel') + label: qsTr('outgoingCallsEnabledLabel') Switch { - checked: SettingsModel.outgoingCallEnabled + checked: SettingsModel.outgoingCallsEnabled - onClicked: SettingsModel.outgoingCallEnabled = !checked + onClicked: SettingsModel.outgoingCallsEnabled = !checked } } }