From 5e53776f9b4f932b2eedebcd3b23ec95a66bf110 Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 5 Apr 2020 09:33:23 +0200 Subject: #304 Add option to show draggable window area (#532) * #304 Add option to show draggable window area * Address merge conflicts * Re-apply npm run manage-translations Co-authored-by: Amine Mouafik --- src/containers/settings/EditSettingsScreen.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/containers') 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({ id: 'settings.app.form.showMessagesBadgesWhenMuted', defaultMessage: '!!!Show unread message badge when notifications are disabled', }, + showDragArea: { + id: 'settings.app.form.showDragArea', + defaultMessage: '!!!Show draggable area on window', + }, enableSpellchecking: { id: 'settings.app.form.enableSpellchecking', defaultMessage: '!!!Enable spell checking', @@ -223,6 +227,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e iconSize: settingsData.iconSize, accentColor: settingsData.accentColor, showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, + showDragArea: settingsData.showDragArea, enableSpellchecking: settingsData.enableSpellchecking, spellcheckerLanguage: settingsData.spellcheckerLanguage, 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 value: settings.all.app.showMessageBadgeWhenMuted, default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, }, + showDragArea: { + label: intl.formatMessage(messages.showDragArea), + value: settings.all.app.showDragArea, + default: DEFAULT_APP_SETTINGS.showDragArea, + }, enableSpellchecking: { label: intl.formatMessage(messages.enableSpellchecking), value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking, -- cgit v1.2.3-54-g00ecf