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

- the application now uses only the default values from the app.options dict, the app.defaults dict holds the definitive default values

Browse Source 
- fixed some outstanding issues from the PyQt6 port
- PEP8 fixes
- minor fixes
- updated the saving of Preferences to update the self.options too: the `Apply` action will update the self.options but the `Save` action will save the updated preferences to the file on disk
This commit is contained in:
Marius Stanciu
2022-02-18 23:06:58 +02:00
committed by Marius
parent 14d9ea5470
commit 65d8dcc0b2
92 changed files with 1881 additions and 1882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appTool.py
View File

@@ -138,12 +138,12 @@ class AppTool(QtWidgets.QWidget):
if 'color' in kwargs:
color = kwargs['color']
else:
color = self.app.defaults['global_sel_line']
color = self.app.options['global_sel_line']
if 'face_color' in kwargs:
face_color = kwargs['face_color']
else:
face_color = self.app.defaults['global_sel_fill']
face_color = self.app.options['global_sel_fill']
if 'face_alpha' in kwargs:
face_alpha = kwargs['face_alpha']
@@ -184,12 +184,12 @@ class AppTool(QtWidgets.QWidget):
if 'color' in kwargs:
color = kwargs['color']
else:
color = self.app.defaults['global_sel_line']
color = self.app.options['global_sel_line']
if 'face_color' in kwargs:
face_color = kwargs['face_color']
else:
face_color = self.app.defaults['global_sel_fill']
face_color = self.app.options['global_sel_fill']
if 'face_alpha' in kwargs:
face_alpha = kwargs['face_alpha']
@@ -242,12 +242,12 @@ class AppTool(QtWidgets.QWidget):
if 'color' in kwargs:
color = kwargs['color']
else:
color = self.app.defaults['global_sel_line']
color = self.app.options['global_sel_line']
if 'face_color' in kwargs:
face_color = kwargs['face_color']
else:
face_color = self.app.defaults['global_sel_fill']
face_color = self.app.options['global_sel_fill']
if 'face_alpha' in kwargs:
face_alpha = kwargs['face_alpha']