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

- overwritten the Beta_8.995 branch with the Gerber_Editor_Upgrade branch

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
appGUI/preferences/general/GeneralAPPSetGroupUI.py
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:

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

@@ -1,3 +1,4 @@
import sys
from PyQt6.QtCore import QSettings
@@ -29,9 +30,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
# Grid0 Frame
# #############################################################################################################
self.unitslabel = FCLabel('%s' % _("Units"), color='red', bold=True)
self.unitslabel.setToolTip(_("The default value for the application units.\n"
"Whatever is selected here is set every time\n"
"the application is started."))
self.unitslabel.setToolTip(_("The application dimensional units is millimeter."))
self.layout.addWidget(self.unitslabel)
grid0_frame = FCFrame()
@@ -40,19 +39,10 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0 = GLay(v_spacing=5, h_spacing=3)
grid0_frame.setLayout(grid0)
# Units for FlatCAM
self.units_radio = RadioSetDefaults(
choices=[{'label': _('mm'), 'value': 'MM'}, {'label': _('inch'), 'value': 'IN'}],
compact=True
)
grid0.addWidget(self.units_radio, 0, 0, 1, 2)
# Precision Metric
self.precision_metric_label = FCLabel('%s:' % _('Precision MM'))
self.precision_metric_label = FCLabel('%s:' % _('Dim. Precision'))
self.precision_metric_label.setToolTip(
_("The number of decimals used throughout the application\n"
"when the set units are in METRIC system.\n"
_("The number of decimals used throughout the application.\n"
"Any change here require an application restart.")
)
self.precision_metric_entry = FCSpinner()
@@ -62,20 +52,6 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.precision_metric_label, 2, 0)
grid0.addWidget(self.precision_metric_entry, 2, 1)
# Precision Inch
self.precision_inch_label = FCLabel('%s:' % _('Precision Inch'))
self.precision_inch_label.setToolTip(
_("The number of decimals used throughout the application\n"
"when the set units are in INCH system.\n"
"Any change here require an application restart.")
)
self.precision_inch_entry = FCSpinner()
self.precision_inch_entry.set_range(2, 16)
self.precision_inch_entry.setWrapping(True)
grid0.addWidget(self.precision_inch_label, 4, 0)
grid0.addWidget(self.precision_inch_entry, 4, 1)
self.par_label = FCLabel('%s' % _("Parameters"), color='blue', bold=True)
self.layout.addWidget(self.par_label)
@@ -102,6 +78,12 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid1.addWidget(self.ge_label, 0, 0)
grid1.addWidget(self.ge_radio, 0, 1)
self.ge_comp_cb = FCCheckBox(_("3D Compatibility"))
self.ge_comp_cb.setToolTip(_("Check this if you have problems in 3D mode. Works only for 3D mode.\n"
"It will disable performance mods but perhaps add more compatibility."))
grid1.addWidget(self.ge_comp_cb, 1, 0, 1, 2)
# separator_line = QtWidgets.QFrame()
# separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
# separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
@@ -113,16 +95,29 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
_("The number of Qthreads made available to the App.\n"
"A bigger number may finish the jobs more quickly but\n"
"depending on your computer speed, may make the App\n"
"unresponsive. Can have a value between 2 and 16.\n"
"unresponsive. Can have a value between 2 and 32.\n"
"Default value is 2.\n"
"After change, it will be applied at next App start.")
)
self.worker_number_sb = FCSpinner()
self.worker_number_sb.set_range(2, 16)
self.worker_number_sb.set_range(2, 32)
grid1.addWidget(self.worker_number_label, 2, 0)
grid1.addWidget(self.worker_number_sb, 2, 1)
# Process Numbers
self.process_number_label = FCLabel('%s:' % _('Process number'))
self.process_number_label.setToolTip(
_("The number of processes.\n"
"A larger number may improve performance but it will require more memory.\n"
"After change, it will be applied at next App start.")
)
self.process_number_sb = FCSpinner()
self.process_number_sb.set_range(2, 32)
grid1.addWidget(self.process_number_label, 4, 0)
grid1.addWidget(self.process_number_sb, 4, 1)
# Geometric tolerance
tol_label = FCLabel('%s:' % _("Geo Tolerance"))
tol_label.setToolTip(_(
@@ -137,8 +132,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.tol_entry.setSingleStep(0.001)
self.tol_entry.set_precision(6)
grid1.addWidget(tol_label, 4, 0)
grid1.addWidget(self.tol_entry, 4, 1)
grid1.addWidget(tol_label, 6, 0)
grid1.addWidget(self.tol_entry, 6, 1)
# Portability
self.portability_cb = FCCheckBox('%s' % _('Portable app'))
@@ -147,7 +142,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
"which means that the preferences files will be saved\n"
"in the application folder, in the lib\\config subfolder."))
grid1.addWidget(self.portability_cb, 6, 0, 1, 2)
grid1.addWidget(self.portability_cb, 8, 0, 1, 2)
# Verbose Log
self.verbose_label = FCLabel('%s:' % _('Verbose log'))
@@ -160,8 +155,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.verbose_combo = FCComboBox2()
self.verbose_combo.addItems(['0','1', '2'])
grid1.addWidget(self.verbose_label, 8, 0)
grid1.addWidget(self.verbose_combo, 8, 1)
grid1.addWidget(self.verbose_label, 10, 0)
grid1.addWidget(self.verbose_combo, 10, 1)
# #############################################################################################################
# Grid0 Frame
@@ -231,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:
@@ -444,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.

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

@@ -1,11 +1,16 @@
from PyQt6 import QtCore
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import OptionalInputSection
from appGUI.preferences.OptionUI import *
from appGUI.preferences.OptionUI import OptionUI, HeadingOptionUI, SeparatorOptionUI, DoubleSpinnerOptionUI, \
SpinnerOptionUI, CheckboxOptionUI, ComboboxOptionUI, RadioSetOptionUI, ColorOptionUI
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI2
import gettext
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
@@ -70,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"):
@@ -288,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:

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

@@ -1,3 +1,4 @@
from PyQt6 import QtWidgets, QtCore, QtGui
from PyQt6.QtCore import QSettings
@@ -95,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())
@@ -393,9 +394,12 @@ 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)]
QtWidgets.QApplication.setStyle(new_style)
# This will write the setting to the platform specific storage.
del qsettings

1
appGUI/preferences/general/GeneralPreferencesUI.py
View File

@@ -1,3 +1,4 @@
from PyQt6 import QtWidgets
from appGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI