aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
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/components
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/components')
-rw-r--r--src/components/layout/Sidebar.js4
-rw-r--r--src/components/settings/settings/EditSettingsForm.js1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index a1a4ab64f..935966764 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -40,11 +40,11 @@ const messages = defineMessages({
40 }, 40 },
41 openTodosDrawer: { 41 openTodosDrawer: {
42 id: 'sidebar.openTodosDrawer', 42 id: 'sidebar.openTodosDrawer',
43 defaultMessage: '!!!Open Franz Todos', 43 defaultMessage: '!!!Open Ferdi Todos',
44 }, 44 },
45 closeTodosDrawer: { 45 closeTodosDrawer: {
46 id: 'sidebar.closeTodosDrawer', 46 id: 'sidebar.closeTodosDrawer',
47 defaultMessage: '!!!Close Franz Todos', 47 defaultMessage: '!!!Close Ferdi Todos',
48 }, 48 },
49 lockFerdi: { 49 lockFerdi: {
50 id: 'sidebar.lockFerdi', 50 id: 'sidebar.lockFerdi',
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 41580ca78..3d135a048 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -334,6 +334,7 @@ export default @observer class EditSettingsForm extends Component {
334 <div> 334 <div>
335 <Toggle field={form.$('autoLaunchOnStart')} /> 335 <Toggle field={form.$('autoLaunchOnStart')} />
336 <Toggle field={form.$('runInBackground')} /> 336 <Toggle field={form.$('runInBackground')} />
337 <Toggle field={form.$('confirmOnQuit')} />
337 <Toggle field={form.$('enableSystemTray')} /> 338 <Toggle field={form.$('enableSystemTray')} />
338 <Toggle field={form.$('reloadAfterResume')} /> 339 <Toggle field={form.$('reloadAfterResume')} />
339 <Toggle field={form.$('startMinimized')} /> 340 <Toggle field={form.$('startMinimized')} />