aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar 1mm0rt41PC <5358076+1mm0rt41PC@users.noreply.github.com>2021-01-06 01:05:59 +0100
committerLibravatar GitHub <noreply@github.com>2021-01-06 01:05:59 +0100
commit65ca2e4582c85341a4ff77d1a6717f9a25542dab (patch)
tree610b39c60b2b5439b560ef722f73222d52ddc6d6 /src/containers
parentdocs: add 1mm0rt41PC as a contributor (#1146) (diff)
downloadferdium-app-65ca2e4582c85341a4ff77d1a6717f9a25542dab.tar.gz
ferdium-app-65ca2e4582c85341a4ff77d1a6717f9a25542dab.tar.zst
ferdium-app-65ca2e4582c85341a4ff77d1a6717f9a25542dab.zip
Add new setting to minimize to tray when closing on Windows (#1093)
Co-authored-by: Amine El Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/containers')
-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 d87b2512e..097f0ed8b 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -55,6 +55,10 @@ const messages = defineMessages({
55 id: 'settings.app.form.minimizeToSystemTray', 55 id: 'settings.app.form.minimizeToSystemTray',
56 defaultMessage: '!!!Minimize Ferdi to system tray', 56 defaultMessage: '!!!Minimize Ferdi to system tray',
57 }, 57 },
58 closeToSystemTray: {
59 id: 'settings.app.form.closeToSystemTray',
60 defaultMessage: '!!!Close Ferdi to system tray',
61 },
58 privateNotifications: { 62 privateNotifications: {
59 id: 'settings.app.form.privateNotifications', 63 id: 'settings.app.form.privateNotifications',
60 defaultMessage: '!!!Don\'t show message content in notifications', 64 defaultMessage: '!!!Don\'t show message content in notifications',
@@ -233,6 +237,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
233 reloadAfterResume: settingsData.reloadAfterResume, 237 reloadAfterResume: settingsData.reloadAfterResume,
234 startMinimized: settingsData.startMinimized, 238 startMinimized: settingsData.startMinimized,
235 minimizeToSystemTray: settingsData.minimizeToSystemTray, 239 minimizeToSystemTray: settingsData.minimizeToSystemTray,
240 closeToSystemTray: settingsData.closeToSystemTray,
236 privateNotifications: settingsData.privateNotifications, 241 privateNotifications: settingsData.privateNotifications,
237 notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage, 242 notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage,
238 navigationBarBehaviour: settingsData.navigationBarBehaviour, 243 navigationBarBehaviour: settingsData.navigationBarBehaviour,
@@ -374,6 +379,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
374 value: settings.all.app.minimizeToSystemTray, 379 value: settings.all.app.minimizeToSystemTray,
375 default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, 380 default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
376 }, 381 },
382 closeToSystemTray: {
383 label: intl.formatMessage(messages.closeToSystemTray),
384 value: settings.all.app.closeToSystemTray,
385 default: DEFAULT_APP_SETTINGS.closeToSystemTray,
386 },
377 privateNotifications: { 387 privateNotifications: {
378 label: intl.formatMessage(messages.privateNotifications), 388 label: intl.formatMessage(messages.privateNotifications),
379 value: settings.all.app.privateNotifications, 389 value: settings.all.app.privateNotifications,