diff options
author | Bennett <hello@vantezzen.io> | 2020-01-31 17:24:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-31 17:24:30 +0100 |
commit | 9277d42ee8fd6d9e3eccf948f71c8688f726784e (patch) | |
tree | 6f167ea9eb2ed50a079596048993a79c7aeb9447 /src/config.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/config.js')
-rw-r--r-- | src/config.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/config.js b/src/config.js index f877f4f2e..8868d7c41 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -6,7 +6,7 @@ import ms from 'ms'; | |||
6 | import { asarPath } from './helpers/asar-helpers'; | 6 | import { asarPath } from './helpers/asar-helpers'; |
7 | 7 | ||
8 | const app = process.type === 'renderer' ? electron.remote.app : electron.app; | 8 | const app = process.type === 'renderer' ? electron.remote.app : electron.app; |
9 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; | 9 | const nativeTheme = process.type === 'renderer' ? electron.remote.nativeTheme : electron.nativeTheme; |
10 | 10 | ||
11 | export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks | 11 | export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks |
12 | 12 | ||
@@ -31,7 +31,6 @@ export const DEVELOPMENT_TODOS_FRONTEND_URL = 'https://development--franz-todos. | |||
31 | 31 | ||
32 | export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; | 32 | export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; |
33 | 33 | ||
34 | export const DEFAULT_LOCK_PASSWORD = 'ferdi'; | ||
35 | export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; | 34 | export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; |
36 | 35 | ||
37 | export const HIBERNATION_STRATEGIES = { | 36 | export const HIBERNATION_STRATEGIES = { |
@@ -55,7 +54,7 @@ export const DEFAULT_APP_SETTINGS = { | |||
55 | showMessageBadgeWhenMuted: true, | 54 | showMessageBadgeWhenMuted: true, |
56 | enableSpellchecking: true, | 55 | enableSpellchecking: true, |
57 | spellcheckerLanguage: 'en-us', | 56 | spellcheckerLanguage: 'en-us', |
58 | darkMode: process.platform === 'darwin' ? systemPreferences.isDarkMode() : false, // We can't use refs from `./environment` at this time | 57 | darkMode: process.platform === 'darwin' ? nativeTheme.shouldUseDarkColors : false, // We can't use refs from `./environment` at this time |
59 | locale: '', | 58 | locale: '', |
60 | fallbackLocale: 'en-US', | 59 | fallbackLocale: 'en-US', |
61 | beta: false, | 60 | beta: false, |
@@ -75,10 +74,13 @@ export const DEFAULT_APP_SETTINGS = { | |||
75 | scheduledDNDEnd: '09:00', | 74 | scheduledDNDEnd: '09:00', |
76 | hibernate: false, | 75 | hibernate: false, |
77 | hibernationStrategy: 300, | 76 | hibernationStrategy: 300, |
77 | inactivityLock: 0, | ||
78 | noUpdates: false, | 78 | noUpdates: false, |
79 | showServiceNavigationBar: false, | 79 | showServiceNavigationBar: false, |
80 | universalDarkMode: true, | 80 | universalDarkMode: true, |
81 | adaptableDarkMode: true, | ||
81 | accentColor: '#7367f0', | 82 | accentColor: '#7367f0', |
83 | serviceRibbonWidth: 68, | ||
82 | }; | 84 | }; |
83 | 85 | ||
84 | export const DEFAULT_FEATURES_CONFIG = { | 86 | export const DEFAULT_FEATURES_CONFIG = { |