diff options
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index f0ceeb8e6..3898d2b99 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -98,6 +98,14 @@ const messages = defineMessages({ | |||
98 | id: 'settings.app.form.darkMode', | 98 | id: 'settings.app.form.darkMode', |
99 | defaultMessage: '!!!Dark Mode', | 99 | defaultMessage: '!!!Dark Mode', |
100 | }, | 100 | }, |
101 | universalDarkMode: { | ||
102 | id: 'settings.app.form.universalDarkMode', | ||
103 | defaultMessage: '!!!Enable universal Dark Mode', | ||
104 | }, | ||
105 | accentColor: { | ||
106 | id: 'settings.app.form.accentColor', | ||
107 | defaultMessage: '!!!Accent color', | ||
108 | }, | ||
101 | showDisabledServices: { | 109 | showDisabledServices: { |
102 | id: 'settings.app.form.showDisabledServices', | 110 | id: 'settings.app.form.showDisabledServices', |
103 | defaultMessage: '!!!Display disabled services tabs', | 111 | defaultMessage: '!!!Display disabled services tabs', |
@@ -172,6 +180,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
172 | enableGPUAcceleration: settingsData.enableGPUAcceleration, | 180 | enableGPUAcceleration: settingsData.enableGPUAcceleration, |
173 | showDisabledServices: settingsData.showDisabledServices, | 181 | showDisabledServices: settingsData.showDisabledServices, |
174 | darkMode: settingsData.darkMode, | 182 | darkMode: settingsData.darkMode, |
183 | universalDarkMode: settingsData.universalDarkMode, | ||
184 | accentColor: settingsData.accentColor, | ||
175 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | 185 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, |
176 | enableSpellchecking: settingsData.enableSpellchecking, | 186 | enableSpellchecking: settingsData.enableSpellchecking, |
177 | spellcheckerLanguage: settingsData.spellcheckerLanguage, | 187 | spellcheckerLanguage: settingsData.spellcheckerLanguage, |
@@ -340,6 +350,16 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
340 | value: settings.all.app.darkMode, | 350 | value: settings.all.app.darkMode, |
341 | default: DEFAULT_APP_SETTINGS.darkMode, | 351 | default: DEFAULT_APP_SETTINGS.darkMode, |
342 | }, | 352 | }, |
353 | universalDarkMode: { | ||
354 | label: intl.formatMessage(messages.universalDarkMode), | ||
355 | value: settings.all.app.universalDarkMode, | ||
356 | default: DEFAULT_APP_SETTINGS.universalDarkMode, | ||
357 | }, | ||
358 | accentColor: { | ||
359 | label: intl.formatMessage(messages.accentColor), | ||
360 | value: settings.all.app.accentColor, | ||
361 | default: DEFAULT_APP_SETTINGS.accentColor, | ||
362 | }, | ||
343 | enableGPUAcceleration: { | 363 | enableGPUAcceleration: { |
344 | label: intl.formatMessage(messages.enableGPUAcceleration), | 364 | label: intl.formatMessage(messages.enableGPUAcceleration), |
345 | value: settings.all.app.enableGPUAcceleration, | 365 | value: settings.all.app.enableGPUAcceleration, |
@@ -425,6 +445,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
425 | lockingFeatureEnabled={lockingFeatureEnabled} | 445 | lockingFeatureEnabled={lockingFeatureEnabled} |
426 | noUpdates={this.props.stores.settings.app.noUpdates} | 446 | noUpdates={this.props.stores.settings.app.noUpdates} |
427 | hibernationEnabled={this.props.stores.settings.app.hibernate} | 447 | hibernationEnabled={this.props.stores.settings.app.hibernate} |
448 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | ||
428 | openProcessManager={() => this.openProcessManager()} | 449 | openProcessManager={() => this.openProcessManager()} |
429 | /> | 450 | /> |
430 | </ErrorBoundary> | 451 | </ErrorBoundary> |
@@ -457,7 +478,7 @@ EditSettingsScreen.wrappedComponent.propTypes = { | |||
457 | toggleTodosFeatureVisibility: PropTypes.func.isRequired, | 478 | toggleTodosFeatureVisibility: PropTypes.func.isRequired, |
458 | }).isRequired, | 479 | }).isRequired, |
459 | workspaces: PropTypes.shape({ | 480 | workspaces: PropTypes.shape({ |
460 | toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired, | 481 | toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired, |
461 | }).isRequired, | 482 | }).isRequired, |
462 | }).isRequired, | 483 | }).isRequired, |
463 | }; | 484 | }; |