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" --- .../settings/settings/EditSettingsForm.js | 8 +++++--- src/containers/settings/EditSettingsScreen.js | 2 +- src/i18n/locales/af.json | 2 +- src/i18n/locales/ar.json | 2 +- src/i18n/locales/bs.json | 2 +- src/i18n/locales/ca.json | 2 +- src/i18n/locales/cs.json | 2 +- src/i18n/locales/da.json | 2 +- src/i18n/locales/defaultMessages.json | 2 +- src/i18n/locales/el.json | 2 +- src/i18n/locales/en-US.json | 2 +- src/i18n/locales/en.json | 1 + src/i18n/locales/es.json | 2 +- src/i18n/locales/fi.json | 2 +- src/i18n/locales/ga.json | 2 +- src/i18n/locales/he.json | 2 +- src/i18n/locales/hr.json | 2 +- src/i18n/locales/hu.json | 2 +- src/i18n/locales/id.json | 2 +- src/i18n/locales/it.json | 2 +- src/i18n/locales/ja.json | 2 +- src/i18n/locales/ka.json | 2 +- src/i18n/locales/ko.json | 2 +- src/i18n/locales/nl-BE.json | 2 +- src/i18n/locales/nl.json | 2 +- src/i18n/locales/no.json | 2 +- src/i18n/locales/pl.json | 2 +- src/i18n/locales/pt.json | 2 +- src/i18n/locales/ro.json | 2 +- src/i18n/locales/ru.json | 2 +- src/i18n/locales/sk.json | 2 +- src/i18n/locales/sl.json | 2 +- src/i18n/locales/sr.json | 2 +- src/i18n/locales/sv.json | 2 +- src/i18n/locales/tr.json | 2 +- src/i18n/locales/uk.json | 2 +- src/i18n/locales/vi.json | 2 +- src/i18n/locales/zh-CN.json | 2 +- src/i18n/locales/zh-HANT.json | 2 +- src/i18n/locales/zh.json | 2 +- src/stores/UIStore.js | 23 ++++++++++++++-------- 41 files changed, 59 insertions(+), 49 deletions(-) (limited to 'src') 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 {' '} diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index fd6b334f1..4c99de9da 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -120,7 +120,7 @@ const messages = defineMessages({ }, adaptableDarkMode: { id: 'settings.app.form.adaptableDarkMode', - defaultMessage: '!!!Synchronize dark mode with my Mac\'s dark mode setting', + defaultMessage: '!!!Synchronize dark mode with my OS\'s dark mode setting', }, universalDarkMode: { id: 'settings.app.form.universalDarkMode', diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index 8a201e1ae..0ea7071d7 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 49b892332..9d5135d94 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "La memòria cau de Ferdi està utilitzant {size} d'espai al disc", "settings.app.currentVersion": "Versió actual:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Obrir en segon plà", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi a l'inici", "settings.app.form.beta": "Inclou versions beta", diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index 36e1c9e22..0071a3fd5 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi momentálně používá {size} místa na disku.", "settings.app.currentVersion": "Aktuální verze:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Spustit na pozadí", "settings.app.form.autoLaunchOnStart": "Spustit Ferdi při startu", "settings.app.form.beta": "Zahrnout beta verze", diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index ea72edbd5..36d930218 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4479,7 +4479,7 @@ } }, { - "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", + "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting", "end": { "column": 3, "line": 124 diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index 9223ee44f..1c38f8afa 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Το Ferdi χρησιμοποιεί αυτήν τη στιγμή {size} χώρου στο δίσκο.", "settings.app.currentVersion": "Τρέχουσα έκδοση:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Άνοιγμα στο παρασκήνιο", "settings.app.form.autoLaunchOnStart": "Εκκίνηση του Ferdi κατά την εκκίνηση του συστήματος", "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta", diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 14353e74e..7e46ddc6f 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -274,7 +274,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index fb2cb3d7e..ff0d57435 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -219,6 +219,7 @@ "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.", "settings.app.currentVersion": "Leagan reatha:", "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús", "settings.app.form.beta": "Cuir leagain béite san áireamh", "settings.app.form.darkMode": "Join the Dark Side", diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 76a917290..ae73ff7f9 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", "settings.app.currentVersion": "Versión actual:", "settings.app.form.accentColor": "Color de realce", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano", "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar", "settings.app.form.beta": "Incluir versiones beta", diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index f9b3a11b3..3fc19437a 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Tá taisce Ferdi ag baint úsáid as {size} den spás diosca.", "settings.app.currentVersion": "Leagan reatha:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Oscail sa chúlra", "settings.app.form.autoLaunchOnStart": "Láinseáil Ferdi ón tús", "settings.app.form.beta": "Cuir leagain béite san áireamh", diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index 00f22fdaa..4d726e197 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi predmemorija trenutno koristi {size} prostora na disku", "settings.app.currentVersion": "Trenutna verzija:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otvori u pozadini", "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom", "settings.app.form.beta": "Obuhvati i beta verzije", diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index f640289db..f396b995e 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "A Ferdi gyorsítótár jelenleg {size} lemezterületet használ.", "settings.app.currentVersion": "Aktuális verzió:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Megnyitás háttérben", "settings.app.form.autoLaunchOnStart": "Ferdi betöltése indításkor", "settings.app.form.beta": "Béta verziók keresése", diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index a1ece26cc..d8244f4fe 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Singgahan Ferdi sedang menggunakan ruang disk {size}.", "settings.app.currentVersion": "Versi saat ini:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Buka di latar belakang", "settings.app.form.autoLaunchOnStart": "Jalankan Ferdi saat komputer dimulai", "settings.app.form.beta": "Sertakan versi beta", diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index 35bd4cd4e..43aae2a94 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.", "settings.app.currentVersion": "Versione attuale:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Apri in background", "settings.app.form.autoLaunchOnStart": "Esegui Ferdi all'avvio", "settings.app.form.beta": "Includi versioni beta", diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 0acb0153c..dfd29afa2 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "現在、Ferdiのキャッシュはディスクの{size}分を使用しています。", "settings.app.currentVersion": "現在のバージョン:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "バックグラウンドで開く", "settings.app.form.autoLaunchOnStart": "システム起動時にFerdiを開く", "settings.app.form.beta": "Betaバージョンを含める", diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index 57479beba..2af804612 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "ამჟამინდელი ვერსია:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "გახსენით ფონზე", "settings.app.form.autoLaunchOnStart": "გაეშვას Ferdi სისტემის ჩატვირთვისას", "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები", diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 7c293513b..65dea571c 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index bacf7b6ec..f63a8dc84 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache gebruikt momenteel {size} schijfruimte.", "settings.app.currentVersion": "Huidige versie:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open op de achtergrond", "settings.app.form.autoLaunchOnStart": "Lanceer Ferdi bij opstarten", "settings.app.form.beta": "Inclusief beta versies", diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index f77304be0..41b1d1d19 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.", "settings.app.currentVersion": "Huidige versie:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open op de achtergrond", "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten", "settings.app.form.beta": "Inclusief bètaversies", diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index dcb74e709..9eeff8408 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej", "settings.app.currentVersion": "Aktualna wersja:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otwórz w tle", "settings.app.form.autoLaunchOnStart": "Uruchom Ferdi na początku", "settings.app.form.beta": "Uwzględnij wersje beta", diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index b5904bb0a..e953c5778 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "O cache do Ferdi está usando {size} de espaço em disco atualmente.", "settings.app.currentVersion": "Versão atual:", "settings.app.form.accentColor": "Cor de destaque", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Abrir em segundo plano", "settings.app.form.autoLaunchOnStart": "Abrir o Ferdi ao iniciar o sistema", "settings.app.form.beta": "Incluir versões beta", diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index 2bd7d3ebf..6fbec36f4 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Кэш занимает {size} на диске.", "settings.app.currentVersion": "Текущая версия:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Открывать в фоне", "settings.app.form.autoLaunchOnStart": "Запускать Ferdi при старте", "settings.app.form.beta": "Включая бета версии", diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index f347a8341..06d10f1fd 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Vyrovnávacia pamäť Ferdi momentálne používa {size} miesta na disku.", "settings.app.currentVersion": "Súčasná verzia:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otvoriť na pozadí", "settings.app.form.autoLaunchOnStart": "Spustiť Ferdi pri štarte", "settings.app.form.beta": "Vrátane beta verzií", diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index 96787a6da..bd9c241df 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Франз кеш тренутно користи {size} простора на диску.", "settings.app.currentVersion": "Trenutna verzija:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Otvori u pozadini", "settings.app.form.autoLaunchOnStart": "Pokreni Ferdi sa sistemom", "settings.app.form.beta": "Obuhvati i beta verzije", diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index ce5403434..36f3f7ed9 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Nuvarande version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Öppna i bakgrunden", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index 45b91e2cf..0038d0a14 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi önbelleği şu anda {size} disk alanı kullanıyor.", "settings.app.currentVersion": "Geçerli sürüm:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Arka planda aç", "settings.app.form.autoLaunchOnStart": "Ferdi'ı başlangıçta aç", "settings.app.form.beta": "Beta versiyonları dahil et", diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index 50c1aa80e..9c1cedab5 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Кеш, який використовує Ferdi, займає {size} дискового простору.", "settings.app.currentVersion": "Поточна версія:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Відкрити у фоновому режимі", "settings.app.form.autoLaunchOnStart": "Запускати Ferdi на початку", "settings.app.form.beta": "Включити бета-версії", diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json index c852ebe60..b617f7e0a 100644 --- a/src/i18n/locales/zh-CN.json +++ b/src/i18n/locales/zh-CN.json @@ -266,7 +266,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json index 5a35d4cf8..658304768 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "當前版本：", "settings.app.form.accentColor": "強調顏色", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "背景啟動", "settings.app.form.autoLaunchOnStart": "開機時啟動", "settings.app.form.beta": "包含開發中版本", diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index eedd34706..5c34e563b 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -270,7 +270,7 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index 6941cf086..f6e059bfb 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js @@ -5,14 +5,14 @@ import { theme } from '@meetfranz/theme'; import { remote } from 'electron'; import Store from './lib/Store'; -import { isMac } from '../environment'; +import { isMac, isWindows } from '../environment'; const { nativeTheme, systemPreferences } = remote; export default class UIStore extends Store { @observable showServicesUpdatedInfoBar = false; - @observable isOsDarkThemeActive = isMac + @observable isOsDarkThemeActive = (isMac || isWindows) ? nativeTheme.shouldUseDarkColors : false; @@ -36,6 +36,13 @@ export default class UIStore extends Store { }, ); } + + if (isWindows) { + nativeTheme.on('updated', () => { + this.isOsDarkThemeActive = nativeTheme.shouldUseDarkColors; + this.actions.service.shareSettingsWithServiceProcess(); + }); + } } setup() { @@ -56,16 +63,16 @@ export default class UIStore extends Store { } @computed get isDarkThemeActive() { - const isMacWithAdaptableInDarkMode = isMac + const isMacOrWindowsWithAdaptableInDarkMode = (isMac || isWindows) && this.stores.settings.all.app.adaptableDarkMode && this.isOsDarkThemeActive; - const isMacWithoutAdaptableInDarkMode = isMac + const isMacOrWindowsWithoutAdaptableInDarkMode = (isMac || isWindows) && this.stores.settings.all.app.darkMode && !this.stores.settings.all.app.adaptableDarkMode; - const isNotMacInDarkMode = !isMac && this.stores.settings.all.app.darkMode; - return !!(isMacWithAdaptableInDarkMode - || isMacWithoutAdaptableInDarkMode - || isNotMacInDarkMode); + const isMacOrWindowsNotInDarkMode = !(isMac || isWindows) && this.stores.settings.all.app.darkMode; + return !!(isMacOrWindowsWithAdaptableInDarkMode + || isMacOrWindowsWithoutAdaptableInDarkMode + || isMacOrWindowsNotInDarkMode); } @computed get theme() { -- cgit v1.2.3-70-g09d2