From d5fd04626ce22d6194924b75f268fefa41aa2db5 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Tue, 7 Sep 2021 18:15:46 +0530 Subject: Add a confirmation when quitting Ferdi and a preference to toggle it (implements #1857) (#1879) Works for the 'Ferdi > Quit' menu, the shortcut key to quit (Cmd/Ctrl+Q) and also from the tray icon. --- src/containers/settings/EditSettingsScreen.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index efa34dd85..09244bc3c 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -45,6 +45,10 @@ const messages = defineMessages({ id: 'settings.app.form.startMinimized', defaultMessage: '!!!Start minimized', }, + confirmOnQuit: { + id: 'settings.app.form.confirmOnQuit', + defaultMessage: '!!!Confirm when quitting Ferdi', + }, enableSystemTray: { id: 'settings.app.form.enableSystemTray', defaultMessage: '!!!Always show Ferdi in System Tray', @@ -253,6 +257,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e enableSystemTray: Boolean(settingsData.enableSystemTray), reloadAfterResume: Boolean(settingsData.reloadAfterResume), startMinimized: Boolean(settingsData.startMinimized), + confirmOnQuit: Boolean(settingsData.confirmOnQuit), minimizeToSystemTray: Boolean(settingsData.minimizeToSystemTray), closeToSystemTray: Boolean(settingsData.closeToSystemTray), privateNotifications: Boolean(settingsData.privateNotifications), @@ -390,6 +395,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e value: settings.all.app.startMinimized, default: DEFAULT_APP_SETTINGS.startMinimized, }, + confirmOnQuit: { + label: intl.formatMessage(messages.confirmOnQuit), + value: settings.all.app.confirmOnQuit, + default: DEFAULT_APP_SETTINGS.confirmOnQuit, + }, enableSystemTray: { label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray), value: settings.all.app.enableSystemTray, -- cgit v1.2.3-54-g00ecf