From 77c37633aa8a9ac7c9181f6ba90b351d4a9d4ef9 Mon Sep 17 00:00:00 2001 From: taushet Date: Sat, 5 Nov 2016 14:35:21 +0100 Subject: [PATCH] Switch OK/Cancel button positions As per conventions, the 'OK' button should be rightmost. --- components/PasswordDialog.qml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 79765f7d..7d1a5bd6 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -101,7 +101,6 @@ Window { root.accepted() root.close() } - Keys.onEscapePressed: { root.rejected() root.close() @@ -132,23 +131,7 @@ Window { id: buttons spacing: 60 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 { id: cancelButton width: 120 @@ -164,9 +147,23 @@ Window { 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() + } + } } } - }