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

- minor name changes

Browse Source
This commit is contained in:
Marius Stanciu
2023-04-08 12:43:34 +03:00
parent faf41d7bca
commit 6f93734d3f
28 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appGUI/MainGUI.py
View File

@@ -2064,7 +2064,7 @@ class MainGUI(QtWidgets.QMainWindow):
# ########################################################################
# ################## RESTORE UI from QSettings #################
# ########################################################################
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("saved_gui_state"):
self.restoreState(qsettings.value('saved_gui_state'), 0)
tb_lock_state = qsettings.value('toolbar_lock', "true")
@@ -2233,7 +2233,7 @@ class MainGUI(QtWidgets.QMainWindow):
def on_toggle_gui(self):
if self.isHidden():
mgui_settings = QSettings("Open Source", "FlatCAM")
mgui_settings = QSettings("Open Source", "FlatCAM_EVO")
if mgui_settings.contains("maximized_gui"):
maximized_ui = mgui_settings.value('maximized_gui', type=bool)
if maximized_ui is True:
@@ -2339,7 +2339,7 @@ class MainGUI(QtWidgets.QMainWindow):
"""
self.app.log.debug("Clearing the settings in QSettings. GUI settings cleared.")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
theme_settings.setValue('theme', 'light')
del theme_settings
@@ -2364,7 +2364,7 @@ class MainGUI(QtWidgets.QMainWindow):
response = msgbox.clickedButton()
if forced_clear is True or response == bt_yes:
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
for key in qsettings.allKeys():
qsettings.remove(key)
# This will write the setting to the platform specific storage.
@@ -2682,7 +2682,7 @@ class MainGUI(QtWidgets.QMainWindow):
self.snap_magnet.setVisible(False)
self.editor_exit_btn_ret_action.setVisible(False)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("layout"):
layout = qsettings.value('layout', type=str)
@@ -2750,7 +2750,7 @@ class MainGUI(QtWidgets.QMainWindow):
if isinstance(widget, QtWidgets.QToolBar):
widget.setMovable(True)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
qsettings.setValue('toolbar_lock', lock)
# This will write the setting to the platform specific storage.
del qsettings
@@ -2765,7 +2765,7 @@ class MainGUI(QtWidgets.QMainWindow):
if isinstance(widget, QtWidgets.QToolBar):
widget.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
qsettings.setValue('menu_show_text', show_text)
# This will write the setting to the platform specific storage.
del qsettings
@@ -4519,7 +4519,7 @@ class MainGUI(QtWidgets.QMainWindow):
else:
g_rect = self.geometry()
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
qsettings.setValue('saved_gui_state', self.saveState(0))
qsettings.setValue('toolbar_lock', self.lock_action.isChecked())
qsettings.setValue('menu_show_text', self.show_text_action.isChecked())

12
appGUI/ObjectUI.py
View File

@@ -36,7 +36,7 @@ class ObjectUI(QtWidgets.QWidget):
self.app = app
self.decimals = app.decimals
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
@@ -561,7 +561,7 @@ class ExcellonObjectUI(ObjectUI):
self.decimals = app.decimals
self.app = app
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
@@ -856,7 +856,7 @@ class GeometryObjectUI(ObjectUI):
self.decimals = app.decimals
self.app = app
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
@@ -1173,7 +1173,7 @@ class CNCObjectUI(ObjectUI):
self.decimals = app.decimals
self.app = app
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
@@ -1473,7 +1473,7 @@ class ScriptObjectUI(ObjectUI):
self.decimals = app.decimals
self.app = app
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
@@ -1536,7 +1536,7 @@ class DocumentObjectUI(ObjectUI):
self.decimals = app.decimals
self.app = app
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:

6
appGUI/PlotCanvas.py
View File

@@ -50,7 +50,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
self.fcapp = fcapp
settings = QtCore.QSettings("Open Source", "FlatCAM")
settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:
@@ -337,7 +337,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
hud_text = '%s\n%s\n\n%s\n%s' % (l1_hud_text, l2_hud_text, l3_hud_text, l4_hud_text)
# font size
qsettings = QtCore.QSettings("Open Source", "FlatCAM")
qsettings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("hud_font_size"):
fsize = qsettings.value('hud_font_size', type=int)
else:
@@ -385,7 +385,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
def on_toggle_grid_lines(self, signal=None, silent=None):
state = self.grid_lines_enabled
settings = QtCore.QSettings("Open Source", "FlatCAM")
settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:

4
appGUI/PlotCanvas3d.py
View File

@@ -62,7 +62,7 @@ class PlotCanvas3d(QtCore.QObject, scene.SceneCanvas):
# Parent container
self.container = container
settings = QtCore.QSettings("Open Source", "FlatCAM")
settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:
@@ -162,7 +162,7 @@ class PlotCanvas3d(QtCore.QObject, scene.SceneCanvas):
c_color = self.line_color
# font size
qsettings = QtCore.QSettings("Open Source", "FlatCAM")
qsettings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("hud_font_size"):
fsize = qsettings.value('hud_font_size', type=int)
else:

4
appGUI/PlotCanvasLegacy.py
View File

@@ -82,7 +82,7 @@ class CanvasCache(QtCore.QObject):
self.axes.set_xticks([])
self.axes.set_yticks([])
settings = QtCore.QSettings("Open Source", "FlatCAM")
settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:
@@ -463,7 +463,7 @@ class PlotCanvasLegacy(QtCore.QObject):
self.on_update_text_hud()
# set font size
qsettings = QtCore.QSettings("Open Source", "FlatCAM")
qsettings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("hud_font_size"):
# I multiply with 2.5 because this seems to be the difference between the value taken by the VisPy (3D)
# and Matplotlib (Legacy2D FlatCAM graphic engine)

4
appGUI/VisPyCanvas.py
View File

@@ -30,7 +30,7 @@ class VisPyCanvas(scene.SceneCanvas):
self.unfreeze()
settings = QSettings("Open Source", "FlatCAM")
settings = QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("axis_font_size"):
a_fsize = settings.value('axis_font_size', type=int)
else:
@@ -102,7 +102,7 @@ class VisPyCanvas(scene.SceneCanvas):
# grid1 = scene.GridLines(parent=view.scene, color='dimgray')
# grid1.set_gl_state(depth_test=False)
settings = QSettings("Open Source", "FlatCAM")
settings = QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:

2
appGUI/preferences/OptionUI.py
View File

@@ -106,7 +106,7 @@ class TextAreaOptionUI(OptionUI):
textarea = FCTextArea()
textarea.setPlaceholderText(_(self.label_tooltip))
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:

4
appGUI/preferences/PreferencesUIManager.py
View File

@@ -1126,7 +1126,7 @@ class PreferencesUIManager(QtCore.QObject):
self.defaults.current_defaults.update(self.defaults)
# deal with appearance change
appearance_settings = QtCore.QSettings("Open Source", "FlatCAM")
appearance_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if appearance_settings.contains("appearance"):
appearance = appearance_settings.value('appearance', type=str)
else:
@@ -1200,7 +1200,7 @@ class PreferencesUIManager(QtCore.QObject):
saved_filename_path = os.path.join(self.data_path, 'current_defaults_%s.FlatConfig' % self.defaults.version)
self.defaults.load(filename=saved_filename_path, inform=self.inform)
settgs = QSettings("Open Source", "FlatCAM")
settgs = QSettings("Open Source", "FlatCAM_EVO")
# save the notebook font size
fsize = self.ui.general_pref_form.general_app_set_group.notebook_font_size_spinner.get_value()

2
appGUI/preferences/cncjob/CNCJobEditorPrefGroupUI.py
View File

@@ -32,7 +32,7 @@ class CNCJobEditorPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.param_label)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:

2
appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
View File

@@ -33,7 +33,7 @@ class CNCJobOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.export_gcode_label)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:

12
appGUI/preferences/general/GeneralAPPSetGroupUI.py
View File

@@ -23,7 +23,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.decimals = app.decimals
self.options = app.options
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
@@ -213,7 +213,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.notebook_font_size_spinner.set_range(8, 40)
self.notebook_font_size_spinner.setWrapping(True)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("notebook_font_size"):
self.notebook_font_size_spinner.set_value(qsettings.value('notebook_font_size', type=int))
else:
@@ -232,7 +232,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.axis_font_size_spinner.set_range(0, 40)
self.axis_font_size_spinner.setWrapping(True)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("axis_font_size"):
self.axis_font_size_spinner.set_value(qsettings.value('axis_font_size', type=int))
else:
@@ -252,7 +252,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.textbox_font_size_spinner.set_range(8, 40)
self.textbox_font_size_spinner.setWrapping(True)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
self.textbox_font_size_spinner.set_value(qsettings.value('textbox_font_size', type=int))
else:
@@ -271,7 +271,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.hud_font_size_spinner.set_range(8, 40)
self.hud_font_size_spinner.setWrapping(True)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("hud_font_size"):
self.hud_font_size_spinner.set_value(qsettings.value('hud_font_size', type=int))
else:
@@ -493,7 +493,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
if val:
self.app.cursor_color_3D = self.app.options["global_cursor_color"]
else:
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:

4
appGUI/preferences/general/GeneralAppPrefGroupUI.py
View File

@@ -226,7 +226,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
_("Enable display of the splash screen at application startup.")
)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.value("splash_screen"):
self.splash_cb.set_value(True)
else:
@@ -439,7 +439,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
@staticmethod
def on_splash_changed(state):
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
qsettings.setValue('splash_screen', 1) if state else qsettings.setValue('splash_screen', 0)
# This will write the setting to the platform specific storage.

4
appGUI/preferences/general/GeneralAppSettingsGroupUI.py
View File

@@ -75,7 +75,7 @@ class GeneralAppSettingsGroupUI(OptionsGroupUI2):
self.setTitle(str(_("App Settings")))
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
self.notebook_font_size_field = self.option_dict()["notebook_font_size"].get_field()
if qsettings.contains("notebook_font_size"):
@@ -293,7 +293,7 @@ class GeneralAppSettingsGroupUI(OptionsGroupUI2):
if val:
self.app.cursor_color_3D = self.app.options["global_cursor_color"]
else:
theme_settings = QtCore.QSettings("Open Source", "FlatCAM")
theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:

4
appGUI/preferences/general/GeneralGUIPrefGroupUI.py
View File

@@ -96,7 +96,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.layout_combo, 6, 1)
# Set the current index for layout_combo
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("layout"):
layout = qsettings.value('layout', type=str)
idx = self.layout_combo.findText(layout.capitalize())
@@ -394,7 +394,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
@staticmethod
def handle_style(style):
# set current style
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
qsettings.setValue('style', str(style))
new_style = QtWidgets.QStyleFactory.keys()[int(style)]

2
appGUI/preferences/utilities/AutoCompletePrefGroupUI.py
View File

@@ -43,7 +43,7 @@ class AutoCompletePrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.grb_list_label)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:

2
appGUI/preferences/utilities/FAExcPrefGroupUI.py
View File

@@ -51,7 +51,7 @@ class FAExcPrefGroupUI(OptionsGroupUI):
)
self.vertical_lay.addWidget(list_label)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:

2
appGUI/preferences/utilities/FAGcoPrefGroupUI.py
View File

@@ -42,7 +42,7 @@ class FAGcoPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.gco_list_label)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else:

2
appGUI/preferences/utilities/FAGrbPrefGroupUI.py
View File

@@ -41,7 +41,7 @@ class FAGrbPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.grb_list_label)
qsettings = QSettings("Open Source", "FlatCAM")
qsettings = QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("textbox_font_size"):
tb_fsize = qsettings.value('textbox_font_size', type=int)
else: