aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings
diff options
context:
space:
mode:
authorLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-09-07 18:15:46 +0530
committerLibravatar GitHub <noreply@github.com>2021-09-07 18:15:46 +0530
commitd5fd04626ce22d6194924b75f268fefa41aa2db5 (patch)
tree7181612feeb035fb07940cef4e41c491befd45ab /src/containers/settings
parentNew translations (#1877) (diff)
downloadferdium-app-d5fd04626ce22d6194924b75f268fefa41aa2db5.tar.gz
ferdium-app-d5fd04626ce22d6194924b75f268fefa41aa2db5.tar.zst
ferdium-app-d5fd04626ce22d6194924b75f268fefa41aa2db5.zip
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.
Diffstat (limited to 'src/containers/settings')
-rw-r--r--src/containers/settings/EditSettingsScreen.js10
1 files changed, 10 insertions, 0 deletions
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({
45 id: 'settings.app.form.startMinimized', 45 id: 'settings.app.form.startMinimized',
46 defaultMessage: '!!!Start minimized', 46 defaultMessage: '!!!Start minimized',
47 }, 47 },
48 confirmOnQuit: {
49 id: 'settings.app.form.confirmOnQuit',
50 defaultMessage: '!!!Confirm when quitting Ferdi',
51 },
48 enableSystemTray: { 52 enableSystemTray: {
49 id: 'settings.app.form.enableSystemTray', 53 id: 'settings.app.form.enableSystemTray',
50 defaultMessage: '!!!Always show Ferdi in System Tray', 54 defaultMessage: '!!!Always show Ferdi in System Tray',
@@ -253,6 +257,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
253 enableSystemTray: Boolean(settingsData.enableSystemTray), 257 enableSystemTray: Boolean(settingsData.enableSystemTray),
254 reloadAfterResume: Boolean(settingsData.reloadAfterResume), 258 reloadAfterResume: Boolean(settingsData.reloadAfterResume),
255 startMinimized: Boolean(settingsData.startMinimized), 259 startMinimized: Boolean(settingsData.startMinimized),
260 confirmOnQuit: Boolean(settingsData.confirmOnQuit),
256 minimizeToSystemTray: Boolean(settingsData.minimizeToSystemTray), 261 minimizeToSystemTray: Boolean(settingsData.minimizeToSystemTray),
257 closeToSystemTray: Boolean(settingsData.closeToSystemTray), 262 closeToSystemTray: Boolean(settingsData.closeToSystemTray),
258 privateNotifications: Boolean(settingsData.privateNotifications), 263 privateNotifications: Boolean(settingsData.privateNotifications),
@@ -390,6 +395,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
390 value: settings.all.app.startMinimized, 395 value: settings.all.app.startMinimized,
391 default: DEFAULT_APP_SETTINGS.startMinimized, 396 default: DEFAULT_APP_SETTINGS.startMinimized,
392 }, 397 },
398 confirmOnQuit: {
399 label: intl.formatMessage(messages.confirmOnQuit),
400 value: settings.all.app.confirmOnQuit,
401 default: DEFAULT_APP_SETTINGS.confirmOnQuit,
402 },
393 enableSystemTray: { 403 enableSystemTray: {
394 label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray), 404 label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray),
395 value: settings.all.app.enableSystemTray, 405 value: settings.all.app.enableSystemTray,