Adding Room Key Verification Stuff
2 files changed, 75 insertions, 1 deletions
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index 5bdccb4d..c7dbc9aa 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -74,6 +74,26 @@ ApplicationWindow{
Layout.alignment: Qt.AlignHCenter
}
+ Button {
+ id: verifyUserButton
+ text: "Verify"
+ Layout.alignment: Qt.AlignHCenter
+ enabled: profile.isUserVerified?false:true
+ visible: profile.isUserVerified?false:true
+ palette {
+ button: "white"
+ }
+ contentItem: Text {
+ text: verifyUserButton.text
+ color: "black"
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ }
+ onClicked: {
+ profile.verifyUser();
+ }
+ }
+
RowLayout {
Layout.alignment: Qt.AlignHCenter
ImageButton {
@@ -127,7 +147,7 @@ ApplicationWindow{
}
ScrollView {
- implicitHeight: userProfileDialog.height/2 + 20
+ implicitHeight: userProfileDialog.height/2-13
implicitWidth: userProfileDialog.width-20
clip: true
Layout.alignment: Qt.AlignHCenter
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index 6f69f026..c556a978 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -128,6 +128,60 @@ Item {
}
}
DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationRequest
+ NoticeMessage {
+ text: "KeyVerificationRequest";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationStart
+ NoticeMessage {
+ text: "KeyVerificationStart";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationReady
+ NoticeMessage {
+ text: "KeyVerificationReady";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationCancel
+ NoticeMessage {
+ text: "KeyVerificationCancel";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationKey
+ NoticeMessage {
+ text: "KeyVerificationKey";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationMac
+ NoticeMessage {
+ text: "KeyVerificationMac";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationDone
+ NoticeMessage {
+ text: "KeyVerificationDone";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationDone
+ NoticeMessage {
+ text: "KeyVerificationDone";
+ }
+ }
+ DelegateChoice {
+ roleValue: MtxEvent.KeyVerificationAccept
+ NoticeMessage {
+ text: "KeyVerificationAccept";
+ }
+ }
+ DelegateChoice {
Placeholder {}
}
}
|
