Settings backup and restore (#20551)

* Merge and conflict resolution

* Messages good, backup/restore algo better.

* Start of "GetExportVerion"

* fixed spelling

* New backup/restore mode working.

* Rename a project

* Removed test project

* Switch to text.json

* Renamed BackupAndSync to BackupAndRestore

* Added IgnoredPTRunSettings and full merge

* Restored "fixed" settings that change for no reason

* Various UI updates.

* speling

* Some cleanup and zip support.

* Merge and clean

* code clean up

* code clean up

* code clean up

* Smarter settings compare and merge.

* config based file include/exclude

* Removed some "words"

* Code clean up

* cleanup

* cleanup

* cleanup

* cleanup

* fixed spelling.

* Fixed clean up 1

* more clean up

* Trying to add ptb as an OK word

* Some UI updates.

* UI tweaks and PR review items.

* UI tweaks

* Merge conflicts resolved.

* Added CurrentSettingMatchText

* PR review updates.

* Removed weird file.

* Review updates and fixes

* More UI tweaks.

* UI tweaks

* Set default backup location to "%USERPROFILE%\\Documents\\PowerToys\\Backup"

* settings ui tweaks

* Added ExpanderContentSettingStyle

* fix missing config file

* fix missing config file, part 2

* update ui, cleanup cope

* update ui, cleanup code - Part2

* update method comments

* code cleanup and adjust Backup message time

* fix changing backup location on empty Regsitry

* fix select location - part 2

* location input box min-width

* remove lastRestoreDate from ViewModel

* Code or backup timing, and error handling.

* Should fix file/folder name crash.

* Progress to instance class for backup/restore

* Persist backup status state, added refresh button.

* Better auto check for settings status

* Some UI/text updates.

* Clean up

* Added prefix for "General_Settings" to resources

* Code review updates.

* Code review changes.

* Changed to FolderPicker per review

* Fixed issue with early delete of cleanup.

* Testing issues with FolderPicker

* Removed WinForm req and fixed win10 issue.

* Review update.

* Review changes.

Co-authored-by: htcfreek <61519853+htcfreek@users.noreply.github.com>
This commit is contained in:
Jeff Lord
2022-10-13 03:41:21 -04:00
committed by GitHub
parent 79e037eef4
commit ee904ae1b1
17 changed files with 1981 additions and 53 deletions

View File

@@ -648,6 +648,24 @@
<data name="GeneralPage_CheckForUpdates.Content" xml:space="preserve">
<value>Check for updates</value>
</data>
<data name="General_SettingsBackupAndRestoreLocationText.Header" xml:space="preserve">
<value>Location</value>
</data>
<data name="General_SettingsBackupAndRestore_ButtonBackup.Content" xml:space="preserve">
<value>Backup</value>
</data>
<data name="General_SettingsBackupInfo_FileNameHeader.Text" xml:space="preserve">
<value>File name:</value>
</data>
<data name="General_SettingsBackupAndRestore_LinkRefresh.Text" xml:space="preserve">
<value>Refresh</value>
</data>
<data name="General_SettingsBackupAndRestore_ButtonRestore.Content" xml:space="preserve">
<value>Restore</value>
</data>
<data name="General_SettingsBackupAndRestore_ButtonSelectLocation.Content" xml:space="preserve">
<value>Browse</value>
</data>
<data name="GeneralPage_UpdateNow.Content" xml:space="preserve">
<value>Update now</value>
</data>
@@ -812,6 +830,12 @@
<data name="ShortcutGuide_Appearance_Behavior.Header" xml:space="preserve">
<value>Appearance &amp; behavior</value>
</data>
<data name="General_SettingsBackupAndRestoreTitle.Header" xml:space="preserve">
<value>Backup &amp; restore</value>
</data>
<data name="General_SettingsBackupAndRestore.Header" xml:space="preserve">
<value>Backup and restore your settings at any time</value>
</data>
<data name="ShortcutGuide_Enable.Header" xml:space="preserve">
<value>Enable Shortcut Guide</value>
<comment>do not loc the Product name. Do you want this feature on / off</comment>
@@ -1045,6 +1069,21 @@
<data name="General_VersionLastChecked.Text" xml:space="preserve">
<value>Last checked: </value>
</data>
<data name="General_SettingsBackupInfo_DateHeader.Text" xml:space="preserve">
<value>Created at:</value>
</data>
<data name="General_SettingsBackupAndRestoreDescription.Text" xml:space="preserve">
<value>PowerToys will restart automatically if needed.</value>
</data>
<data name="General_SettingsBackupAndRestoreStatusInfo.Header" xml:space="preserve">
<value>Backup information</value>
</data>
<data name="General_SettingsBackupInfo_SourceHeader.Text" xml:space="preserve">
<value>Source machine:</value>
</data>
<data name="General_SettingsBackupInfo_StatusHeader.Text" xml:space="preserve">
<value>Status:</value>
</data>
<data name="General_Version.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Version</value>
</data>
@@ -2354,6 +2393,64 @@ Activate by holding the key for the character you want to add an accent to, then
<data name="LearnMore_TextExtractor.Text" xml:space="preserve">
<value>Learn more about Text Extractor</value>
</data>
<data name="General_SettingsBackupAndRestore_NothingToBackup" xml:space="preserve">
<value>A new backup was not created because no settings have been changed since last backup.</value>
</data>
<data name="General_SettingsBackupAndRestore_NoBackupFound" xml:space="preserve">
<value>No backup found</value>
</data>
<data name="General_SettingsBackupAndRestore_FailedToParseTime" xml:space="preserve">
<value>Failed to parse time</value>
</data>
<data name="General_SettingsBackupAndRestore_UnknownBackupTime" xml:space="preserve">
<value>Unknown</value>
</data>
<data name="General_SettingsBackupAndRestore_UnknownBackupSource" xml:space="preserve">
<value>Unknown</value>
</data>
<data name="General_SettingsBackupAndRestore_ThisMachine" xml:space="preserve">
<value>This computer</value>
</data>
<data name="General_SettingsBackupAndRestore_CurrentSettingsMatch" xml:space="preserve">
<value>Current settings match</value>
</data>
<data name="General_SettingsBackupAndRestore_CurrentSettingsStatusAt" xml:space="preserve">
<value>at</value>
<comment>E.g., Food was served 'at' noon.</comment>
</data>
<data name="General_SettingsBackupAndRestore_CurrentSettingsDiffer" xml:space="preserve">
<value>Current settings differ</value>
</data>
<data name="General_SettingsBackupAndRestore_CurrentSettingsNoChecked" xml:space="preserve">
<value>Checking...</value>
</data>
<data name="General_SettingsBackupAndRestore_CurrentSettingsUnknown" xml:space="preserve">
<value>Unknown</value>
</data>
<data name="General_SettingsBackupAndRestore_NeverRestored" xml:space="preserve">
<value>Never restored</value>
</data>
<data name="General_SettingsBackupAndRestore_NothingToRestore" xml:space="preserve">
<value>Nothing to restore.</value>
</data>
<data name="General_SettingsBackupAndRestore_NoSettingsFilesFound" xml:space="preserve">
<value>No settings files found.</value>
</data>
<data name="General_SettingsBackupAndRestore_BackupError" xml:space="preserve">
<value>There was an error. Try another backup location.</value>
</data>
<data name="General_SettingsBackupAndRestore_BackupComplete" xml:space="preserve">
<value>Backup completed.</value>
</data>
<data name="General_SettingsBackupAndRestore_NoBackupSyncPath" xml:space="preserve">
<value>No backup location selected.</value>
</data>
<data name="General_SettingsBackupAndRestore_NoBackupsFound" xml:space="preserve">
<value>No backups found to restore.</value>
</data>
<data name="General_SettingsBackupAndRestore_InvalidBackupLocation" xml:space="preserve">
<value>Invalid backup location.</value>
</data>
<data name="TextExtractor.ModuleDescription" xml:space="preserve">
<value>Text Extractor is a convenient way to copy text from anywhere on screen</value>
</data>