- overwritten the Beta_8.995 branch with the Gerber_Editor_Upgrade branch

This commit is contained in:
Marius Stanciu
2023-05-24 18:07:05 +03:00
parent c23d0c4ed6
commit 63071a9bae
214 changed files with 22249 additions and 6251 deletions

View File

@@ -1,3 +1,4 @@
from PyQt6 import QtCore, QtGui
from PyQt6.QtCore import QSettings
@@ -22,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:
@@ -212,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:
@@ -231,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:
@@ -251,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:
@@ -270,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:
@@ -492,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: