diff --git a/Linphone/core/setting/SettingsCore.cpp b/Linphone/core/setting/SettingsCore.cpp index e19ae31dd..e9b18b28e 100644 --- a/Linphone/core/setting/SettingsCore.cpp +++ b/Linphone/core/setting/SettingsCore.cpp @@ -106,7 +106,7 @@ SettingsCore::SettingsCore(QObject *parent) : QObject(parent) { INIT_CORE_MEMBER(AssistantDisableQrCode, settingsModel) INIT_CORE_MEMBER(AssistantHideThirdPartyAccount, settingsModel) - INIT_CORE_MEMBER(OnlyDisplaySipUriUsername, settingsModel) + INIT_CORE_MEMBER(HideSipAddresses, settingsModel) INIT_CORE_MEMBER(DarkModeAllowed, settingsModel) INIT_CORE_MEMBER(MaxAccount, settingsModel) INIT_CORE_MEMBER(AssistantGoDirectlyToThirdPartySipAccountLogin, settingsModel) @@ -179,7 +179,7 @@ SettingsCore::SettingsCore(const SettingsCore &settingsCore) { mAssistantDisableQrCode = settingsCore.mAssistantDisableQrCode; mAssistantHideThirdPartyAccount = settingsCore.mAssistantHideThirdPartyAccount; - mOnlyDisplaySipUriUsername = settingsCore.mOnlyDisplaySipUriUsername; + mHideSipAddresses = settingsCore.mHideSipAddresses; mDarkModeAllowed = settingsCore.mDarkModeAllowed; mMaxAccount = settingsCore.mMaxAccount; mAssistantGoDirectlyToThirdPartySipAccountLogin = settingsCore.mAssistantGoDirectlyToThirdPartySipAccountLogin; @@ -386,7 +386,7 @@ void SettingsCore::setSelf(QSharedPointer me) { DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, assistantHideThirdPartyAccount, AssistantHideThirdPartyAccount) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, - onlyDisplaySipUriUsername, OnlyDisplaySipUriUsername) + hideSipAddresses, HideSipAddresses) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, darkModeAllowed, DarkModeAllowed) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, int, maxAccount, @@ -494,7 +494,7 @@ void SettingsCore::reset(const SettingsCore &settingsCore) { setAssistantDisableQrCode(settingsCore.mAssistantDisableQrCode); setAssistantHideThirdPartyAccount(settingsCore.mAssistantHideThirdPartyAccount); - setOnlyDisplaySipUriUsername(settingsCore.mOnlyDisplaySipUriUsername); + setHideSipAddresses(settingsCore.mHideSipAddresses); setDarkModeAllowed(settingsCore.mDarkModeAllowed); setMaxAccount(settingsCore.mMaxAccount); setAssistantGoDirectlyToThirdPartySipAccountLogin(settingsCore.mAssistantGoDirectlyToThirdPartySipAccountLogin); @@ -965,7 +965,7 @@ void SettingsCore::writeIntoModel(std::shared_ptr model) const { model->setAssistantDisableQrCode(mAssistantDisableQrCode); model->setAssistantHideThirdPartyAccount(mAssistantHideThirdPartyAccount); - model->setOnlyDisplaySipUriUsername(mOnlyDisplaySipUriUsername); + model->setHideSipAddresses(mHideSipAddresses); model->setDarkModeAllowed(mDarkModeAllowed); model->setMaxAccount(mMaxAccount); model->setAssistantGoDirectlyToThirdPartySipAccountLogin(mAssistantGoDirectlyToThirdPartySipAccountLogin); @@ -1031,7 +1031,7 @@ void SettingsCore::writeFromModel(const std::shared_ptr &model) { mAssistantDisableQrCode = model->getAssistantDisableQrCode(); mAssistantHideThirdPartyAccount = model->getAssistantHideThirdPartyAccount(); - mOnlyDisplaySipUriUsername = model->getOnlyDisplaySipUriUsername(); + mHideSipAddresses = model->getHideSipAddresses(); mDarkModeAllowed = model->getDarkModeAllowed(); mMaxAccount = model->getMaxAccount(); mAssistantGoDirectlyToThirdPartySipAccountLogin = model->getAssistantGoDirectlyToThirdPartySipAccountLogin(); diff --git a/Linphone/core/setting/SettingsCore.hpp b/Linphone/core/setting/SettingsCore.hpp index 6a425d3ff..d819db933 100644 --- a/Linphone/core/setting/SettingsCore.hpp +++ b/Linphone/core/setting/SettingsCore.hpp @@ -211,7 +211,7 @@ public: DECLARE_CORE_GETSET_MEMBER(bool, assistantHideCreateAccount, AssistantHideCreateAccount) DECLARE_CORE_GETSET_MEMBER(bool, assistantDisableQrCode, AssistantDisableQrCode) DECLARE_CORE_GETSET_MEMBER(bool, assistantHideThirdPartyAccount, AssistantHideThirdPartyAccount) - DECLARE_CORE_GETSET_MEMBER(bool, onlyDisplaySipUriUsername, OnlyDisplaySipUriUsername) + DECLARE_CORE_GETSET_MEMBER(bool, hideSipAddresses, HideSipAddresses) DECLARE_CORE_GETSET_MEMBER(bool, darkModeAllowed, DarkModeAllowed) DECLARE_CORE_GETSET_MEMBER(int, maxAccount, MaxAccount) DECLARE_CORE_GETSET_MEMBER(bool, diff --git a/Linphone/model/setting/SettingsModel.cpp b/Linphone/model/setting/SettingsModel.cpp index 43f269f51..37a529a1b 100644 --- a/Linphone/model/setting/SettingsModel.cpp +++ b/Linphone/model/setting/SettingsModel.cpp @@ -732,7 +732,7 @@ void SettingsModel::notifyConfigReady(){ DEFINE_NOTIFY_CONFIG_READY(assistantHideCreateAccount, AssistantHideCreateAccount) DEFINE_NOTIFY_CONFIG_READY(assistantDisableQrCode, AssistantDisableQrCode) DEFINE_NOTIFY_CONFIG_READY(assistantHideThirdPartyAccount, AssistantHideThirdPartyAccount) - DEFINE_NOTIFY_CONFIG_READY(onlyDisplaySipUriUsername, OnlyDisplaySipUriUsername) + DEFINE_NOTIFY_CONFIG_READY(hideSipAddresses, HideSipAddresses) DEFINE_NOTIFY_CONFIG_READY(darkModeAllowed, DarkModeAllowed) DEFINE_NOTIFY_CONFIG_READY(assistantGoDirectlyToThirdPartySipAccountLogin, AssistantGoDirectlyToThirdPartySipAccountLogin) @@ -794,9 +794,9 @@ DEFINE_GETSET_CONFIG(SettingsModel, DEFINE_GETSET_CONFIG(SettingsModel, bool, Bool, - onlyDisplaySipUriUsername, - OnlyDisplaySipUriUsername, - "only_display_sip_uri_username", + hideSipAddresses, + HideSipAddresses, + "hide_sip_addresses", false) DEFINE_GETSET_CONFIG(SettingsModel, bool, diff --git a/Linphone/model/setting/SettingsModel.hpp b/Linphone/model/setting/SettingsModel.hpp index d833b36dc..e28d207bf 100644 --- a/Linphone/model/setting/SettingsModel.hpp +++ b/Linphone/model/setting/SettingsModel.hpp @@ -168,7 +168,7 @@ public: DECLARE_GETSET(bool, assistantHideCreateAccount, AssistantHideCreateAccount) DECLARE_GETSET(bool, assistantDisableQrCode, AssistantDisableQrCode) DECLARE_GETSET(bool, assistantHideThirdPartyAccount, AssistantHideThirdPartyAccount) - DECLARE_GETSET(bool, onlyDisplaySipUriUsername, OnlyDisplaySipUriUsername) + DECLARE_GETSET(bool, hideSipAddresses, HideSipAddresses) DECLARE_GETSET(bool, darkModeAllowed, DarkModeAllowed) DECLARE_GETSET(int, maxAccount, MaxAccount) DECLARE_GETSET(bool, assistantGoDirectlyToThirdPartySipAccountLogin, AssistantGoDirectlyToThirdPartySipAccountLogin) diff --git a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml index 41f597628..dc0d260be 100644 --- a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml +++ b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml @@ -111,7 +111,7 @@ ColumnLayout { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter visible: mainItem.specificAddress != "" - text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(mainItem.specificAddress) : mainItem.specificAddress + text: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(mainItem.specificAddress) : mainItem.specificAddress elide: Text.ElideMiddle maximumLineCount: 1 font { diff --git a/Linphone/view/Control/Display/Contact/Avatar.qml b/Linphone/view/Control/Display/Contact/Avatar.qml index c2dac732e..f8c62434e 100644 --- a/Linphone/view/Control/Display/Contact/Avatar.qml +++ b/Linphone/view/Control/Display/Contact/Avatar.qml @@ -24,7 +24,7 @@ Loader{ : contact ? contact.core.defaultAddress : '' - readonly property string address: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_address) : _address + readonly property string address: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(_address) : _address property var displayNameObj: UtilsCpp.getDisplayName(_address) property string displayNameVal: account && account.core.displayName ? account.core.displayName diff --git a/Linphone/view/Control/Display/Contact/ContactListItem.qml b/Linphone/view/Control/Display/Contact/ContactListItem.qml index 73626327f..54cd73ea6 100644 --- a/Linphone/view/Control/Display/Contact/ContactListItem.qml +++ b/Linphone/view/Control/Display/Contact/ContactListItem.qml @@ -91,7 +91,7 @@ FocusScope { Layout.topMargin: Math.round(2 * DefaultStyle.dp) Layout.fillWidth: true visible: mainItem.showDefaultAddress - property string address: SettingsCpp.onlyDisplaySipUriUsername + property string address: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(mainItem.addressFromFilter) : mainItem.addressFromFilter text: UtilsCpp.boldTextPart(address, mainItem.highlightText) diff --git a/Linphone/view/Control/Display/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml index 6973506f6..5e90f7ae0 100644 --- a/Linphone/view/Control/Display/Sticker.qml +++ b/Linphone/view/Control/Display/Sticker.qml @@ -183,7 +183,7 @@ Item { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter property string _text: mainItem.call && mainItem.call.core.remoteAddress - text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text + text: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(_text) : _text color: DefaultStyle.grey_0 font { pixelSize: Math.round(14 * DefaultStyle.dp) @@ -260,7 +260,7 @@ Item { : mainItem.account && mainItem.identityAddress ? mainItem.identityAddress.value : "" - text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text + text: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(_text) : _text color: DefaultStyle.grey_0 font { pixelSize: Math.round(14 * DefaultStyle.dp) diff --git a/Linphone/view/Page/Form/Contact/ContactDescription.qml b/Linphone/view/Page/Form/Contact/ContactDescription.qml index 0cc4dfcb8..3259d301b 100644 --- a/Linphone/view/Page/Form/Contact/ContactDescription.qml +++ b/Linphone/view/Page/Form/Contact/ContactDescription.qml @@ -10,7 +10,7 @@ ColumnLayout{ id: mainItem property AccountGui account: null property string topText: account ? account.core.displayName : "" - property string bottomText: account ? SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(account.core.identityAddress) : account.core.identityAddress : "" + property string bottomText: account ? SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(account.core.identityAddress) : account.core.identityAddress : "" spacing: 0 width: topTextItem.implicitWidth Text { diff --git a/Linphone/view/Page/Form/Contact/ContactEdition.qml b/Linphone/view/Page/Form/Contact/ContactEdition.qml index def43e716..817bc56de 100644 --- a/Linphone/view/Page/Form/Contact/ContactEdition.qml +++ b/Linphone/view/Page/Form/Contact/ContactEdition.qml @@ -305,7 +305,7 @@ MainRightPanel { if (text.length != 0) mainItem.contact.core.setAddressAt(index, label, text) } property string _initialText: modelData.address - initialText: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_initialText) : _initialText + initialText: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(_initialText) : _initialText backgroundColor: DefaultStyle.grey_0 focus: true KeyNavigation.right: removeAddressButton diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml index 73c580597..a70c7d5f6 100644 --- a/Linphone/view/Page/Main/Contact/ContactPage.qml +++ b/Linphone/view/Page/Main/Contact/ContactPage.qml @@ -536,7 +536,7 @@ FriendGui{ Text { Layout.fillWidth: true property string _text: listViewModelData.address - text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text + text: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(_text) : _text font { pixelSize: Typography.p1.pixelSize weight: Typography.p1.weight diff --git a/Linphone/view/Page/Window/AbstractWindow.qml b/Linphone/view/Page/Window/AbstractWindow.qml index db466f86a..b2e38daee 100644 --- a/Linphone/view/Page/Window/AbstractWindow.qml +++ b/Linphone/view/Page/Window/AbstractWindow.qml @@ -119,7 +119,7 @@ ApplicationWindow { } Text { Layout.leftMargin: Math.round(5 * DefaultStyle.dp) - text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(modelData.address) : modelData.address + text: SettingsCpp.hideSipAddresses ? UtilsCpp.getUsername(modelData.address) : modelData.address font { pixelSize: Typography.p1.pixelSize weight: Typography.p1.weight