Merge pull request #109

77c3763 Switch OK/Cancel button positions (taushet)
pull/2/head
Riccardo Spagni 8 years ago
commit 3b1fe8d3ec
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

@ -101,7 +101,6 @@ Window {
root.accepted()
root.close()
}
Keys.onEscapePressed: {
root.rejected()
root.close()
@ -132,41 +131,39 @@ Window {
id: buttons
spacing: 60
Layout.alignment: Qt.AlignHCenter
MoneroComponents.StandardButton {
id: okButton
id: cancelButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Ok")
KeyNavigation.tab: cancelButton
text: qsTr("Cancel")
KeyNavigation.tab: passwordInput
onClicked: {
root.accepted()
root.rejected()
root.close()
}
}
MoneroComponents.StandardButton {
id: cancelButton
id: okButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Cancel")
KeyNavigation.tab: passwordInput
text: qsTr("Ok")
KeyNavigation.tab: cancelButton
onClicked: {
root.rejected()
root.accepted()
root.close()
}
}
}
}
}