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

- preferences UI is now started on preferences open

Browse Source 
- more work/fixes in working on data structures (offset, offset_value, job_type, shape)
This commit is contained in:
Marius Stanciu
2021-07-14 22:35:29 +03:00
committed by Marius
parent 368413e6d2
commit f08466e7f2
15 changed files with 159 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
appGUI/preferences/PreferencesUIManager.py
View File

@@ -841,7 +841,74 @@ class PreferencesUIManager:
self.ui.pref_close_button.clicked.connect(self.on_pref_close_button)
self.ui.pref_defaults_button.clicked.connect(self.on_restore_defaults_preferences)
log.debug("Finished Preferences GUI form initialization.")
# log.debug("Finished Preferences GUI form initialization.")
def clear_preferences_gui(self):
# Disconnect Button handlers
try:
self.ui.pref_save_button.clicked.disconnect()
except Exception:
pass
try:
self.ui.pref_apply_button.clicked.disconnect()
except Exception:
pass
try:
self.ui.pref_close_button.clicked.disconnect()
except Exception:
pass
try:
self.ui.pref_defaults_button.clicked.disconnect()
except Exception:
pass
try:
self.ui.general_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.gerber_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.excellon_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.geometry_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.cncjob_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.plugins_engraving_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.tools_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.tools2_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
try:
self.ui.fa_scroll_area.takeWidget()
except Exception:
log.debug("Nothing to remove")
def __init_color_pickers(self):
# Init Gerber Plot Colors
@@ -1173,12 +1240,15 @@ class PreferencesUIManager:
self.preferences_changed_flag = True
def on_close_preferences_tab(self, parent):
self.ui.app.log.debug("Preferences GUI was closed.")
if self.ignore_tab_close_event:
return
# restore stylesheet to default for the statusBar icon
self.ui.pref_status_label.setStyleSheet("")
self.clear_preferences_gui()
# disconnect
for idx in range(self.ui.pref_tab_area.count()):
for tb in self.ui.pref_tab_area.widget(idx).findChildren(QtCore.QObject):