diff options
author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2021-11-07 12:42:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-07 12:42:40 +0100 |
commit | 1bdf4ebd2102eafb2afcf50a0a18ec43d896056c (patch) | |
tree | e21a55f41b76b6048e0cc88dd689dd41c4de8a63 /resources/qml/dialogs | |
parent | Merge pull request #790 from LorenDB/fixRRDialog (diff) | |
parent | Move away from using an event loop to access secrets (diff) | |
download | nheko-1bdf4ebd2102eafb2afcf50a0a18ec43d896056c.tar.xz |
Merge pull request #791 from Nheko-Reborn/secret-storage-fixes
Move away from using an event loop to access secrets
Diffstat (limited to 'resources/qml/dialogs')
-rw-r--r-- | resources/qml/dialogs/LogoutDialog.qml | 2 | ||||
-rw-r--r-- | resources/qml/dialogs/RoomSettings.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/dialogs/LogoutDialog.qml b/resources/qml/dialogs/LogoutDialog.qml index eb82dd15..c571a89e 100644 --- a/resources/qml/dialogs/LogoutDialog.qml +++ b/resources/qml/dialogs/LogoutDialog.qml @@ -14,6 +14,6 @@ MessageDialog { text: CallManager.isOnCall ? qsTr("A call is in progress. Log out?") : qsTr("Are you sure you want to log out?") modality: Qt.WindowModal flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint - buttons: Dialog.Ok | Dialog.Cancel + buttons: MessageDialog.Ok | MessageDialog.Cancel onAccepted: Nheko.logout() } diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml index 0e7749ce..b0f7730b 100644 --- a/resources/qml/dialogs/RoomSettings.qml +++ b/resources/qml/dialogs/RoomSettings.qml @@ -239,7 +239,7 @@ ApplicationWindow { onRejected: { encryptionToggle.checked = false; } - buttons: Dialog.Ok | Dialog.Cancel + buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel } MatrixText { |