thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements

Browse source
This commit is contained in:
Joseph Donofry 2021-11-09 18:34:40 -05:00
commit c68c8de74f
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
6 changed files with 191 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/dialogs/LogoutDialog.qml
View file

@ -2,18 +2,18 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
import Qt.labs.platform 1.1
import Qt.labs.platform 1.1 as P
import QtQuick 2.15
import QtQuick.Controls 2.15
import im.nheko 1.0
MessageDialog {
P.MessageDialog {
id: logoutRoot
title: qsTr("Log out")
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: MessageDialog.Ok | MessageDialog.Cancel
buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel
onAccepted: Nheko.logout()
}

1
resources/qml/dialogs/ReadReceipts.qml
View file

@ -81,6 +81,7 @@ ApplicationWindow {
userid: model.mxid
url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
displayName: model.displayName
enabled: false
}
ColumnLayout {