Merge branch 'master' into feature_intent

Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py

plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py

@@ -1,14 +1,32 @@
-##  Upgrades configurations from the state they were in at version 4.1 to the
-#   state they should be in at version 4.2.
+# Copyright (c) 2019 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
 import configparser
 import io
-from typing import Tuple, List
+from typing import Dict, List, Tuple
 
 from UM.VersionUpgrade import VersionUpgrade
 
+_renamed_settings = {
+    "support_minimal_diameter": "support_tower_maximum_supported_diameter"
+} #type: Dict[str, str]
+_removed_settings = ["prime_tower_circular"]  # type: List[str]
 
+
+##  Upgrades configurations from the state they were in at version 4.1 to the
+#   state they should be in at version 4.2.
 class VersionUpgrade41to42(VersionUpgrade):
-
+    ##  Gets the version number from a CFG file in Uranium's 4.1 format.
+    #
+    #   Since the format may change, this is implemented for the 4.1 format only
+    #   and needs to be included in the version upgrade system rather than
+    #   globally in Uranium.
+    #
+    #   \param serialised The serialised form of a CFG file.
+    #   \return The version number stored in the CFG file.
+    #   \raises ValueError The format of the version number in the file is
+    #   incorrect.
+    #   \raises KeyError The format of the file is incorrect.
     def getCfgVersion(self, serialised: str) -> int:
         parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialised)
@@ -16,17 +34,71 @@ class VersionUpgrade41to42(VersionUpgrade):
         setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
         return format_version * 1000000 + setting_version
 
+    ##  Upgrades instance containers to have the new version
+    #   number.
+    #
+    #   This renames the renamed settings in the containers.
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Update version number.
+        parser["metadata"]["setting_version"] = "8"
+
+        #Rename settings.
+        if "values" in parser:
+            for old_name, new_name in _renamed_settings.items():
+                if old_name in parser["values"]:
+                    parser["values"][new_name] = parser["values"][old_name]
+                    del parser["values"][old_name]
+            #Remove settings.
+            for key in _removed_settings:
+                if key in parser["values"]:
+                    del parser["values"][key]
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    ##  Upgrades Preferences to have the new version number.
+    #
+    #   This renames the renamed settings in the list of visible settings.
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Update version number.
+        parser["metadata"]["setting_version"] = "8"
+
+        #Renamed settings.
+        if "visible_settings" in parser["general"]:
+            visible_settings = parser["general"]["visible_settings"]
+            visible_setting_set = set(visible_settings.split(";"))
+            for old_name, new_name in _renamed_settings.items():
+                if old_name in visible_setting_set:
+                    visible_setting_set.remove(old_name)
+                    visible_setting_set.add(new_name)
+            for removed_key in _removed_settings:
+                if removed_key in visible_setting_set:
+                    visible_setting_set.remove(removed_key)
+            parser["general"]["visible_settings"] = ";".join(visible_setting_set)
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
     ##  Upgrades stacks to have the new version number.
     def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
-        parser = configparser.ConfigParser(interpolation=None)
+        parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialized)
 
+        #Update version number.
+        parser["metadata"]["setting_version"] = "8"
+        parser["general"]["version"] = "5"
+
         # We should only have 6 levels when we start.
         assert "7" not in parser["containers"]
 
-        # Update version number.
-        parser["general"]["version"] = "5"
-
         # We added the intent container in Cura 4.2. This means that all other containers move one step down.
         parser["containers"]["7"] = parser["containers"]["6"]
         parser["containers"]["6"] = parser["containers"]["5"]
@@ -37,6 +109,4 @@ class VersionUpgrade41to42(VersionUpgrade):
 
         result = io.StringIO()
         parser.write(result)
-
-        return [filename], [result.getvalue()]
-    
+        return [filename], [result.getvalue()]