From 3d104ddccc56dc3012064d2cfc93e303e84d3c9a Mon Sep 17 00:00:00 2001 From: Black Hat Date: Mon, 15 Oct 2018 09:01:53 +0800 Subject: [PATCH] Fix #82. --- imports/Spectral/Page/SettingForm.ui.qml | 7 ++++++ imports/Spectral/Setting/Setting.qml | 1 + qml/main.qml | 28 +++++++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/imports/Spectral/Page/SettingForm.ui.qml b/imports/Spectral/Page/SettingForm.ui.qml index dfa0f06..a5d1e12 100644 --- a/imports/Spectral/Page/SettingForm.ui.qml +++ b/imports/Spectral/Page/SettingForm.ui.qml @@ -66,6 +66,13 @@ Page { onCheckedChanged: MSettings.pressAndHold = checked } + + Switch { + text: "Confirm on Exit" + checked: MSettings.confirmOnExit + + onCheckedChanged: MSettings.confirmOnExit = checked + } } } diff --git a/imports/Spectral/Setting/Setting.qml b/imports/Spectral/Setting/Setting.qml index edd9554..84fce5e 100644 --- a/imports/Spectral/Setting/Setting.qml +++ b/imports/Spectral/Setting/Setting.qml @@ -4,6 +4,7 @@ import Qt.labs.settings 1.0 Settings { property bool pressAndHold + property bool confirmOnExit: true property bool darkTheme property bool miniMode diff --git a/qml/main.qml b/qml/main.qml index ddb3d2b..1d738d5 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -336,7 +336,33 @@ ApplicationWindow { color: "white" } - onClicked: Qt.quit() + onClicked: MSettings.confirmOnExit ? confirmExitDialog.open() : Qt.quit() + + Dialog { + x: (window.width - width) / 2 + y: (window.height - height) / 2 + width: 360 + + id: confirmExitDialog + + parent: ApplicationWindow.overlay + + title: "Exit" + modal: true + standardButtons: Dialog.Ok | Dialog.Cancel + + contentItem: Column { + Label { text: "Exit?" } + CheckBox { + text: "Do not ask next time" + checked: !MSettings.confirmOnExit + + onCheckedChanged: MSettings.confirmOnExit = !checked + } + } + + onAccepted: Qt.quit() + } } } }