From b0fdeb79eb2ba0512d3641b3ecdd15c1bbb3d7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 12 Mar 2021 16:21:06 -0500
Subject: [PATCH] settings: do not show link device for a disabled account
Gitlab: #334
Change-Id: Ia2b6365f36b0cef79e3ba58475c5b25bbac0c6b6
---
src/settingsview/components/LinkedDevices.qml | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml
index 242c422cb..846821978 100644
--- a/src/settingsview/components/LinkedDevices.qml
+++ b/src/settingsview/components/LinkedDevices.qml
@@ -35,6 +35,7 @@ ColumnLayout {
Connections {
id: accountConnections_DeviceModel
+
target: AccountAdapter.deviceModel
enabled: root.visible
@@ -51,13 +52,26 @@ ColumnLayout {
}
}
+ Connections {
+ id: accountConnections
+
+ target: AccountAdapter
+ enabled: root.visible
+
+ function onAccountStatusChanged(id) {
+ if (SettingsAdapter.getAccountConfig_Manageruri() === ""){
+ linkDevPushButton.visible = SettingsAdapter.get_CurrentAccountInfo_Enabled()
+ }
+ }
+ }
+
function connectCurrentAccount(status) {
accountConnections_DeviceModel.enabled = status
}
function updateAndShowDevicesSlot() {
- if(SettingsAdapter.getAccountConfig_Manageruri() === ""){
- linkDevPushButton.visible = true
+ if (SettingsAdapter.getAccountConfig_Manageruri() === ""){
+ linkDevPushButton.visible = SettingsAdapter.get_CurrentAccountInfo_Enabled()
}
settingsListView.model.reset()
}
@@ -145,8 +159,6 @@ ColumnLayout {
Layout.preferredWidth: JamiTheme.preferredFieldWidth
Layout.preferredHeight: JamiTheme.preferredFieldHeight
- visible: SettingsAdapter.getAccountConfig_Manageruri() === ""
-
color: JamiTheme.buttonTintedBlack
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
--
GitLab