From d1e1e9363d4fd61e44d1349802ec17f2db4eeb4c Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 17 Nov 2021 06:26:33 +0100
Subject: [PATCH] Fix qml warnings and missing icons
---
resources/qml/dialogs/RoomSettings.qml | 4 ++--
resources/qml/dialogs/UserProfile.qml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index b1448644d..1eeef98b5 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -87,7 +87,7 @@ ApplicationWindow {
Connections {
target: roomSettings
- onDisplayError: {
+ function onDisplayError(errorMessage) {
errorText.text = errorMessage;
errorText.opacity = 1;
hideErrorAnimation.restart();
@@ -229,7 +229,7 @@ ApplicationWindow {
title: qsTr("End-to-End Encryption")
text: qsTr("Encryption is currently experimental and things might break unexpectedly. <br>
Please take note that it can't be disabled afterwards.")
- modality: Qt.Modal
+ modality: Qt.NonModal
onAccepted: {
if (roomSettings.isEncryptionEnabled)
return ;
diff --git a/resources/qml/dialogs/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml
index 6c8f9ba29..ba3f3a45d 100644
--- a/resources/qml/dialogs/UserProfile.qml
+++ b/resources/qml/dialogs/UserProfile.qml
@@ -314,9 +314,9 @@ ApplicationWindow {
case VerificationStatus.UNVERIFIED:
return "image://colorimage/:/icons/icons/ui/shield-filled-exclamation-mark.svg?#d6c020";
case VerificationStatus.SELF:
- return "image://colorimage/:/icons/ui/checkmark.svg?green";
+ return "image://colorimage/:/icons/icons/ui/checkmark.svg?green";
default:
- return "image://colorimage/:/icons/ui/shield-filled-cross.svg?#d6c020";
+ return "image://colorimage/:/icons/icons/ui/shield-filled-cross.svg?#d6c020";
}
}
}
--
GitLab