diff options
author | 2020-04-05 09:33:23 +0200 | |
---|---|---|
committer | 2020-04-05 08:33:23 +0100 | |
commit | 5e53776f9b4f932b2eedebcd3b23ec95a66bf110 (patch) | |
tree | 421b301b3378a93926940dc798fcf88a323a1b55 /src/containers | |
parent | #490 Add option to start Ferdi minimized (#534) (diff) | |
download | ferdium-app-5e53776f9b4f932b2eedebcd3b23ec95a66bf110.tar.gz ferdium-app-5e53776f9b4f932b2eedebcd3b23ec95a66bf110.tar.zst ferdium-app-5e53776f9b4f932b2eedebcd3b23ec95a66bf110.zip |
* #304 Add option to show draggable window area
* Address merge conflicts
* Re-apply npm run manage-translations
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 7bf721bb0..fd6b334f1 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -146,6 +146,10 @@ const messages = defineMessages({ | |||
146 | id: 'settings.app.form.showMessagesBadgesWhenMuted', | 146 | id: 'settings.app.form.showMessagesBadgesWhenMuted', |
147 | defaultMessage: '!!!Show unread message badge when notifications are disabled', | 147 | defaultMessage: '!!!Show unread message badge when notifications are disabled', |
148 | }, | 148 | }, |
149 | showDragArea: { | ||
150 | id: 'settings.app.form.showDragArea', | ||
151 | defaultMessage: '!!!Show draggable area on window', | ||
152 | }, | ||
149 | enableSpellchecking: { | 153 | enableSpellchecking: { |
150 | id: 'settings.app.form.enableSpellchecking', | 154 | id: 'settings.app.form.enableSpellchecking', |
151 | defaultMessage: '!!!Enable spell checking', | 155 | defaultMessage: '!!!Enable spell checking', |
@@ -223,6 +227,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
223 | iconSize: settingsData.iconSize, | 227 | iconSize: settingsData.iconSize, |
224 | accentColor: settingsData.accentColor, | 228 | accentColor: settingsData.accentColor, |
225 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | 229 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, |
230 | showDragArea: settingsData.showDragArea, | ||
226 | enableSpellchecking: settingsData.enableSpellchecking, | 231 | enableSpellchecking: settingsData.enableSpellchecking, |
227 | spellcheckerLanguage: settingsData.spellcheckerLanguage, | 232 | spellcheckerLanguage: settingsData.spellcheckerLanguage, |
228 | beta: settingsData.beta, // we need this info in the main process as well | 233 | beta: settingsData.beta, // we need this info in the main process as well |
@@ -422,6 +427,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
422 | value: settings.all.app.showMessageBadgeWhenMuted, | 427 | value: settings.all.app.showMessageBadgeWhenMuted, |
423 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, | 428 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, |
424 | }, | 429 | }, |
430 | showDragArea: { | ||
431 | label: intl.formatMessage(messages.showDragArea), | ||
432 | value: settings.all.app.showDragArea, | ||
433 | default: DEFAULT_APP_SETTINGS.showDragArea, | ||
434 | }, | ||
425 | enableSpellchecking: { | 435 | enableSpellchecking: { |
426 | label: intl.formatMessage(messages.enableSpellchecking), | 436 | label: intl.formatMessage(messages.enableSpellchecking), |
427 | value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking, | 437 | value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking, |