diff options
author | Amine El Mouafik <412895+kytwb@users.noreply.github.com> | 2021-02-08 10:34:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-08 10:34:45 +0100 |
commit | 035002ceedf78d5ec73eabc0df7f06139939b967 (patch) | |
tree | 1c0d1e9531bae05fb65d70b9ea25baf404b74fe1 /src/components/settings | |
parent | docs: add k0staa as a contributor (#1193) (diff) | |
download | ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.gz ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.zst ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.zip |
Synchronize with Franz 5.6.0 (#1033)
Co-authored-by: FranzBot <i18n@meetfranz.com>
Co-authored-by: vantezzen <hello@vantezzen.io>
Co-authored-by: Makazzz <makazzzpro@live.ca>
Co-authored-by: Stefan Malzner <stefan@adlk.io>
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 13 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 14 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index f1e70ce59..80f60b3e1 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -20,7 +20,6 @@ import Select from '../../ui/Select'; | |||
20 | import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; | 20 | import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; |
21 | import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; | 21 | import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; |
22 | import { serviceLimitStore } from '../../../features/serviceLimit'; | 22 | import { serviceLimitStore } from '../../../features/serviceLimit'; |
23 | |||
24 | import { isMac } from '../../../environment'; | 23 | import { isMac } from '../../../environment'; |
25 | 24 | ||
26 | const messages = defineMessages({ | 25 | const messages = defineMessages({ |
@@ -96,9 +95,9 @@ const messages = defineMessages({ | |||
96 | id: 'settings.service.form.isMutedInfo', | 95 | id: 'settings.service.form.isMutedInfo', |
97 | defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted', | 96 | defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted', |
98 | }, | 97 | }, |
99 | disableHibernationInfo: { | 98 | isHibernationEnabledInfo: { |
100 | id: 'settings.service.form.disableHibernationInfo', | 99 | id: 'settings.service.form.isHibernatedEnabledInfo', |
101 | defaultMessage: '!!!You currently have hibernation enabled but you can disable hibernation for individual services using this option.', | 100 | defaultMessage: '!!!When enabled, a service will be shut down after a period of time to save system resources.', |
102 | }, | 101 | }, |
103 | headlineNotifications: { | 102 | headlineNotifications: { |
104 | id: 'settings.service.form.headlineNotifications', | 103 | id: 'settings.service.form.headlineNotifications', |
@@ -375,9 +374,9 @@ export default @observer class EditServiceForm extends Component { | |||
375 | <Toggle field={form.$('isEnabled')} /> | 374 | <Toggle field={form.$('isEnabled')} /> |
376 | {isHibernationFeatureActive && ( | 375 | {isHibernationFeatureActive && ( |
377 | <> | 376 | <> |
378 | <Toggle field={form.$('disableHibernation')} /> | 377 | <Toggle field={form.$('isHibernationEnabled')} /> |
379 | <p className="settings__help"> | 378 | <p className="settings__help"> |
380 | {intl.formatMessage(messages.disableHibernationInfo)} | 379 | {intl.formatMessage(messages.isHibernationEnabledInfo)} |
381 | </p> | 380 | </p> |
382 | </> | 381 | </> |
383 | )} | 382 | )} |
@@ -409,7 +408,7 @@ export default @observer class EditServiceForm extends Component { | |||
409 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} | 408 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} |
410 | > | 409 | > |
411 | <div className="settings__settings-group"> | 410 | <div className="settings__settings-group"> |
412 | <Select field={form.$('spellcheckerLanguage')} multiple /> | 411 | <Select field={form.$('spellcheckerLanguage')} /> |
413 | </div> | 412 | </div> |
414 | </PremiumFeatureContainer> | 413 | </PremiumFeatureContainer> |
415 | )} | 414 | )} |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index cd772214f..f20c38bc9 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -173,6 +173,8 @@ export default @observer class EditSettingsForm extends Component { | |||
173 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 173 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
174 | isNightlyEnabled: PropTypes.bool.isRequired, | 174 | isNightlyEnabled: PropTypes.bool.isRequired, |
175 | openProcessManager: PropTypes.func.isRequired, | 175 | openProcessManager: PropTypes.func.isRequired, |
176 | hasAddedTodosAsService: PropTypes.bool.isRequired, | ||
177 | isOnline: PropTypes.bool.isRequired, | ||
176 | }; | 178 | }; |
177 | 179 | ||
178 | static contextTypes = { | 180 | static contextTypes = { |
@@ -227,6 +229,8 @@ export default @observer class EditSettingsForm extends Component { | |||
227 | openProcessManager, | 229 | openProcessManager, |
228 | isTodosActivated, | 230 | isTodosActivated, |
229 | isNightlyEnabled, | 231 | isNightlyEnabled, |
232 | hasAddedTodosAsService, | ||
233 | isOnline, | ||
230 | } = this.props; | 234 | } = this.props; |
231 | const { intl } = this.context; | 235 | const { intl } = this.context; |
232 | 236 | ||
@@ -346,7 +350,7 @@ export default @observer class EditSettingsForm extends Component { | |||
346 | 350 | ||
347 | <Hr /> | 351 | <Hr /> |
348 | 352 | ||
349 | {isTodosEnabled && ( | 353 | {isTodosEnabled && !hasAddedTodosAsService && ( |
350 | <> | 354 | <> |
351 | <Toggle field={form.$('enableTodos')} /> | 355 | <Toggle field={form.$('enableTodos')} /> |
352 | {isTodosActivated && ( | 356 | {isTodosActivated && ( |
@@ -535,10 +539,10 @@ export default @observer class EditSettingsForm extends Component { | |||
535 | <Toggle | 539 | <Toggle |
536 | field={form.$('enableSpellchecking')} | 540 | field={form.$('enableSpellchecking')} |
537 | /> | 541 | /> |
538 | {form.$('enableSpellchecking').value && !isMac && ( | 542 | {!isMac && form.$('enableSpellchecking').value && ( |
539 | <Select field={form.$('spellcheckerLanguage')} multiple /> | 543 | <Select field={form.$('spellcheckerLanguage')} /> |
540 | )} | 544 | )} |
541 | {form.$('enableSpellchecking').value && isMac && ( | 545 | {isMac && form.$('enableSpellchecking').value && ( |
542 | <p>{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p> | 546 | <p>{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p> |
543 | )} | 547 | )} |
544 | </Fragment> | 548 | </Fragment> |
@@ -625,7 +629,7 @@ export default @observer class EditSettingsForm extends Component { | |||
625 | buttonType="secondary" | 629 | buttonType="secondary" |
626 | label={intl.formatMessage(updateButtonLabelMessage)} | 630 | label={intl.formatMessage(updateButtonLabelMessage)} |
627 | onClick={checkForUpdates} | 631 | onClick={checkForUpdates} |
628 | disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable} | 632 | disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable || !isOnline} |
629 | loaded={!isCheckingForUpdates || !isUpdateAvailable} | 633 | loaded={!isCheckingForUpdates || !isUpdateAvailable} |
630 | /> | 634 | /> |
631 | )} | 635 | )} |