Cleanup for cfd1b7b813ccdac76c623243a03633b2059d9a0e

cura/Backups/Backup.py

@@ -14,7 +14,6 @@ from UM.Logger import Logger
 from UM.Message import Message
 from UM.Platform import Platform
 from UM.Resources import Resources
-from UM.Version import Version
 from cura.CuraApplication import CuraApplication
 
 

cura/Backups/BackupsManager.py

@@ -12,6 +12,8 @@ class BackupsManager:
     The BackupsManager is responsible for managing the creating and restoring of backups.
     Backups themselves are represented in a different class.
     """
+    def __init__(self):
+        self._application = CuraApplication.getInstance()
 
     def createBackup(self) -> (Optional[bytes], Optional[dict]):
         """
@@ -43,14 +45,12 @@ class BackupsManager:
         if restored:
             # At this point, Cura will need to restart for the changes to take effect.
             # We don't want to store the data at this point as that would override the just-restored backup.
-            CuraApplication.getInstance().windowClosed(save_data=False)
+            self._application.windowClosed(save_data=False)
 
     def _disableAutoSave(self):
         """Here we try to disable the auto-save plugin as it might interfere with restoring a backup."""
-        # TODO: Disable auto-save if possible.
+        self._application.setSaveDataEnabled(False)
-        CuraApplication.getInstance().setSaveDataEnabled(False)
 
     def _enableAutoSave(self):
         """Re-enable auto-save after we're done."""
-        # TODO: Enable auto-save if possible.
+        self._application.setSaveDataEnabled(True)
-        CuraApplication.getInstance().setSaveDataEnabled(True)

cura/CuraApplication.py

@@ -503,15 +503,12 @@ class CuraApplication(QtApplication):
     def setSaveDataEnabled(self, enabled: bool) -> None:
         self._save_data_enabled = enabled
 
-    ##  Cura has multiple locations where instance containers need to be saved, so we need to handle this differently.
+    # Cura has multiple locations where instance containers need to be saved, so we need to handle this differently.
-    #
-    #   Note that the AutoSave plugin also calls this method.
     def saveSettings(self):
         if not self.started or not self._save_data_enabled:
             # Do not do saving during application start or when data should not be safed on quit.
             return
         ContainerRegistry.getInstance().saveDirtyContainers()
-
         Preferences.getInstance().writeToFile(Resources.getStoragePath(Resources.Preferences,
                                                                        self._application_name + ".cfg"))
 

resources/bundled_packages.json

@@ -33,23 +33,6 @@
             }
         }
     },
-    "AutoSave": {
-        "package_info": {
-            "package_id": "AutoSave",
-            "package_type": "plugin",
-            "display_name": "Auto-Save",
-            "description": "Automatically saves Preferences, Machines and Profiles after changes.",
-            "package_version": "1.0.0",
-            "cura_version": 4,
-            "website": "https://ultimaker.com",
-            "author": {
-                "author_id": "Ultimaker",
-                "display_name": "Ultimaker B.V.",
-                "email": "plugins@ultimaker.com",
-                "website": "https://ultimaker.com"
-            }
-        }
-    },
     "ChangeLogPlugin": {
         "package_info": {
             "package_id": "ChangeLogPlugin",