Fix version upgrade

CURA-6113

cura/CuraApplication.py

@@ -145,7 +145,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
-    SettingVersion = 6
+    SettingVersion = 7
 
     Created = False
 

plugins/VersionUpgrade/VersionUpgrade40to41/__init__.py

@@ -14,15 +14,19 @@ def getMetaData() -> Dict[str, Any]:
     return {
         "version_upgrade": {
             # From                           To                              Upgrade function
-            ("machine_stack", 4000005):      ("machine_stack", 4000006,      upgrade.upgradeStack),
-            ("extruder_train", 4000005):     ("extruder_train", 4000006,     upgrade.upgradeStack),
-            ("preferences", 6000005):        ("preferences", 6000006,        upgrade.upgradePreferences),
-            ("definition_changes", 4000005): ("definition_changes", 4000006, upgrade.upgradeInstanceContainer),
-            ("quality_changes", 4000005):    ("quality_changes", 4000006,    upgrade.upgradeInstanceContainer),
-            ("quality", 4000005):            ("quality", 4000006,            upgrade.upgradeInstanceContainer),
-            ("user", 4000005):               ("user", 4000006,               upgrade.upgradeInstanceContainer),
+            ("preferences", 6000006):        ("preferences", 6000007, upgrade.upgradePreferences),
+            ("machine_stack", 4000006):      ("machine_stack", 4000007,      upgrade.upgradeStack),
+            ("extruder_train", 4000006):     ("extruder_train", 4000007,     upgrade.upgradeStack),
+            ("definition_changes", 4000006): ("definition_changes", 4000007, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000006):    ("quality_changes", 4000007,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000006):            ("quality", 4000007,            upgrade.upgradeInstanceContainer),
+            ("user", 4000006):               ("user", 4000007,               upgrade.upgradeInstanceContainer),
         },
         "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
             "machine_stack": {
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./machine_instances"}
@@ -30,6 +34,22 @@ def getMetaData() -> Dict[str, Any]:
             "extruder_train": {
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./extruders"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality_changes"}
+            },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
             }
         }
     }

plugins/XmlMaterialProfile/__init__.py

@@ -16,7 +16,7 @@ def getMetaData():
             "mimetype": "application/x-ultimaker-material-profile"
         },
         "version_upgrade": {
-            ("materials", 1000000): ("materials", 1000006, upgrader.upgradeMaterial),
+            ("materials", 1000000): ("materials", 1000007, upgrader.upgradeMaterial),
         },
         "sources": {
             "materials": {