diff options
author | 2019-09-24 10:55:15 +0700 | |
---|---|---|
committer | 2019-09-24 10:55:15 +0700 | |
commit | d88b04b05b64b6fea38e226c3bf344f58c2ceefb (patch) | |
tree | 37d0453f258414f483c2ce27623b12de6ce1b09f /src/containers | |
parent | Trigger pull request build after replugging Travis (diff) | |
parent | Add darkreader to feature list and changelog (diff) | |
download | ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.tar.gz ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.tar.zst ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.zip |
Merge branch 'master' into feat/macos-signing
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 4d85d4f12..0ae64b6ad 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -65,6 +65,18 @@ const messages = defineMessages({ | |||
65 | id: 'settings.app.form.lockPassword', | 65 | id: 'settings.app.form.lockPassword', |
66 | defaultMessage: '!!!Ferdi Lock password', | 66 | defaultMessage: '!!!Ferdi Lock password', |
67 | }, | 67 | }, |
68 | scheduledDNDEnabled: { | ||
69 | id: 'settings.app.form.scheduledDNDEnabled', | ||
70 | defaultMessage: '!!!Enable scheduled Do-not-Disturb', | ||
71 | }, | ||
72 | scheduledDNDStart: { | ||
73 | id: 'settings.app.form.scheduledDNDStart', | ||
74 | defaultMessage: '!!!From', | ||
75 | }, | ||
76 | scheduledDNDEnd: { | ||
77 | id: 'settings.app.form.scheduledDNDEnd', | ||
78 | defaultMessage: '!!!To', | ||
79 | }, | ||
68 | language: { | 80 | language: { |
69 | id: 'settings.app.form.language', | 81 | id: 'settings.app.form.language', |
70 | defaultMessage: '!!!Language', | 82 | defaultMessage: '!!!Language', |
@@ -134,6 +146,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
134 | todoServer: settingsData.todoServer, | 146 | todoServer: settingsData.todoServer, |
135 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, | 147 | lockingFeatureEnabled: settingsData.lockingFeatureEnabled, |
136 | lockedPassword: settingsData.lockedPassword, | 148 | lockedPassword: settingsData.lockedPassword, |
149 | scheduledDNDEnabled: settingsData.scheduledDNDEnabled, | ||
150 | scheduledDNDStart: settingsData.scheduledDNDStart, | ||
151 | scheduledDNDEnd: settingsData.scheduledDNDEnd, | ||
137 | enableGPUAcceleration: settingsData.enableGPUAcceleration, | 152 | enableGPUAcceleration: settingsData.enableGPUAcceleration, |
138 | showDisabledServices: settingsData.showDisabledServices, | 153 | showDisabledServices: settingsData.showDisabledServices, |
139 | darkMode: settingsData.darkMode, | 154 | darkMode: settingsData.darkMode, |
@@ -235,6 +250,23 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
235 | default: DEFAULT_LOCK_PASSWORD, | 250 | default: DEFAULT_LOCK_PASSWORD, |
236 | type: 'password', | 251 | type: 'password', |
237 | }, | 252 | }, |
253 | scheduledDNDEnabled: { | ||
254 | label: intl.formatMessage(messages.scheduledDNDEnabled), | ||
255 | value: settings.all.app.scheduledDNDEnabled || false, | ||
256 | default: false, | ||
257 | }, | ||
258 | scheduledDNDStart: { | ||
259 | label: intl.formatMessage(messages.scheduledDNDStart), | ||
260 | value: settings.all.app.scheduledDNDStart, | ||
261 | default: '17:00', | ||
262 | type: 'time', | ||
263 | }, | ||
264 | scheduledDNDEnd: { | ||
265 | label: intl.formatMessage(messages.scheduledDNDEnd), | ||
266 | value: settings.all.app.scheduledDNDEnd, | ||
267 | default: '09:00', | ||
268 | type: 'time', | ||
269 | }, | ||
238 | showDisabledServices: { | 270 | showDisabledServices: { |
239 | label: intl.formatMessage(messages.showDisabledServices), | 271 | label: intl.formatMessage(messages.showDisabledServices), |
240 | value: settings.all.app.showDisabledServices, | 272 | value: settings.all.app.showDisabledServices, |