From 6f93734d3f109c45b67796f8de5b666d34b1bb3c Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 8 Apr 2023 12:43:34 +0300 Subject: [PATCH] - minor name changes --- CHANGELOG.md | 1 + appEditors/AppExcEditor.py | 12 ++++++------ appEditors/AppGeoEditor.py | 12 ++++++------ appEditors/AppGerberEditor.py | 8 ++++---- appGUI/MainGUI.py | 16 ++++++++-------- appGUI/ObjectUI.py | 12 ++++++------ appGUI/PlotCanvas.py | 6 +++--- appGUI/PlotCanvas3d.py | 4 ++-- appGUI/PlotCanvasLegacy.py | 4 ++-- appGUI/VisPyCanvas.py | 4 ++-- appGUI/preferences/OptionUI.py | 2 +- appGUI/preferences/PreferencesUIManager.py | 4 ++-- .../cncjob/CNCJobEditorPrefGroupUI.py | 2 +- .../preferences/cncjob/CNCJobOptPrefGroupUI.py | 2 +- .../preferences/general/GeneralAPPSetGroupUI.py | 12 ++++++------ .../preferences/general/GeneralAppPrefGroupUI.py | 4 ++-- .../general/GeneralAppSettingsGroupUI.py | 4 ++-- .../preferences/general/GeneralGUIPrefGroupUI.py | 4 ++-- .../utilities/AutoCompletePrefGroupUI.py | 2 +- appGUI/preferences/utilities/FAExcPrefGroupUI.py | 2 +- appGUI/preferences/utilities/FAGcoPrefGroupUI.py | 2 +- appGUI/preferences/utilities/FAGrbPrefGroupUI.py | 2 +- appMain.py | 12 ++++++------ appObjects/ObjectCollection.py | 4 ++-- appPlugins/ToolDistance.py | 2 +- appPlugins/ToolShell.py | 2 +- appTranslation.py | 10 +++++----- FlatCAM.py => flatcam.py | 2 +- 28 files changed, 77 insertions(+), 76 deletions(-) rename FlatCAM.py => flatcam.py (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f715a59..af6f32e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ CHANGELOG for FlatCAM Evo beta - modified the paint and buffer icons - optimized the editor menu/toolbar action names - major change: from now on the only dimensional units available are those from ISO METRIC system +- minor name changes 22.03.2023 diff --git a/appEditors/AppExcEditor.py b/appEditors/AppExcEditor.py index c6fe2191..2e48deff 100644 --- a/appEditors/AppExcEditor.py +++ b/appEditors/AppExcEditor.py @@ -385,7 +385,7 @@ class DrillAdd(FCShapeTool): self.points = self.draw_app.snap_x, self.draw_app.snap_y # 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: @@ -849,7 +849,7 @@ class DrillArray(FCShapeTool): self.points = self.draw_app.snap_x, self.draw_app.snap_y # 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: @@ -1187,7 +1187,7 @@ class SlotAdd(FCShapeTool): self.points = self.draw_app.snap_x, self.draw_app.snap_y # 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: @@ -1769,7 +1769,7 @@ class SlotArray(FCShapeTool): self.points = self.draw_app.snap_x, self.draw_app.snap_y # 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: @@ -2196,7 +2196,7 @@ class ResizeEditorExc(FCShapeTool): self.points = self.draw_app.snap_x, self.draw_app.snap_y # 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: @@ -2780,7 +2780,7 @@ class CopyEditorExc(FCShapeTool): return # 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: diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py index 19db79e4..dcd15f4c 100644 --- a/appEditors/AppGeoEditor.py +++ b/appEditors/AppGeoEditor.py @@ -602,7 +602,7 @@ class FCCircle(FCShapeTool): return # 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: @@ -1136,7 +1136,7 @@ class FCRectangle(FCShapeTool): return # 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: @@ -1345,7 +1345,7 @@ class FCPolygon(FCShapeTool): return # 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: @@ -1550,7 +1550,7 @@ class FCPath(FCShapeTool): return # 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: @@ -2108,7 +2108,7 @@ class FCMove(FCShapeTool): return # 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: @@ -2624,7 +2624,7 @@ class FCCopy(FCShapeTool): return # 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: diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py index 1612cd3f..c230232a 100644 --- a/appEditors/AppGerberEditor.py +++ b/appEditors/AppGerberEditor.py @@ -300,7 +300,7 @@ class PadEditorGrb(ShapeToolEditorGrb): return # 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: @@ -896,7 +896,7 @@ class PadArrayEditorGrb(ShapeToolEditorGrb): self.points = self.draw_app.snap_x, self.draw_app.snap_y # 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: @@ -1419,7 +1419,7 @@ class RegionEditorGrb(ShapeToolEditorGrb): return # 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: @@ -1823,7 +1823,7 @@ class TrackEditorGrb(ShapeToolEditorGrb): return # 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: diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 948e1588..65cf0fe0 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -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()) diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py index b9b7e9dc..4946d706 100644 --- a/appGUI/ObjectUI.py +++ b/appGUI/ObjectUI.py @@ -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: diff --git a/appGUI/PlotCanvas.py b/appGUI/PlotCanvas.py index b01884d8..1b67a39e 100644 --- a/appGUI/PlotCanvas.py +++ b/appGUI/PlotCanvas.py @@ -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: diff --git a/appGUI/PlotCanvas3d.py b/appGUI/PlotCanvas3d.py index 748b459c..3671a73d 100644 --- a/appGUI/PlotCanvas3d.py +++ b/appGUI/PlotCanvas3d.py @@ -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: diff --git a/appGUI/PlotCanvasLegacy.py b/appGUI/PlotCanvasLegacy.py index 706f1fb3..10fd338c 100644 --- a/appGUI/PlotCanvasLegacy.py +++ b/appGUI/PlotCanvasLegacy.py @@ -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) diff --git a/appGUI/VisPyCanvas.py b/appGUI/VisPyCanvas.py index ded3db81..a80d2fd2 100644 --- a/appGUI/VisPyCanvas.py +++ b/appGUI/VisPyCanvas.py @@ -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: diff --git a/appGUI/preferences/OptionUI.py b/appGUI/preferences/OptionUI.py index be05ee55..3024c6a0 100644 --- a/appGUI/preferences/OptionUI.py +++ b/appGUI/preferences/OptionUI.py @@ -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: diff --git a/appGUI/preferences/PreferencesUIManager.py b/appGUI/preferences/PreferencesUIManager.py index 1d69df04..4b3a307c 100644 --- a/appGUI/preferences/PreferencesUIManager.py +++ b/appGUI/preferences/PreferencesUIManager.py @@ -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() diff --git a/appGUI/preferences/cncjob/CNCJobEditorPrefGroupUI.py b/appGUI/preferences/cncjob/CNCJobEditorPrefGroupUI.py index e439b7e2..1c99f477 100644 --- a/appGUI/preferences/cncjob/CNCJobEditorPrefGroupUI.py +++ b/appGUI/preferences/cncjob/CNCJobEditorPrefGroupUI.py @@ -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: diff --git a/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py b/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py index b38f160e..1dbd9696 100644 --- a/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py +++ b/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py @@ -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: diff --git a/appGUI/preferences/general/GeneralAPPSetGroupUI.py b/appGUI/preferences/general/GeneralAPPSetGroupUI.py index 4752e50c..7bd815e1 100644 --- a/appGUI/preferences/general/GeneralAPPSetGroupUI.py +++ b/appGUI/preferences/general/GeneralAPPSetGroupUI.py @@ -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: diff --git a/appGUI/preferences/general/GeneralAppPrefGroupUI.py b/appGUI/preferences/general/GeneralAppPrefGroupUI.py index 6dc5d6cd..89492fd7 100644 --- a/appGUI/preferences/general/GeneralAppPrefGroupUI.py +++ b/appGUI/preferences/general/GeneralAppPrefGroupUI.py @@ -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. diff --git a/appGUI/preferences/general/GeneralAppSettingsGroupUI.py b/appGUI/preferences/general/GeneralAppSettingsGroupUI.py index 785204c2..9a26283b 100644 --- a/appGUI/preferences/general/GeneralAppSettingsGroupUI.py +++ b/appGUI/preferences/general/GeneralAppSettingsGroupUI.py @@ -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: diff --git a/appGUI/preferences/general/GeneralGUIPrefGroupUI.py b/appGUI/preferences/general/GeneralGUIPrefGroupUI.py index af532e2b..08cfe09a 100644 --- a/appGUI/preferences/general/GeneralGUIPrefGroupUI.py +++ b/appGUI/preferences/general/GeneralGUIPrefGroupUI.py @@ -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)] diff --git a/appGUI/preferences/utilities/AutoCompletePrefGroupUI.py b/appGUI/preferences/utilities/AutoCompletePrefGroupUI.py index 70fbd118..6334d33c 100644 --- a/appGUI/preferences/utilities/AutoCompletePrefGroupUI.py +++ b/appGUI/preferences/utilities/AutoCompletePrefGroupUI.py @@ -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: diff --git a/appGUI/preferences/utilities/FAExcPrefGroupUI.py b/appGUI/preferences/utilities/FAExcPrefGroupUI.py index 674ca6a3..ba363212 100644 --- a/appGUI/preferences/utilities/FAExcPrefGroupUI.py +++ b/appGUI/preferences/utilities/FAExcPrefGroupUI.py @@ -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: diff --git a/appGUI/preferences/utilities/FAGcoPrefGroupUI.py b/appGUI/preferences/utilities/FAGcoPrefGroupUI.py index eaa99a60..787207c3 100644 --- a/appGUI/preferences/utilities/FAGcoPrefGroupUI.py +++ b/appGUI/preferences/utilities/FAGcoPrefGroupUI.py @@ -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: diff --git a/appGUI/preferences/utilities/FAGrbPrefGroupUI.py b/appGUI/preferences/utilities/FAGrbPrefGroupUI.py index 459bbdae..3f503af1 100644 --- a/appGUI/preferences/utilities/FAGrbPrefGroupUI.py +++ b/appGUI/preferences/utilities/FAGrbPrefGroupUI.py @@ -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: diff --git a/appMain.py b/appMain.py index a0bd1aae..604f456d 100644 --- a/appMain.py +++ b/appMain.py @@ -658,7 +658,7 @@ class App(QtCore.QObject): # ########################################################################################################### if self.options["first_run"] is True: # on first run clear the previous QSettings, therefore clearing the GUI settings - 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. @@ -667,7 +667,7 @@ class App(QtCore.QObject): # ########################################################################################################### # ###################################### Setting the Splash Screen ########################################## # ########################################################################################################### - splash_settings = QSettings("Open Source", "FlatCAM") + splash_settings = QSettings("Open Source", "FlatCAM_EVO") if splash_settings.contains("splash_screen"): show_splash = splash_settings.value("splash_screen") else: @@ -779,7 +779,7 @@ class App(QtCore.QObject): self.FC_light_blue = '#a5a5ffbf' self.FC_dark_blue = '#0000ffbf' - theme_settings = QtCore.QSettings("Open Source", "FlatCAM") + theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO") theme_settings.setValue("appearance", self.options["global_appearance"]) theme_settings.setValue("theme", self.options["global_theme"]) theme_settings.setValue("dark_canvas", self.options["global_dark_canvas"]) @@ -1300,7 +1300,7 @@ class App(QtCore.QObject): # finish the splash self.splash.finish(self.ui) - 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: @@ -2124,7 +2124,7 @@ class App(QtCore.QObject): else: current_layout = self.ui.general_pref_form.general_gui_group.layout_combo.get_value() - lay_settings = QSettings("Open Source", "FlatCAM") + lay_settings = QSettings("Open Source", "FlatCAM_EVO") lay_settings.setValue('layout', current_layout) # This will write the setting to the platform specific storage. @@ -3847,7 +3847,7 @@ class App(QtCore.QObject): if self.cmd_line_headless != 1: # save app state to file - stgs = QSettings("Open Source", "FlatCAM") + stgs = QSettings("Open Source", "FlatCAM_EVO") stgs.setValue('saved_gui_state', self.ui.saveState()) stgs.setValue('maximized_gui', self.ui.isMaximized()) stgs.setValue( diff --git a/appObjects/ObjectCollection.py b/appObjects/ObjectCollection.py index 88216cb4..28066f4f 100644 --- a/appObjects/ObjectCollection.py +++ b/appObjects/ObjectCollection.py @@ -351,7 +351,7 @@ class ObjectCollection(QtCore.QAbstractItemModel): # self.view.setAcceptDrops(True) # self.view.setDropIndicatorShown(True) - settings = QSettings("Open Source", "FlatCAM") + settings = QSettings("Open Source", "FlatCAM_EVO") if settings.contains("notebook_font_size"): fsize = settings.value('notebook_font_size', type=int) else: @@ -504,7 +504,7 @@ class ObjectCollection(QtCore.QAbstractItemModel): return index.internalPointer().data(index.column()) if role == Qt.ItemDataRole.ForegroundRole: - theme_settings = QtCore.QSettings("Open Source", "FlatCAM") + theme_settings = QtCore.QSettings("Open Source", "FlatCAM_EVO") theme = theme_settings.value('theme', type=str) if theme == 'dark': diff --git a/appPlugins/ToolDistance.py b/appPlugins/ToolDistance.py index 56c4f898..58a8c3dd 100644 --- a/appPlugins/ToolDistance.py +++ b/appPlugins/ToolDistance.py @@ -781,7 +781,7 @@ class Distance(AppTool): else: meas_line = LineString([start_pos, end_pos]) - settings = QtCore.QSettings("Open Source", "FlatCAM") + settings = QtCore.QSettings("Open Source", "FlatCAM_EVO") if settings.contains("theme"): theme = settings.value('theme', type=str) else: diff --git a/appPlugins/ToolShell.py b/appPlugins/ToolShell.py index 710c3607..63dbe259 100644 --- a/appPlugins/ToolShell.py +++ b/appPlugins/ToolShell.py @@ -44,7 +44,7 @@ class TermWidget(QWidget): self._browser = _BrowserTextEdit(version=version, app=app) - 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: diff --git a/appTranslation.py b/appTranslation.py index 7024752f..f0805ecb 100644 --- a/appTranslation.py +++ b/appTranslation.py @@ -89,7 +89,7 @@ def on_language_apply_click(app, restart=False): """ name = app.ui.general_pref_form.general_app_group.language_combo.currentText() - theme_settings = QSettings("Open Source", "FlatCAM") + theme_settings = QSettings("Open Source", "FlatCAM_EVO") if theme_settings.contains("theme"): theme = theme_settings.value('theme', type=str) else: @@ -101,7 +101,7 @@ def on_language_apply_click(app, restart=False): resource_loc = 'assets/resources/dark_resources' # do nothing if trying to apply the language that is the current language (already applied). - settings = QSettings("Open Source", "FlatCAM") + settings = QSettings("Open Source", "FlatCAM_EVO") if settings.contains("language"): current_language = settings.value('language', type=str) if current_language == name: @@ -127,7 +127,7 @@ def on_language_apply_click(app, restart=False): if response == bt_no: return else: - settings = QSettings("Open Source", "FlatCAM") + settings = QSettings("Open Source", "FlatCAM_EVO") saved_language = name settings.setValue('language', saved_language) # This will write the setting to the platform specific storage. @@ -140,7 +140,7 @@ def apply_language(domain, lang=None): lang_code = '' if lang is None: - settings = QSettings("Open Source", "FlatCAM") + settings = QSettings("Open Source", "FlatCAM_EVO") if settings.contains("language"): name = settings.value('language') else: @@ -186,7 +186,7 @@ def restart_program(app, ask=None): """ log.debug("FlatCAMTranslation.restart_program()") - theme_settings = QSettings("Open Source", "FlatCAM") + theme_settings = QSettings("Open Source", "FlatCAM_EVO") if theme_settings.contains("theme"): theme = theme_settings.value('theme', type=str) else: diff --git a/FlatCAM.py b/flatcam.py similarity index 99% rename from FlatCAM.py rename to flatcam.py index 61f7498a..037dda62 100644 --- a/FlatCAM.py +++ b/flatcam.py @@ -155,7 +155,7 @@ if __name__ == '__main__': app = QtWidgets.QApplication(sys.argv) # apply style - settings = QSettings("Open Source", "FlatCAM") + settings = QSettings("Open Source", "FlatCAM_EVO") if settings.contains("style"): style_index = settings.value('style', type=str) try: