diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-03-11 04:36:02 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-03-11 04:36:02 +0100 |
commit | 063875d7395438ba6566327e0f26c7cda5fe5ba8 (patch) | |
tree | 7fff0347843a0376f7aee07eb34260c28c40808f /src/containers/settings | |
parent | Merge branch 'develop' (diff) | |
parent | 5.4.4-beta.3 (diff) | |
download | ferdium-app-063875d7395438ba6566327e0f26c7cda5fe5ba8.tar.gz ferdium-app-063875d7395438ba6566327e0f26c7cda5fe5ba8.tar.zst ferdium-app-063875d7395438ba6566327e0f26c7cda5fe5ba8.zip |
Merge branch 'develop'
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 6dd21f961..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', |
@@ -88,6 +92,10 @@ const messages = defineMessages({ | |||
88 | id: 'settings.app.form.lockPassword', | 92 | id: 'settings.app.form.lockPassword', |
89 | defaultMessage: '!!!Password', | 93 | defaultMessage: '!!!Password', |
90 | }, | 94 | }, |
95 | useTouchIdToUnlock: { | ||
96 | id: 'settings.app.form.useTouchIdToUnlock', | ||
97 | defaultMessage: '!!!Allow using Touch ID to unlock', | ||
98 | }, | ||
91 | inactivityLock: { | 99 | inactivityLock: { |
92 | id: 'settings.app.form.inactivityLock', | 100 | id: 'settings.app.form.inactivityLock', |
93 | defaultMessage: '!!!Lock after inactivity', | 101 | defaultMessage: '!!!Lock after inactivity', |
@@ -191,6 +199,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
191 | data: { | 199 | data: { |
192 | runInBackground: settingsData.runInBackground, | 200 | runInBackground: settingsData.runInBackground, |
193 | enableSystemTray: settingsData.enableSystemTray, | 201 | enableSystemTray: settingsData.enableSystemTray, |
202 | reloadAfterResume: settingsData.reloadAfterResume, | ||
194 | startMinimized: settingsData.startMinimized, | 203 | startMinimized: settingsData.startMinimized, |
195 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 204 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
196 | privateNotifications: settingsData.privateNotifications, | 205 | privateNotifications: settingsData.privateNotifications, |
@@ -202,6 +211,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
202 | todoServer: settingsData.todoServer, | 211 | todoServer: settingsData.todoServer, |
203 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, | 212 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, |
204 | lockedPassword: settingsData.lockedPassword, | 213 | lockedPassword: settingsData.lockedPassword, |
214 | useTouchIdToUnlock: settingsData.useTouchIdToUnlock, | ||
205 | inactivityLock: settingsData.inactivityLock, | 215 | inactivityLock: settingsData.inactivityLock, |
206 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, | 216 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, |
207 | scheduledDNDStart: settingsData.scheduledDNDStart, | 217 | scheduledDNDStart: settingsData.scheduledDNDStart, |
@@ -312,6 +322,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
312 | value: settings.all.app.enableSystemTray, | 322 | value: settings.all.app.enableSystemTray, |
313 | default: DEFAULT_APP_SETTINGS.enableSystemTray, | 323 | default: DEFAULT_APP_SETTINGS.enableSystemTray, |
314 | }, | 324 | }, |
325 | reloadAfterResume: { | ||
326 | label: intl.formatMessage(messages.reloadAfterResume), | ||
327 | value: settings.all.app.reloadAfterResume, | ||
328 | default: DEFAULT_APP_SETTINGS.reloadAfterResume, | ||
329 | }, | ||
315 | minimizeToSystemTray: { | 330 | minimizeToSystemTray: { |
316 | label: intl.formatMessage(messages.minimizeToSystemTray), | 331 | label: intl.formatMessage(messages.minimizeToSystemTray), |
317 | value: settings.all.app.minimizeToSystemTray, | 332 | value: settings.all.app.minimizeToSystemTray, |
@@ -365,6 +380,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
365 | default: '', | 380 | default: '', |
366 | type: 'password', | 381 | type: 'password', |
367 | }, | 382 | }, |
383 | useTouchIdToUnlock: { | ||
384 | label: intl.formatMessage(messages.useTouchIdToUnlock), | ||
385 | value: settings.all.app.useTouchIdToUnlock, | ||
386 | default: DEFAULT_APP_SETTINGS.useTouchIdToUnlock, | ||
387 | }, | ||
368 | inactivityLock: { | 388 | inactivityLock: { |
369 | label: intl.formatMessage(messages.inactivityLock), | 389 | label: intl.formatMessage(messages.inactivityLock), |
370 | value: settings.all.app.inactivityLock, | 390 | value: settings.all.app.inactivityLock, |