bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed an error that did not allowed for the older preferences to be deleted when installing a different version of the software

Browse Source
This commit is contained in:
Marius Stanciu
2020-10-28 03:47:34 +02:00
committed by Marius
parent 6aa95ddebe
commit bd98bb42c4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
- in Geometry UI and for Solderpaste Tool replaced the pop up window that is launched when using shortcut key with one that has the context menu translated - in Geometry UI and for Solderpaste Tool replaced the pop up window that is launched when using shortcut key with one that has the context menu translated
- some UI cleanup in the Geometry UI - some UI cleanup in the Geometry UI
- updated the translation strings except Russian which could be in the works - updated the translation strings except Russian which could be in the works
- fixed an error that did not allowed for the older preferences to be deleted when installing a different version of the software
27.10.2020 27.10.2020

4
app_Main.py
View File

@@ -164,8 +164,8 @@ class App(QtCore.QObject):
# ############################################################################################################### # ###############################################################################################################
# ################################### Version and VERSION DATE ################################################## # ################################### Version and VERSION DATE ##################################################
# ############################################################################################################### # ###############################################################################################################
version = "Unstable Version" # version = "Unstable Version"
# version = 8.994 version = 8.994
version_date = "2020/10/30" version_date = "2020/10/30"
beta = True beta = True

16
defaults.py
View File

@@ -778,14 +778,14 @@ class FlatCAMDefaults:
with open(file_path, "r") as file: with open(file_path, "r") as file:
f_defaults = simplejson.loads(file.read()) f_defaults = simplejson.loads(file.read())
# if the file is not empty # if the file is not empty
if f_defaults: if f_defaults:
# if it has the same version do nothing # if it has the same version do nothing
if str(f_defaults['version']) == str(version): if str(f_defaults['version']) == str(version):
return return
# if the versions differ then remove the file # if the versions differ then remove the file
os.chmod(file_path, stat.S_IRWXO | stat.S_IWRITE | stat.S_IWGRP) os.chmod(file_path, stat.S_IRWXO | stat.S_IWRITE | stat.S_IWGRP)
os.remove(file_path) os.remove(file_path)
cls.factory_defaults['version'] = version cls.factory_defaults['version'] = version