3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 11:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower

Browse source 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> Change there that needed to be merged here, but we had changed lines around it.
This commit is contained in:
Ghostkeeper 2019-06-12 13:34:59 +02:00
commit 056afdde5f
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py
View file

@ -48,8 +48,8 @@ class VersionUpgrade41to42(VersionUpgrade):
if "values" in parser: if "values" in parser:
for old_name, new_name in _renamed_settings.items(): for old_name, new_name in _renamed_settings.items():
if old_name in parser["values"]: if old_name in parser["values"]:
parser[new_name] = parser[old_name] parser["values"][new_name] = parser["values"][old_name]
del parser[old_name] del parser["values"][old_name]
#Remove settings. #Remove settings.
for key in _removed_settings: for key in _removed_settings:
if key in parser["values"]: if key in parser["values"]:
@ -77,6 +77,7 @@ class VersionUpgrade41to42(VersionUpgrade):
if old_name in visible_settings: if old_name in visible_settings:
visible_settings.remove(old_name) visible_settings.remove(old_name)
visible_settings.add(new_name) visible_settings.add(new_name)
parser["general"]["visible_settings"] = ";".join(visible_settings)
result = io.StringIO() result = io.StringIO()
parser.write(result) parser.write(result)