- 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

@@ -2,6 +2,7 @@ from PyQt6 import QtGui
from appGUI.GUIElements import FCSpinner, FCColorEntry, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
import builtins

View File

@@ -1,3 +1,4 @@
from PyQt6 import QtGui
from PyQt6.QtCore import QSettings
@@ -31,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:

View File

@@ -1,3 +1,4 @@
from PyQt6 import QtGui
from appGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCSliderWithSpinner, FCColorEntry, \

View File

@@ -1,3 +1,4 @@
from PyQt6 import QtGui
from PyQt6.QtCore import QSettings
@@ -32,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:

View File

@@ -1,7 +1,9 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
import builtins

View File

@@ -1,3 +1,4 @@
from PyQt6 import QtWidgets
from appGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI