From 5e5945f591027ce6f160010bbd577b8ae8479035 Mon Sep 17 00:00:00 2001 From: Mahadevan Sreenivasan Date: Thu, 9 Apr 2020 05:27:58 +0530 Subject: Add support for Adaptable Dark Mode on Windows (#548) - Add support for making adaptable checkbox visible for Windows - Add support in UIStore to check for theme updated using the nativeTheme.on('update', () => {}) event and update the darkmode properties accordinly. - Update intl to change text to a more generic wording - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting" --- src/components/settings/settings/EditSettingsForm.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/components/settings') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 055831e3b..8d93737b8 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -12,7 +12,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; import Input from '../../ui/Input'; import { FRANZ_TRANSLATION } from '../../../config'; -import { isMac } from '../../../environment'; +import { isMac, isWindows } from '../../../environment'; const { systemPreferences, @@ -405,8 +405,8 @@ export default @observer class EditSettingsForm extends Component {
- {isMac && } - {!(isMac && isAdaptableDarkModeEnabled) && } + {(isMac || isWindows) && } + {!((isMac || isWindows) && isAdaptableDarkModeEnabled) && } {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( <> @@ -530,9 +530,11 @@ export default @observer class EditSettingsForm extends Component { + Ferdi is based on {' '} Franz + , a project published under the {' '} -- cgit v1.2.3-54-g00ecf