Skip to content
Snippets Groups Projects
Commit 51964c4f authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Clean up verification pages a bit

parent d4dccc8e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 122 deletions
resources/qml/device-verification/AcceptNewVerificationRequest.qml
+ 3
− 19
View file @ 51964c4f
......@@ -25,15 +25,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignLeft
text: qsTr("Deny")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(tran_id);
......@@ -46,18 +38,10 @@ Pane {
Button {
Layout.alignment: Qt.AlignRight
text: qsTr("Accept")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
stack.replace(awaitingVerificationRequestAccept);
isRequest?flow.sendVerificationReady():flow.acceptVerificationRequest();
flow.sender ?flow.sendVerificationReady():flow.acceptVerificationRequest();
}
}
}
......
resources/qml/device-verification/AwaitingVerificationConfirmation.qml
+ 1
− 9
View file @ 51964c4f
......@@ -25,15 +25,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignLeft
text: qsTr("Cancel")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(tran_id);
......
resources/qml/device-verification/AwaitingVerificationRequest.qml
+ 1
− 9
View file @ 51964c4f
......@@ -25,15 +25,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignLeft
text: qsTr("Cancel")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
flow.cancelVerification(DeviceVerificationFlow.User);
deviceVerificationList.remove(tran_id);
......
resources/qml/device-verification/DigitVerification.qml
+ 3
− 19
View file @ 51964c4f
......@@ -43,15 +43,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignLeft
text: qsTr("They do not match!")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
deviceVerificationList.remove(tran_id);
......@@ -64,17 +56,9 @@ Pane {
Button {
Layout.alignment: Qt.AlignRight
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(); }
}
}
}
}
\ No newline at end of file
}
resources/qml/device-verification/EmojiVerification.qml
+ 2
− 18
View file @ 51964c4f
......@@ -123,15 +123,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignLeft
text: qsTr("They do not match!")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
deviceVerificationList.remove(tran_id);
......@@ -144,15 +136,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignRight
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(); }
}
}
......
resources/qml/device-verification/NewVerificationRequest.qml
+ 3
− 19
View file @ 51964c4f
......@@ -32,15 +32,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignLeft
text: qsTr("Cancel")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
deviceVerificationList.remove(tran_id);
flow.deleteFlow();
......@@ -53,19 +45,11 @@ Pane {
Button {
Layout.alignment: Qt.AlignRight
text: qsTr("Start verification")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
stack.replace(awaitingVerificationRequestAccept);
flow.sender ?flow.sendVerificationRequest():flow.startVerificationRequest(); }
}
}
}
}
}
resources/qml/device-verification/PartnerAborted.qml
+ 2
− 10
View file @ 51964c4f
......@@ -23,15 +23,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignRight
text: qsTr("Close")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
deviceVerificationList.remove(tran_id);
dialog.destroy();
......@@ -39,4 +31,4 @@ Pane {
}
}
}
}
\ No newline at end of file
}
resources/qml/device-verification/TimedOut.qml
+ 1
− 10
View file @ 51964c4f
......@@ -21,18 +21,9 @@ Pane {
Layout.fillWidth: true
}
Button {
id: timedOutCancel
Layout.alignment: Qt.AlignRight
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
text: qsTr("Close")
onClicked: {
deviceVerificationList.remove(tran_id);
flow.deleteFlow();
......
resources/qml/device-verification/VerificationSuccess.qml
+ 1
− 9
View file @ 51964c4f
......@@ -23,15 +23,7 @@ Pane {
Button {
Layout.alignment: Qt.AlignRight
text: qsTr("Close")
palette {
button: "white"
}
contentItem: Text {
text: parent.text
color: "black"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
onClicked: {
deviceVerificationList.remove(tran_id);
if(flow) flow.deleteFlow();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment