Merge pull request #109

77c3763 Switch OK/Cancel button positions (taushet)
This commit is contained in:
Riccardo Spagni 2016-11-09 20:38:46 +02:00
commit 3b1fe8d3ec
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

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