diff options
author | 2020-01-31 17:24:30 +0100 | |
---|---|---|
committer | 2020-01-31 17:24:30 +0100 | |
commit | 9277d42ee8fd6d9e3eccf948f71c8688f726784e (patch) | |
tree | 6f167ea9eb2ed50a079596048993a79c7aeb9447 /src/containers/settings/EditSettingsScreen.js | |
parent | Update (diff) | |
parent | Fix lint (diff) | |
download | ferdium-app-9277d42ee8fd6d9e3eccf948f71c8688f726784e.tar.gz ferdium-app-9277d42ee8fd6d9e3eccf948f71c8688f726784e.tar.zst ferdium-app-9277d42ee8fd6d9e3eccf948f71c8688f726784e.zip |
Merge branch 'develop' into start-in-tray
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index f404f8e8c..665444f50 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -10,7 +10,7 @@ import UserStore from '../../stores/UserStore'; | |||
10 | import TodosStore from '../../features/todos/store'; | 10 | import TodosStore from '../../features/todos/store'; |
11 | import Form from '../../lib/Form'; | 11 | import Form from '../../lib/Form'; |
12 | import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; | 12 | import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; |
13 | import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config'; | 13 | import { DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES } from '../../config'; |
14 | import { config as spellcheckerConfig } from '../../features/spellchecker'; | 14 | import { config as spellcheckerConfig } from '../../features/spellchecker'; |
15 | 15 | ||
16 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 16 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
@@ -76,11 +76,15 @@ const messages = defineMessages({ | |||
76 | }, | 76 | }, |
77 | enableLock: { | 77 | enableLock: { |
78 | id: 'settings.app.form.enableLock', | 78 | id: 'settings.app.form.enableLock', |
79 | defaultMessage: '!!!Enable Ferdi password lock', | 79 | defaultMessage: '!!!Enable Password Lock', |
80 | }, | 80 | }, |
81 | lockPassword: { | 81 | lockPassword: { |
82 | id: 'settings.app.form.lockPassword', | 82 | id: 'settings.app.form.lockPassword', |
83 | defaultMessage: '!!!Ferdi Lock password', | 83 | defaultMessage: '!!!Password', |
84 | }, | ||
85 | inactivityLock: { | ||
86 | id: 'settings.app.form.inactivityLock', | ||
87 | defaultMessage: '!!!Lock after inactivity', | ||
84 | }, | 88 | }, |
85 | scheduledDNDEnabled: { | 89 | scheduledDNDEnabled: { |
86 | id: 'settings.app.form.scheduledDNDEnabled', | 90 | id: 'settings.app.form.scheduledDNDEnabled', |
@@ -104,7 +108,7 @@ const messages = defineMessages({ | |||
104 | }, | 108 | }, |
105 | adaptableDarkMode: { | 109 | adaptableDarkMode: { |
106 | id: 'settings.app.form.adaptableDarkMode', | 110 | id: 'settings.app.form.adaptableDarkMode', |
107 | defaultMessage: '!!!Enable adaptable Dark Mode', | 111 | defaultMessage: '!!!Synchronize dark mode with my Mac\'s dark mode setting', |
108 | }, | 112 | }, |
109 | universalDarkMode: { | 113 | universalDarkMode: { |
110 | id: 'settings.app.form.universalDarkMode', | 114 | id: 'settings.app.form.universalDarkMode', |
@@ -183,6 +187,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
183 | todoServer: settingsData.todoServer, | 187 | todoServer: settingsData.todoServer, |
184 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, | 188 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, |
185 | lockedPassword: settingsData.lockedPassword, | 189 | lockedPassword: settingsData.lockedPassword, |
190 | inactivityLock: settingsData.inactivityLock, | ||
186 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, | 191 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, |
187 | scheduledDNDStart: settingsData.scheduledDNDStart, | 192 | scheduledDNDStart: settingsData.scheduledDNDStart, |
188 | scheduledDNDEnd: settingsData.scheduledDNDEnd, | 193 | scheduledDNDEnd: settingsData.scheduledDNDEnd, |
@@ -319,9 +324,15 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
319 | lockedPassword: { | 324 | lockedPassword: { |
320 | label: intl.formatMessage(messages.lockPassword), | 325 | label: intl.formatMessage(messages.lockPassword), |
321 | value: settings.all.app.lockedPassword, | 326 | value: settings.all.app.lockedPassword, |
322 | default: DEFAULT_LOCK_PASSWORD, | 327 | default: '', |
323 | type: 'password', | 328 | type: 'password', |
324 | }, | 329 | }, |
330 | inactivityLock: { | ||
331 | label: intl.formatMessage(messages.inactivityLock), | ||
332 | value: settings.all.app.inactivityLock, | ||
333 | default: 0, | ||
334 | type: 'number', | ||
335 | }, | ||
325 | scheduledDNDEnabled: { | 336 | scheduledDNDEnabled: { |
326 | label: intl.formatMessage(messages.scheduledDNDEnabled), | 337 | label: intl.formatMessage(messages.scheduledDNDEnabled), |
327 | value: settings.all.app.scheduledDNDEnabled || false, | 338 | value: settings.all.app.scheduledDNDEnabled || false, |
@@ -466,6 +477,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
466 | hibernationEnabled={this.props.stores.settings.app.hibernate} | 477 | hibernationEnabled={this.props.stores.settings.app.hibernate} |
467 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | 478 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} |
468 | isTrayEnabled={this.props.stores.settings.app.enableSystemTray} | 479 | isTrayEnabled={this.props.stores.settings.app.enableSystemTray} |
480 | isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} | ||
469 | openProcessManager={() => this.openProcessManager()} | 481 | openProcessManager={() => this.openProcessManager()} |
470 | /> | 482 | /> |
471 | </ErrorBoundary> | 483 | </ErrorBoundary> |