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

6
appEditors/appGCodeEditor.py
View File

@@ -104,8 +104,8 @@ class AppGCodeEditor(QtCore.QObject):
# #############################################################################################################
# #############################################################################################################
self.ui.append_text.set_value(self.app.defaults["cncjob_append"])
self.ui.prepend_text.set_value(self.app.defaults["cncjob_prepend"])
self.ui.append_text.set_value(self.app.options["cncjob_append"])
self.ui.prepend_text.set_value(self.app.options["cncjob_prepend"])
# Remove anything else in the GUI Properties Tab
self.app.ui.properties_scroll_area.takeWidget()
@@ -121,7 +121,7 @@ class AppGCodeEditor(QtCore.QObject):
self.activate()
# Show/Hide Advanced Options
app_mode = self.app.defaults["global_app_level"]
app_mode = self.app.options["global_app_level"]
self.change_level(app_mode)
def build_ui(self):