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

- a fix for the latest change in the Preferences Tab

Browse Source
This commit is contained in:
Marius Stanciu
2022-04-20 18:47:32 +03:00
committed by Marius
parent 22ad4f7946
commit 6690e507f6
2 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@ CHANGELOG for FlatCAM Evo beta
- all CNCJob objects generated by the Solderpaste plugin now have the GCode saved as source_code which can be saved also from the CNCJob object context menu, and edited
- updated some custom widgets in the GUI elements such that the scrolling in the Preferences can be done without blocking on some of the widgets
- remade how the Preferences Tab is constructed such that now is made on demand for each section (tab) therefore making it faster to load (once a section is loaded - by clicking its tab - it will not be reloaded in the current session)
- a fix for the latest change in the Preferences Tab
19.04.2022

102
appGUI/preferences/PreferencesUIManager.py
View File

@@ -809,6 +809,7 @@ class PreferencesUIManager(QtCore.QObject):
:return: None
"""
self.init_preferences_gui()
self.pref_connect()
@@ -818,6 +819,16 @@ class PreferencesUIManager(QtCore.QObject):
# log.debug("Finished Preferences GUI form initialization.")
def init_preferences_gui(self):
self.general_displayed = False
self.gerber_displayed = False
self.excellon_displayed = False
self.geometry_displayed = False
self.cnc_displayed = False
self.engrave_displayed = False
self.plugins_displayed = False
self.plugins2_displayed = False
self.util_displayed = False
gen_form = self.ui.general_pref_form
try:
self.ui.general_scroll_area.takeWidget()
@@ -825,12 +836,10 @@ class PreferencesUIManager(QtCore.QObject):
self.ui.app.log.debug("Nothing to remove")
self.ui.general_scroll_area.setWidget(gen_form)
gen_form.show()
self.general_displayed = True
def pref_connect(self):
self.pref_disconnect()
self.init_preferences_gui()
self.ui.pref_tab_area.tabBarClicked.connect(self.on_tab_clicked)
# Button handlers
@@ -866,53 +875,52 @@ class PreferencesUIManager(QtCore.QObject):
except Exception:
pass
try:
self.ui.general_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.gerber_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.excellon_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.geometry_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.cncjob_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.plugins_engraving_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.tools_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.tools2_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
try:
self.ui.fa_scroll_area.takeWidget()
except Exception:
self.ui.app.log.debug("Nothing to remove")
def clear_preferences_gui(self):
self.pref_disconnect()
# try:
# self.ui.general_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.gerber_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.excellon_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.geometry_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.cncjob_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.plugins_engraving_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.tools_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.tools2_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
#
# try:
# self.ui.fa_scroll_area.takeWidget()
# except Exception:
# self.ui.app.log.debug("Nothing to remove")
def on_tab_clicked(self, idx):
if idx == 0 and self.general_displayed is False: