diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-04-02 19:53:15 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-04-02 19:53:15 +0200 |
commit | 5ef6630d8a1998d611ca94850878aec18ec13166 (patch) | |
tree | eed15c06c7a24bd379f8f45f224f9928d84fa6ed /src/components | |
parent | minor style fix (diff) | |
parent | Merge pull request #856 from meetfranz/feature/disable-gpu-acceleration (diff) | |
download | ferdium-app-5ef6630d8a1998d611ca94850878aec18ec13166.tar.gz ferdium-app-5ef6630d8a1998d611ca94850878aec18ec13166.tar.zst ferdium-app-5ef6630d8a1998d611ca94850878aec18ec13166.zip |
Merge branch 'develop' of github.com:meetfranz/franz into develop
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 72aa5a8af..97f535594 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -76,6 +76,10 @@ const messages = defineMessages({ | |||
76 | id: 'settings.app.currentVersion', | 76 | id: 'settings.app.currentVersion', |
77 | defaultMessage: '!!!Current version:', | 77 | defaultMessage: '!!!Current version:', |
78 | }, | 78 | }, |
79 | enableGPUAccelerationInfo: { | ||
80 | id: 'settings.app.restartRequired', | ||
81 | defaultMessage: '!!!Changes require restart', | ||
82 | }, | ||
79 | }); | 83 | }); |
80 | 84 | ||
81 | @observer | 85 | @observer |
@@ -172,6 +176,8 @@ export default class EditSettingsForm extends Component { | |||
172 | {/* Advanced */} | 176 | {/* Advanced */} |
173 | <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2> | 177 | <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2> |
174 | <Toggle field={form.$('enableSpellchecking')} /> | 178 | <Toggle field={form.$('enableSpellchecking')} /> |
179 | <Toggle field={form.$('enableGPUAcceleration')} /> | ||
180 | <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p> | ||
175 | {/* <Select field={form.$('spellcheckingLanguage')} /> */} | 181 | {/* <Select field={form.$('spellcheckingLanguage')} /> */} |
176 | <div className="settings__settings-group"> | 182 | <div className="settings__settings-group"> |
177 | <h3> | 183 | <h3> |