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

fix(Settings): use outgoingCallsEnabled instead of outgoingCallEnabled

Browse source
This commit is contained in:
Ronan Abhamon 2018-07-18 15:44:52 +02:00
parent 9cb3879395
commit d6ffb784e3
16 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/languages/de.ts
View file

@ -1231,7 +1231,7 @@ Klicken Sie hier: <a href="%1">%1</a>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

4
assets/languages/en.ts
View file

@ -1233,8 +1233,8 @@ your friend&apos;s SIP address or username.</translation>
<translation>Enable mute microphone</translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<translation>Enable outgoing call</translation>
<source>outgoingCallsEnabledLabel</source>
<translation>Enable outgoing calls</translation>
</message>
</context>
<context>

2
assets/languages/fr_FR.ts
View file

@ -1231,7 +1231,7 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Activer les contacts</translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation>Activer les appels sortants</translation>
</message>
</context>

2
assets/languages/ja.ts
View file

@ -1228,7 +1228,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

2
assets/languages/lt.ts
View file

@ -1233,7 +1233,7 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

2
assets/languages/pt_BR.ts
View file

@ -1233,7 +1233,7 @@ o endereço SIP ou nome de usuário do seu amigo.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

2
assets/languages/ru.ts
View file

@ -1231,7 +1231,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

2
assets/languages/sv.ts
View file

@ -1230,7 +1230,7 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

2
assets/languages/tr.ts
View file

@ -1233,7 +1233,7 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>outgoingCallEnabledLabel</source>
<source>outgoingCallsEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>

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

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

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

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

4
ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
View file

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

4
ui/views/App/Calls/CallsWindow.qml
View file

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

4
ui/views/App/Main/Contacts.qml
View file

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

4
ui/views/App/Main/Conversation.qml
View file

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

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

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