From 11260c147c9681558916c80bcc2d7cc8193d22fa Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 9 Aug 2018 14:32:22 +0200 Subject: [PATCH] fix(AccountStatus): remove presence choice if rls uri is disabled --- ui/modules/Linphone/Account/AccountStatus.qml | 2 +- ui/views/App/Main/Dialogs/ManageAccounts.qml | 4 +++- ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/modules/Linphone/Account/AccountStatus.qml b/ui/modules/Linphone/Account/AccountStatus.qml index ea3dae9fe..25a109905 100644 --- a/ui/modules/Linphone/Account/AccountStatus.qml +++ b/ui/modules/Linphone/Account/AccountStatus.qml @@ -32,7 +32,7 @@ Item { PresenceLevel { anchors.fill: parent - level: OwnPresenceModel.presenceLevel + level: SettingsModel.rlsUriEnabled ? OwnPresenceModel.presenceLevel : Presence.Green visible: AccountSettingsModel.registrationState === AccountSettingsModel.RegistrationStateRegistered } diff --git a/ui/views/App/Main/Dialogs/ManageAccounts.qml b/ui/views/App/Main/Dialogs/ManageAccounts.qml index f20adba52..91a034b92 100644 --- a/ui/views/App/Main/Dialogs/ManageAccounts.qml +++ b/ui/views/App/Main/Dialogs/ManageAccounts.qml @@ -20,7 +20,7 @@ DialogPlus { centeredButtons: true objectName: '__manageAccounts' - height: ManageAccountsStyle.height + height: SettingsModel.rlsUriEnabled ? ManageAccountsStyle.height : ManageAccountsStyle.heightWithoutPresence width: ManageAccountsStyle.width // --------------------------------------------------------------------------- @@ -30,6 +30,8 @@ DialogPlus { orientation: Qt.Vertical FormLine { + visible: SettingsModel.rlsUriEnabled + FormGroup { label: qsTr('selectPresenceLabel') diff --git a/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml b/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml index a7f88b107..b93d5522f 100644 --- a/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml +++ b/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml @@ -5,5 +5,6 @@ import QtQml 2.2 QtObject { property int height: 234 + property int heightWithoutPresence: 165 property int width: 450 }