diff --git a/resources/qml/device-verification/AcceptNewVerificationRequest.qml b/resources/qml/device-verification/AcceptNewVerificationRequest.qml
index 872fabe1..5bdbc4a6 100644
--- a/resources/qml/device-verification/AcceptNewVerificationRequest.qml
+++ b/resources/qml/device-verification/AcceptNewVerificationRequest.qml
@@ -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();
}
}
}
diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
index e0786343..aaebba6a 100644
--- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
+++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
@@ -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);
diff --git a/resources/qml/device-verification/AwaitingVerificationRequest.qml b/resources/qml/device-verification/AwaitingVerificationRequest.qml
index 22a504c2..b4b9178a 100644
--- a/resources/qml/device-verification/AwaitingVerificationRequest.qml
+++ b/resources/qml/device-verification/AwaitingVerificationRequest.qml
@@ -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);
diff --git a/resources/qml/device-verification/DigitVerification.qml b/resources/qml/device-verification/DigitVerification.qml
index 241ccbd0..f3b1f5cf 100644
--- a/resources/qml/device-verification/DigitVerification.qml
+++ b/resources/qml/device-verification/DigitVerification.qml
@@ -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
+}
diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml
index fae08f25..19faf1b7 100644
--- a/resources/qml/device-verification/EmojiVerification.qml
+++ b/resources/qml/device-verification/EmojiVerification.qml
@@ -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(); }
}
}
diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml
index 06b06cff..ef730b13 100644
--- a/resources/qml/device-verification/NewVerificationRequest.qml
+++ b/resources/qml/device-verification/NewVerificationRequest.qml
@@ -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(); }
+ }
}
}
}
-}
diff --git a/resources/qml/device-verification/PartnerAborted.qml b/resources/qml/device-verification/PartnerAborted.qml
index 62787b18..6174477d 100644
--- a/resources/qml/device-verification/PartnerAborted.qml
+++ b/resources/qml/device-verification/PartnerAborted.qml
@@ -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
+}
diff --git a/resources/qml/device-verification/TimedOut.qml b/resources/qml/device-verification/TimedOut.qml
index 40528693..7dd0ab69 100644
--- a/resources/qml/device-verification/TimedOut.qml
+++ b/resources/qml/device-verification/TimedOut.qml
@@ -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();
diff --git a/resources/qml/device-verification/VerificationSuccess.qml b/resources/qml/device-verification/VerificationSuccess.qml
index c87488da..bc1e64f7 100644
--- a/resources/qml/device-verification/VerificationSuccess.qml
+++ b/resources/qml/device-verification/VerificationSuccess.qml
@@ -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();
|
