aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar n0emis <22817873+n0emis@users.noreply.github.com>2020-03-09 12:53:04 +0100
committerLibravatar GitHub <noreply@github.com>2020-03-09 12:53:04 +0100
commit994de3b5750a34598aba5746a4dbd1a4e811fae8 (patch)
treec0f92f498f7ef4a5ef9222143ef2107ef9c61b5c /src/containers
parentMerge pull request #428 from dpeukert/patch-1 (diff)
downloadferdium-app-994de3b5750a34598aba5746a4dbd1a4e811fae8.tar.gz
ferdium-app-994de3b5750a34598aba5746a4dbd1a4e811fae8.tar.zst
ferdium-app-994de3b5750a34598aba5746a4dbd1a4e811fae8.zip
add option to disable reload after resume (#447)
* add option to disable reload after resume closes #442 * remove unused property
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 6b3f8d3d3..5221b0694 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -48,6 +48,10 @@ const messages = defineMessages({
48 id: 'settings.app.form.enableSystemTray', 48 id: 'settings.app.form.enableSystemTray',
49 defaultMessage: '!!!Always show Ferdi in system tray', 49 defaultMessage: '!!!Always show Ferdi in system tray',
50 }, 50 },
51 reloadAfterResume: {
52 id: 'settings.app.form.reloadAfterResume',
53 defaultMessage: '!!!Reload Ferdi after system resume',
54 },
51 minimizeToSystemTray: { 55 minimizeToSystemTray: {
52 id: 'settings.app.form.minimizeToSystemTray', 56 id: 'settings.app.form.minimizeToSystemTray',
53 defaultMessage: '!!!Minimize Ferdi to system tray', 57 defaultMessage: '!!!Minimize Ferdi to system tray',
@@ -195,6 +199,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
195 data: { 199 data: {
196 runInBackground: settingsData.runInBackground, 200 runInBackground: settingsData.runInBackground,
197 enableSystemTray: settingsData.enableSystemTray, 201 enableSystemTray: settingsData.enableSystemTray,
202 reloadAfterResume: settingsData.reloadAfterResume,
198 startMinimized: settingsData.startMinimized, 203 startMinimized: settingsData.startMinimized,
199 minimizeToSystemTray: settingsData.minimizeToSystemTray, 204 minimizeToSystemTray: settingsData.minimizeToSystemTray,
200 privateNotifications: settingsData.privateNotifications, 205 privateNotifications: settingsData.privateNotifications,
@@ -317,6 +322,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
317 value: settings.all.app.enableSystemTray, 322 value: settings.all.app.enableSystemTray,
318 default: DEFAULT_APP_SETTINGS.enableSystemTray, 323 default: DEFAULT_APP_SETTINGS.enableSystemTray,
319 }, 324 },
325 reloadAfterResume: {
326 label: intl.formatMessage(messages.reloadAfterResume),
327 value: settings.all.app.reloadAfterResume,
328 default: DEFAULT_APP_SETTINGS.reloadAfterResume,
329 },
320 minimizeToSystemTray: { 330 minimizeToSystemTray: {
321 label: intl.formatMessage(messages.minimizeToSystemTray), 331 label: intl.formatMessage(messages.minimizeToSystemTray),
322 value: settings.all.app.minimizeToSystemTray, 332 value: settings.all.app.minimizeToSystemTray,