diff options
author | Romain <46404814+yourcontact@users.noreply.github.com> | 2020-04-09 10:28:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-09 09:28:07 +0100 |
commit | f013899bd27a7072f384e9c49e2179c2d61e99f8 (patch) | |
tree | 95462334bbc15e267a6456df878e050e9d1171ee /src/components | |
parent | Add support for Adaptable Dark Mode on Windows (#548) (diff) | |
download | ferdium-app-f013899bd27a7072f384e9c49e2179c2d61e99f8.tar.gz ferdium-app-f013899bd27a7072f384e9c49e2179c2d61e99f8.tar.zst ferdium-app-f013899bd27a7072f384e9c49e2179c2d61e99f8.zip |
Refactor updates settings (#506)
* Reorder updates toggle buttons
* Updated 'Disable updates' message to 'Enable automatic updates'
* Update 'noUpdates' to 'automaticUpdates'
* Update 'noUpdates' to 'automaticUpdates'
* Add condition for 'Include beta version' to show
* Enable automatic updates by default
* Update file so when automaticUpdates is true automatic updates are enabled
* Fix conditions with enableUpdate
* Apply code style
* Fix wrong condition with enableUpdate
* Delete unsued variable 'server'
* Apply style code
* Commit changes to submodule 'recipes'
* Update default message to 'Enable updates' from 'Disable updates'
* Update text to 'Enable updates' from 'Enable automatic update'
* Add migration for updates settings
* Update default messages to 'Enable updates' from 'Disable updates'
* Remove empty line
* Check for updates was disabled when updates were enabled
* Avoid superfluous break line when updates are disabled
* Add fragments to up-to-date message
* Add fragments to up-to-date message
* Remove file from previous commit
* Remove extra line
* Add 'Show draggable area on window' to en-US.json file
* Apply prepare-code script changes
Co-authored-by: Amine <amine@mouafik.fr>
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 8d93737b8..e1c2a2d4f 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -158,7 +158,7 @@ export default @observer class EditSettingsForm extends Component { | |||
158 | isTodosEnabled: PropTypes.bool.isRequired, | 158 | isTodosEnabled: PropTypes.bool.isRequired, |
159 | isTodosActivated: PropTypes.bool.isRequired, | 159 | isTodosActivated: PropTypes.bool.isRequired, |
160 | isWorkspaceEnabled: PropTypes.bool.isRequired, | 160 | isWorkspaceEnabled: PropTypes.bool.isRequired, |
161 | noUpdates: PropTypes.bool.isRequired, | 161 | automaticUpdates: PropTypes.bool.isRequired, |
162 | hibernationEnabled: PropTypes.bool.isRequired, | 162 | hibernationEnabled: PropTypes.bool.isRequired, |
163 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 163 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
164 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 164 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
@@ -196,7 +196,7 @@ export default @observer class EditSettingsForm extends Component { | |||
196 | isSpellcheckerIncludedInCurrentPlan, | 196 | isSpellcheckerIncludedInCurrentPlan, |
197 | isTodosEnabled, | 197 | isTodosEnabled, |
198 | isWorkspaceEnabled, | 198 | isWorkspaceEnabled, |
199 | noUpdates, | 199 | automaticUpdates, |
200 | hibernationEnabled, | 200 | hibernationEnabled, |
201 | isDarkmodeEnabled, | 201 | isDarkmodeEnabled, |
202 | openProcessManager, | 202 | openProcessManager, |
@@ -503,31 +503,39 @@ export default @observer class EditSettingsForm extends Component { | |||
503 | 503 | ||
504 | {/* Updates */} | 504 | {/* Updates */} |
505 | <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2> | 505 | <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2> |
506 | {updateIsReadyToInstall ? ( | 506 | <Toggle field={form.$('automaticUpdates')} /> |
507 | <Button | 507 | {automaticUpdates && ( |
508 | label={intl.formatMessage(messages.buttonInstallUpdate)} | 508 | <div> |
509 | onClick={installUpdate} | 509 | <Toggle field={form.$('beta')} /> |
510 | /> | 510 | {updateIsReadyToInstall ? ( |
511 | ) : ( | 511 | <Button |
512 | <Button | 512 | label={intl.formatMessage(messages.buttonInstallUpdate)} |
513 | buttonType="secondary" | 513 | onClick={installUpdate} |
514 | label={intl.formatMessage(updateButtonLabelMessage)} | 514 | /> |
515 | onClick={checkForUpdates} | 515 | ) : ( |
516 | disabled={noUpdates || isCheckingForUpdates || isUpdateAvailable} | 516 | <Button |
517 | loaded={!isCheckingForUpdates || !isUpdateAvailable} | 517 | buttonType="secondary" |
518 | /> | 518 | label={intl.formatMessage(updateButtonLabelMessage)} |
519 | onClick={checkForUpdates} | ||
520 | disabled={!automaticUpdates || isCheckingForUpdates || isUpdateAvailable} | ||
521 | loaded={!isCheckingForUpdates || !isUpdateAvailable} | ||
522 | /> | ||
523 | )} | ||
524 | <br /> | ||
525 | </div> | ||
519 | )} | 526 | )} |
520 | <br /> | ||
521 | <Toggle field={form.$('beta')} /> | ||
522 | <Toggle field={form.$('noUpdates')} /> | ||
523 | {intl.formatMessage(messages.currentVersion)} | 527 | {intl.formatMessage(messages.currentVersion)} |
524 | {' '} | 528 | {' '} |
525 | {remote.app.getVersion()} | 529 | {remote.app.getVersion()} |
526 | <br /> | 530 | {noUpdateAvailable && ( |
527 | <br /> | 531 | <> |
528 | {noUpdateAvailable && intl.formatMessage(messages.updateStatusUpToDate)} | 532 | <br /> |
533 | <br /> | ||
534 | {intl.formatMessage(messages.updateStatusUpToDate)} | ||
535 | </> | ||
536 | ) | ||
537 | } | ||
529 | <p className="settings__message"> | 538 | <p className="settings__message"> |
530 | |||
531 | <span className="mdi mdi-github-face" /> | 539 | <span className="mdi mdi-github-face" /> |
532 | <span> | 540 | <span> |
533 | 541 | ||