d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up verification pages a bit

Browse source
This commit is contained in:
Nicolas Werner 2020-10-02 17:33:04 +02:00
parent d4dccc8e36
commit 51964c4fd7
9 changed files with 17 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
resources/qml/device-verification/AcceptNewVerificationRequest.qml
View file

@ -25,15 +25,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("Deny") text: qsTr("Deny")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
flow.cancelVerification(DeviceVerificationFlow.User); flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
@ -46,18 +38,10 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Accept") text: qsTr("Accept")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
stack.replace(awaitingVerificationRequestAccept); stack.replace(awaitingVerificationRequestAccept);
isRequest?flow.sendVerificationReady():flow.acceptVerificationRequest(); flow.sender ?flow.sendVerificationReady():flow.acceptVerificationRequest();
} }
} }
} }

10
resources/qml/device-verification/AwaitingVerificationConfirmation.qml
View file

@ -25,15 +25,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("Cancel") text: qsTr("Cancel")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
flow.cancelVerification(DeviceVerificationFlow.User); flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);

10
resources/qml/device-verification/AwaitingVerificationRequest.qml
View file

@ -25,15 +25,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("Cancel") text: qsTr("Cancel")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
flow.cancelVerification(DeviceVerificationFlow.User); flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);

20
resources/qml/device-verification/DigitVerification.qml
View file

@ -43,15 +43,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("They do not match!") text: qsTr("They do not match!")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS); flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
@ -64,15 +56,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("They match!") text: qsTr("They match!")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { stack.replace(awaitingVerificationConfirmation); flow.sendVerificationMac(); } onClicked: { stack.replace(awaitingVerificationConfirmation); flow.sendVerificationMac(); }
} }
} }

20
resources/qml/device-verification/EmojiVerification.qml
View file

@ -123,15 +123,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("They do not match!") text: qsTr("They do not match!")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS); flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
@ -144,15 +136,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("They match!") text: qsTr("They match!")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { stack.replace(awaitingVerificationConfirmation); flow.sendVerificationMac(); } onClicked: { stack.replace(awaitingVerificationConfirmation); flow.sendVerificationMac(); }
} }
} }

22
resources/qml/device-verification/NewVerificationRequest.qml
View file

@ -32,15 +32,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("Cancel") text: qsTr("Cancel")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
flow.deleteFlow(); flow.deleteFlow();
@ -53,19 +45,11 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Start verification") text: qsTr("Start verification")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
stack.replace(awaitingVerificationRequestAccept); stack.replace(awaitingVerificationRequestAccept);
flow.sender ?flow.sendVerificationRequest():flow.startVerificationRequest(); } flow.sender ?flow.sendVerificationRequest():flow.startVerificationRequest(); }
} }
} }
} }
} }

10
resources/qml/device-verification/PartnerAborted.qml
View file

@ -23,15 +23,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Close") text: qsTr("Close")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
dialog.destroy(); dialog.destroy();

11
resources/qml/device-verification/TimedOut.qml
View file

@ -21,18 +21,9 @@ Pane {
Layout.fillWidth: true Layout.fillWidth: true
} }
Button { Button {
id: timedOutCancel
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
text: qsTr("Close") text: qsTr("Close")
onClicked: { onClicked: {
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
flow.deleteFlow(); flow.deleteFlow();

10
resources/qml/device-verification/VerificationSuccess.qml
View file

@ -23,15 +23,7 @@ Pane {
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Close") text: qsTr("Close")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: { onClicked: {
deviceVerificationList.remove(tran_id); deviceVerificationList.remove(tran_id);
if(flow) flow.deleteFlow(); if(flow) flow.deleteFlow();