mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 19:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hide password url if not set.

Browse source 
Fix ldap settings placehodler.
This commit is contained in:
Julien Wadel 2022-10-21 18:45:57 +02:00
parent 54196cc950
commit 665e244844
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linphone-app/src/components/settings/AccountSettingsModel.cpp
View file

@ -506,6 +506,12 @@ QString AccountSettingsModel::getPrimarySipAddress () const {
);
}
QString AccountSettingsModel::getPrimaryDomain() const{
return Utils::coreStringToAppString(
CoreManager::getInstance()->getCore()->createPrimaryContactParsed()->getDomain()
);
}
// -----------------------------------------------------------------------------
QVariantList AccountSettingsModel::getAccounts () const {

2
linphone-app/src/components/settings/AccountSettingsModel.hpp
View file

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

1
linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml
View file

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

2
linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml
View file

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