diff options
-rw-r--r-- | .vscode/launch.json | 11 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 | ||||
-rw-r--r-- | src/config.js | 1 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 | ||||
-rw-r--r-- | src/webview/plugin.js | 12 |
5 files changed, 34 insertions, 6 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index abbbdd64b..a8300f84f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json | |||
@@ -22,6 +22,17 @@ | |||
22 | "env": { | 22 | "env": { |
23 | "LIVE_API": "1" | 23 | "LIVE_API": "1" |
24 | } | 24 | } |
25 | }, | ||
26 | { | ||
27 | "type": "node", | ||
28 | "request": "launch", | ||
29 | "name": "Franz – Local API", | ||
30 | "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", | ||
31 | "program": "${workspaceFolder}/build/index.js", | ||
32 | "protocol": "inspector", | ||
33 | "env": { | ||
34 | "LOCAL_API": "1" | ||
35 | } | ||
25 | } | 36 | } |
26 | ] | 37 | ] |
27 | } \ No newline at end of file | 38 | } \ No newline at end of file |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index ba07b1a5b..e711ad402 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -30,6 +30,10 @@ const messages = defineMessages({ | |||
30 | id: 'settings.app.headlineAppearance', | 30 | id: 'settings.app.headlineAppearance', |
31 | defaultMessage: '!!!Appearance', | 31 | defaultMessage: '!!!Appearance', |
32 | }, | 32 | }, |
33 | headlineMessaging: { | ||
34 | id: 'settings.app.headlineMessaging', | ||
35 | defaultMessage: '!!!Messaging', | ||
36 | }, | ||
33 | buttonSearchForUpdate: { | 37 | buttonSearchForUpdate: { |
34 | id: 'settings.app.buttonSearchForUpdate', | 38 | id: 'settings.app.buttonSearchForUpdate', |
35 | defaultMessage: '!!!Check for updates', | 39 | defaultMessage: '!!!Check for updates', |
@@ -125,6 +129,8 @@ export default class EditSettingsForm extends Component { | |||
125 | )} | 129 | )} |
126 | <h2>{intl.formatMessage(messages.headlineAppearance)}</h2> | 130 | <h2>{intl.formatMessage(messages.headlineAppearance)}</h2> |
127 | <Toggle field={form.$('showDisabledServices')} /> | 131 | <Toggle field={form.$('showDisabledServices')} /> |
132 | <h2>{intl.formatMessage(messages.headlineMessaging)}</h2> | ||
133 | <Toggle field={form.$('enableSpellchecking')} /> | ||
128 | <h2>{intl.formatMessage(messages.headlineLanguage)}</h2> | 134 | <h2>{intl.formatMessage(messages.headlineLanguage)}</h2> |
129 | <Select field={form.$('locale')} showLabel={false} /> | 135 | <Select field={form.$('locale')} showLabel={false} /> |
130 | <h2>{intl.formatMessage(messages.headlineUpdates)}</h2> | 136 | <h2>{intl.formatMessage(messages.headlineUpdates)}</h2> |
diff --git a/src/config.js b/src/config.js index 10359f426..60cc6fd7e 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -11,6 +11,7 @@ export const DEFAULT_APP_SETTINGS = { | |||
11 | enableSystemTray: true, | 11 | enableSystemTray: true, |
12 | minimizeToSystemTray: false, | 12 | minimizeToSystemTray: false, |
13 | showDisabledServices: true, | 13 | showDisabledServices: true, |
14 | enableSpellchecking: true, | ||
14 | locale: 'en-US', | 15 | locale: 'en-US', |
15 | beta: false, | 16 | beta: false, |
16 | isAppMuted: false, | 17 | isAppMuted: false, |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index b10acf3c6..e146dc97c 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -43,6 +43,10 @@ const messages = defineMessages({ | |||
43 | id: 'settings.app.form.showDisabledServices', | 43 | id: 'settings.app.form.showDisabledServices', |
44 | defaultMessage: '!!!Display disabled services tabs', | 44 | defaultMessage: '!!!Display disabled services tabs', |
45 | }, | 45 | }, |
46 | enableSpellchecking: { | ||
47 | id: 'settings.app.form.enableSpellchecking', | ||
48 | defaultMessage: '!!!Enable spell checking', | ||
49 | }, | ||
46 | beta: { | 50 | beta: { |
47 | id: 'settings.app.form.beta', | 51 | id: 'settings.app.form.beta', |
48 | defaultMessage: '!!!Include beta versions', | 52 | defaultMessage: '!!!Include beta versions', |
@@ -73,6 +77,7 @@ export default class EditSettingsScreen extends Component { | |||
73 | enableSystemTray: settingsData.enableSystemTray, | 77 | enableSystemTray: settingsData.enableSystemTray, |
74 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 78 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
75 | showDisabledServices: settingsData.showDisabledServices, | 79 | showDisabledServices: settingsData.showDisabledServices, |
80 | enableSpellchecking: settingsData.enableSpellchecking, | ||
76 | locale: settingsData.locale, | 81 | locale: settingsData.locale, |
77 | beta: settingsData.beta, | 82 | beta: settingsData.beta, |
78 | }, | 83 | }, |
@@ -129,6 +134,11 @@ export default class EditSettingsScreen extends Component { | |||
129 | value: settings.all.showDisabledServices, | 134 | value: settings.all.showDisabledServices, |
130 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | 135 | default: DEFAULT_APP_SETTINGS.showDisabledServices, |
131 | }, | 136 | }, |
137 | enableSpellchecking: { | ||
138 | label: intl.formatMessage(messages.enableSpellchecking), | ||
139 | value: settings.all.enableSpellchecking, | ||
140 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, | ||
141 | }, | ||
132 | locale: { | 142 | locale: { |
133 | label: intl.formatMessage(messages.language), | 143 | label: intl.formatMessage(messages.language), |
134 | value: app.locale, | 144 | value: app.locale, |
diff --git a/src/webview/plugin.js b/src/webview/plugin.js index ffc9084e4..569fa9493 100644 --- a/src/webview/plugin.js +++ b/src/webview/plugin.js | |||
@@ -1,11 +1,11 @@ | |||
1 | const { ipcRenderer } = require('electron'); | 1 | import { ipcRenderer } from 'electron'; |
2 | const path = require('path'); | 2 | import path from 'path'; |
3 | 3 | ||
4 | const RecipeWebview = require('./lib/RecipeWebview'); | 4 | import RecipeWebview from './lib/RecipeWebview'; |
5 | 5 | ||
6 | require('./notifications.js'); | 6 | import './spellchecker.js'; |
7 | require('./spellchecker.js'); | 7 | import './notifications.js'; |
8 | require('./ime.js'); | 8 | import './ime.js'; |
9 | 9 | ||
10 | ipcRenderer.on('initializeRecipe', (e, data) => { | 10 | ipcRenderer.on('initializeRecipe', (e, data) => { |
11 | const modulePath = path.join(data.recipe.path, 'webview.js'); | 11 | const modulePath = path.join(data.recipe.path, 'webview.js'); |