From 665e244844260f76d28e025d4bf64b4aec1eeb59 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 21 Oct 2022 18:45:57 +0200 Subject: [PATCH] Hide password url if not set. Fix ldap settings placehodler. --- .../src/components/settings/AccountSettingsModel.cpp | 6 ++++++ .../src/components/settings/AccountSettingsModel.hpp | 2 ++ .../ui/views/App/Main/Assistant/UseAppSipAccount.qml | 1 + .../ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp index ef7312ec1..fe117ed53 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp @@ -506,6 +506,12 @@ QString AccountSettingsModel::getPrimarySipAddress () const { ); } +QString AccountSettingsModel::getPrimaryDomain() const{ + return Utils::coreStringToAppString( + CoreManager::getInstance()->getCore()->createPrimaryContactParsed()->getDomain() + ); +} + // ----------------------------------------------------------------------------- QVariantList AccountSettingsModel::getAccounts () const { diff --git a/linphone-app/src/components/settings/AccountSettingsModel.hpp b/linphone-app/src/components/settings/AccountSettingsModel.hpp index 23d6ef92f..277b52461 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.hpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.hpp @@ -47,6 +47,7 @@ class AccountSettingsModel : public QObject { Q_PROPERTY(QString primaryDisplayName READ getPrimaryDisplayName WRITE setPrimaryDisplayName NOTIFY primaryDisplayNameChanged) Q_PROPERTY(QString primaryUsername READ getPrimaryUsername WRITE setPrimaryUsername NOTIFY primaryUsernameChanged) Q_PROPERTY(QString primarySipAddress READ getPrimarySipAddress NOTIFY primarySipAddressChanged) + Q_PROPERTY(QString primaryDomain READ getPrimaryDomain NOTIFY primarySipAddressChanged) Q_PROPERTY(QVariantList accounts READ getAccounts NOTIFY accountsChanged) @@ -128,6 +129,7 @@ private: void setPrimaryDisplayName (const QString &displayName); QString getPrimarySipAddress () const; + QString getPrimaryDomain () const; // --------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml index 51b8537b0..e7bbd5c14 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml @@ -52,6 +52,7 @@ AssistantAbstractView { } Text { anchors.right:parent.right + visible: ConstantsCpp.PasswordRecoveryUrl elide: Text.ElideRight font.pointSize: AboutStyle.copyrightBlock.url.pointSize linkColor: AboutStyle.copyrightBlock.url.color diff --git a/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml b/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml index 0424fb6bb..eaefb5db9 100644 --- a/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml +++ b/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml @@ -298,7 +298,7 @@ DialogPlus { label: qsTr('domainLabel')//'Domain' TextField { id:domain - placeholderText :'sip.linphone.org' + placeholderText : AccountSettingsModel.primaryDomain text:ldapData.sipDomain error : ldapData.sipDomainFieldError onTextChanged: ldapData.sipDomain = text