Tweak UI for device verification and Add more slots
2 files changed, 68 insertions, 11 deletions
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index f29fb4c1..a85c41c3 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -5,6 +5,8 @@ import QtQuick.Window 2.3
import im.nheko 1.0
+import "./device-verification"
+
ApplicationWindow{
property var user_data
property var colors: currentActivePalette
@@ -20,7 +22,6 @@ ApplicationWindow{
id: userProfileList
userId: user_data.userId
onUserIdChanged : {
- console.log(userId)
userProfileList.updateDeviceList()
}
onDeviceListUpdated : {
@@ -84,15 +85,34 @@ ApplicationWindow{
delegate: RowLayout{
width: parent.width
- Text{
- Layout.fillWidth: true
- color: colors.text
- text: deviceID
+ ColumnLayout{
+ Text{
+ Layout.fillWidth: true
+ color: colors.text
+ Layout.alignment: Qt.AlignRight
+ text: deviceID
+ }
+ Text{
+ Layout.fillWidth: true
+ color:colors.text
+ Layout.alignment: Qt.AlignRight
+ text: displayName
+ }
+ Component {
+ id: deviceVerificationDialog
+ DeviceVerification {}
+ }
+ DeviceVerificationFlow {
+ id: deviceVerificationFlow
+ }
}
- Text{
- Layout.fillWidth: true
- color:colors.text
- text: displayName
+ Button{
+ text:"Verify"
+ onClicked: {
+ var dialog = deviceVerificationDialog.createObject(userProfileDialog,
+ {flow: deviceVerificationFlow,sender: true});
+ dialog.show();
+ }
}
}
}
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index dd637e59..ce2485ff 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -7,6 +7,7 @@ import Qt.labs.settings 1.0
import im.nheko 1.0
ApplicationWindow {
+ property bool sender: true
title: stack.currentItem.title
id: dialog
@@ -24,7 +25,7 @@ ApplicationWindow {
width: stack.implicitWidth
StackView {
id: stack
- initialItem: newVerificationRequest
+ initialItem: sender == true?newVerificationRequest:acceptNewVerificationRequest
implicitWidth: currentItem.implicitWidth
implicitHeight: currentItem.implicitHeight
}
@@ -47,7 +48,7 @@ ApplicationWindow {
Component {
id: newVerificationRequest
Pane {
- property string title: "Device Verification Request"
+ property string title: "Sending Device Verification Request"
ColumnLayout {
spacing: 16
Label {
@@ -82,6 +83,42 @@ ApplicationWindow {
Button {
Layout.alignment: Qt.AlignRight
text: "Start verification"
+ onClicked: { stack.replace(awaitingVerificationRequestAccept); flow.sendVerificationRequest(); }
+ }
+ }
+ }
+ }
+ }
+
+ Component {
+ id: acceptNewVerificationRequest
+ Pane {
+ property string title: "Recieving Device Verification Request"
+ ColumnLayout {
+ spacing: 16
+
+ Label {
+ Layout.maximumWidth: 400
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+ wrapMode: Text.Wrap
+ text: "The device was requested to be verified"
+
+ verticalAlignment: Text.AlignVCenter
+ }
+
+ RowLayout {
+ Button {
+ Layout.alignment: Qt.AlignLeft
+ text: "Deny"
+ onClicked: { dialog.close(); flow.cancelVerification(); }
+ }
+ Item {
+ Layout.fillWidth: true
+ }
+ Button {
+ Layout.alignment: Qt.AlignRight
+ text: "Accept"
onClicked: { stack.replace(awaitingVerificationRequestAccept); flow.acceptVerificationRequest(); }
}
}
|
