Merge pull request #515

01e735c move OK button to the right in confirm exit dialog (Jaquee)
bce496b confirm daemon running on exit (Jaquee)

1 files changed, 11 insertions, 8 deletions

diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index 03c64a64..42760f5c 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -45,6 +45,9 @@ Window {
     property alias cancelVisible: cancelButton.visible
     property alias okVisible: okButton.visible
     property alias textArea: dialogContent
+    property alias okText: okButton.text
+    property alias cancelText: cancelButton.text
+
     property var icon
 
     // same signals as Dialog has
@@ -99,34 +102,34 @@ Window {
             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")
                 onClicked: {
                     root.close()
-                    root.accepted()
-
+                    root.rejected()
                 }
             }
 
             MoneroComponents.StandardButton {
-                id: cancelButton
+                id: okButton
                 width: 120
                 fontSize: 14
                 shadowReleasedColor: "#FF4304"
                 shadowPressedColor: "#B32D00"
                 releasedColor: "#FF6C3C"
                 pressedColor: "#FF4304"
-                text: qsTr("Cancel")
+                text: qsTr("Ok")
+                KeyNavigation.tab: cancelButton
                 onClicked: {
                     root.close()
-                    root.rejected()
+                    root.accepted()
+
                 }
             }
         }