From 1ab4edb6cc510ce15d7965823ecc5b879d946a96 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Tue, 7 Sep 2021 11:55:50 -0400
Subject: [PATCH] misc: issue fixes for LinkedDevices view
1. Use correct model for calling revokeDevice
2. Fix RevokeDevicePasswordDialog background color
Change-Id: I0056bcde8012d76a9010c6ba95f93a8cb8bffc2e
---
src/settingsview/components/LinkedDevices.qml | 4 ++--
src/settingsview/components/RevokeDevicePasswordDialog.qml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml
index a57e91f14..f1b9f2c18 100644
--- a/src/settingsview/components/LinkedDevices.qml
+++ b/src/settingsview/components/LinkedDevices.qml
@@ -61,7 +61,7 @@ ColumnLayout {
RevokeDevicePasswordDialog{
id: revokeDevicePasswordDialog
- onRevokeDeviceWithPassword: deviceItemListModel.revokeDevice(idOfDevice, password)
+ onRevokeDeviceWithPassword: deviceItemListModel.sourceModel.revokeDevice(idOfDevice, password)
}
SimpleMessageDialog {
@@ -75,7 +75,7 @@ ColumnLayout {
buttonTitles: [JamiStrings.optionOk, JamiStrings.optionCancel]
buttonStyles: [SimpleMessageDialog.ButtonStyle.TintedBlue,
SimpleMessageDialog.ButtonStyle.TintedBlack]
- buttonCallBacks: [function() {deviceItemListModel.revokeDevice(idOfDev, "")}]
+ buttonCallBacks: [function() {deviceItemListModel.sourceModel.revokeDevice(idOfDev, "")}]
}
Label {
diff --git a/src/settingsview/components/RevokeDevicePasswordDialog.qml b/src/settingsview/components/RevokeDevicePasswordDialog.qml
index cc983f5b9..043205535 100644
--- a/src/settingsview/components/RevokeDevicePasswordDialog.qml
+++ b/src/settingsview/components/RevokeDevicePasswordDialog.qml
@@ -43,6 +43,7 @@ BaseDialog {
contentItem: Rectangle {
id: revokeDeviceContentRect
+ color: JamiTheme.secondaryBackgroundColor
implicitWidth: JamiTheme.preferredDialogWidth
implicitHeight: JamiTheme.preferredDialogHeight
--
GitLab