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

- porting to PyQt6

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-04 18:34:24 +03:00
parent c3d5fccb80
commit 53272da959
136 changed files with 1732 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
appGUI/preferences/OptionUI.py
View File

@@ -1,7 +1,7 @@
from typing import Union, Sequence, List
from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner, FCColorEntry, \
FCSliderWithSpinner, FCDoubleSpinner, FloatEntry, FCTextArea, FCLabel
@@ -294,8 +294,8 @@ class SeparatorOptionUI(OptionUI):
@staticmethod
def build_separator_widget():
separator = QtWidgets.QFrame()
separator.setFrameShape(QtWidgets.QFrame.HLine)
separator.setFrameShadow(QtWidgets.QFrame.Sunken)
separator.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
return separator
def add_to_grid(self, grid: QtWidgets.QGridLayout, row: int) -> int:

2
appGUI/preferences/OptionsGroupUI.py
View File

@@ -7,7 +7,7 @@
from typing import Dict
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
import gettext
import appTranslation as fcTranslate

2
appGUI/preferences/PreferencesSectionUI.py
View File

@@ -1,5 +1,5 @@
from typing import Dict
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.ColumnarFlowLayout import ColumnarFlowLayout
from appGUI.preferences.OptionUI import OptionUI

4
appGUI/preferences/PreferencesUIManager.py
View File

@@ -1,6 +1,6 @@
import os
from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import QSettings
from PyQt6 import QtGui, QtCore, QtWidgets
from PyQt6.QtCore import QSettings
from defaults import FlatCAMDefaults
import logging

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

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCComboBox, FCSpinner, FCColorEntry, FCLabel, FCDoubleSpinner, RadioSet
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

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

@@ -1,5 +1,5 @@
from PyQt5 import QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCTextArea, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

10
appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCSliderWithSpinner, FCColorEntry, \
FCLabel
@@ -121,8 +121,8 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.line_ending_cb, 9, 0, 1, 3)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 12, 0, 1, 2)
# Travel Line Color
@@ -162,8 +162,8 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.cncjob_alpha_entry, 16, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 17, 0, 1, 2)
# CNCJob Object Color

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

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

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

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

2
appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

12
appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets, QtCore
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -65,11 +65,11 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
_("This numbers signify the number of digits in\n"
"the whole part of Excellon coordinates.")
)
hlay1.addWidget(self.format_whole_entry, QtCore.Qt.AlignLeft)
hlay1.addWidget(self.format_whole_entry, QtCore.Qt.AlignmentFlag.AlignLeft)
excellon_separator_label = FCLabel(':')
excellon_separator_label.setFixedWidth(5)
hlay1.addWidget(excellon_separator_label, QtCore.Qt.AlignLeft)
hlay1.addWidget(excellon_separator_label, QtCore.Qt.AlignmentFlag.AlignLeft)
self.format_dec_entry = FCSpinner()
self.format_dec_entry.set_range(0, 9)
@@ -78,7 +78,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
_("This numbers signify the number of digits in\n"
"the decimal part of Excellon coordinates.")
)
hlay1.addWidget(self.format_dec_entry, QtCore.Qt.AlignLeft)
hlay1.addWidget(self.format_dec_entry, QtCore.Qt.AlignmentFlag.AlignLeft)
hlay1.addStretch()
grid0.addWidget(self.digits_label, 2, 0)
@@ -110,7 +110,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
# Excellon Zeros
self.zeros_label = FCLabel('%s:' % _('Zeros'))
self.zeros_label.setAlignment(QtCore.Qt.AlignLeft)
self.zeros_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.zeros_label.setToolTip(
_("This sets the type of Excellon zeros.\n"
"If LZ then Leading Zeros are kept and\n"
@@ -134,7 +134,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
# Slot type
self.slot_type_label = FCLabel('%s:' % _('Slot type'))
self.slot_type_label.setAlignment(QtCore.Qt.AlignLeft)
self.slot_type_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.slot_type_label.setToolTip(
_("This sets how the slots will be exported.\n"
"If ROUTED then the slots will be routed\n"

26
appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
import platform
from PyQt5 import QtWidgets, QtCore
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCSliderWithSpinner, FCColorEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -51,8 +51,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid1.addWidget(self.multicolored_cb, 0, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid1.addWidget(separator_line, 1, 0, 1, 3)
grid2 = QtWidgets.QGridLayout()
@@ -130,7 +130,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
excellon_separator_mm_label = FCLabel(':')
excellon_separator_mm_label.setFixedWidth(5)
hlay2.addWidget(excellon_separator_mm_label, QtCore.Qt.AlignLeft)
hlay2.addWidget(excellon_separator_mm_label, QtCore.Qt.AlignmentFlag.AlignLeft)
self.excellon_format_lower_mm_entry = FCSpinner()
self.excellon_format_lower_mm_entry.set_range(0, 9)
@@ -145,7 +145,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid2.addLayout(hlay2, 2, 1)
self.excellon_zeros_label = FCLabel('%s:' % _('Zeros'))
self.excellon_zeros_label.setAlignment(QtCore.Qt.AlignLeft)
self.excellon_zeros_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.excellon_zeros_label.setToolTip(
_("This sets the type of Excellon zeros.\n"
"If LZ then Leading Zeros are kept and\n"
@@ -163,7 +163,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid2.addWidget(self.excellon_zeros_radio, 3, 1)
self.excellon_units_label = FCLabel('%s:' % _('Units'))
self.excellon_units_label.setAlignment(QtCore.Qt.AlignLeft)
self.excellon_units_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.excellon_units_label.setToolTip(
_("This sets the default units of Excellon files.\n"
"If it is not detected in the parsed file the value here\n"
@@ -196,8 +196,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid2.addWidget(self.excellon_defaults_button, 6, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid2.addWidget(separator_line, 7, 0, 1, 2)
self.excellon_general_label = FCLabel("<b>%s:</b>" % _("Path Optimization"))
@@ -224,7 +224,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid2.addWidget(self.excellon_optimization_radio, 9, 1)
self.optimization_time_label = FCLabel('%s:' % _('Duration'))
self.optimization_time_label.setAlignment(QtCore.Qt.AlignLeft)
self.optimization_time_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.optimization_time_label.setToolTip(
_("When OR-Tools Metaheuristic (MH) is enabled there is a\n"
"maximum threshold for how much time is spent doing the\n"
@@ -240,8 +240,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid2.addWidget(self.optimization_time_entry, 10, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid2.addWidget(separator_line, 11, 0, 1, 2)
# Fuse Tools
@@ -256,8 +256,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
grid2.addWidget(self.fuse_tools_cb, 13, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid2.addWidget(separator_line, 14, 0, 1, 2)
# Excellon Object Color

2
appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/excellon/ExcellonPreferencesUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.excellon.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI
from appGUI.preferences.excellon.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI

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

@@ -1,5 +1,5 @@
from PyQt5 import QtCore, QtWidgets
from PyQt5.QtCore import QSettings
from PyQt6 import QtCore, QtWidgets
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \
FCColorEntry, FCLabel
@@ -77,8 +77,8 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
grid0.addWidget(self.snap_max_dist_entry, 6, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 8, 0, 1, 2)
# Workspace
@@ -174,8 +174,8 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
grid0.addWidget(self.wk_orientation_radio, 16, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 18, 0, 1, 2)
# Font Size
@@ -262,8 +262,8 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
grid0.addWidget(self.hud_font_size_spinner, 28, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 30, 0, 1, 2)
# Axis Color
@@ -277,8 +277,8 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
grid0.addWidget(self.axis_color_entry, 32, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 34, 0, 1, 2)
# -----------------------------------------------------------
@@ -380,8 +380,8 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
grid0.addWidget(self.mselect_radio, 50, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 52, 0, 1, 2)
# Delete confirmation

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

@@ -1,7 +1,7 @@
import sys
from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
FCDoubleSpinner, FCLabel
@@ -84,8 +84,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.ge_radio, 6, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 8, 0, 1, 2)
# Application Level for FlatCAM
@@ -118,8 +118,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.verbose_cb, 16, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 18, 0, 1, 2)
# Languages for FlatCAM
@@ -137,8 +137,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.language_apply_btn, 24, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 26, 0, 1, 2)
# -----------------------------------------------------------
@@ -207,8 +207,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.ois_version_check = OptionalInputSection(self.version_check_cb, [self.send_stats_cb])
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 42, 0, 1, 2)
# Worker Numbers
@@ -245,8 +245,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.tol_entry, 46, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 48, 0, 1, 2)
# Save Settings
@@ -304,8 +304,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
# self.as_ois = OptionalInputSection(self.autosave_cb, [self.autosave_label, self.autosave_entry], True)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 60, 0, 1, 2)
self.pdf_param_label = FCLabel('<B>%s:</b>' % _("Text to PDF parameters"))

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

@@ -1,4 +1,4 @@
from PyQt5 import QtCore
from PyQt6 import QtCore
from appGUI.GUIElements import OptionalInputSection
from appGUI.preferences.OptionUI import *
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI2

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

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtCore
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -59,8 +59,8 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
# grid0.addWidget(self.theme_button, 2, 0, 1, 3)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 3, 0, 1, 2)
# Layout selection
@@ -95,9 +95,9 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.style_combo.addItems(QtWidgets.QStyleFactory.keys())
# find current style
current_style = QtCore.QCoreApplication.instance().style().objectName()
index = self.style_combo.findText(current_style, QtCore.Qt.MatchFixedString)
index = self.style_combo.findText(current_style, QtCore.Qt.MatchFlag.MatchFixedString)
self.style_combo.setCurrentIndex(index)
self.style_combo.activated[str].connect(self.handle_style)
self.style_combo.activated.connect(self.handle_style)
grid0.addWidget(self.style_label, 5, 0)
grid0.addWidget(self.style_combo, 5, 1)
@@ -138,8 +138,8 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.selection_cb, 9, 0, 1, 3)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 14, 0, 1, 2)
# Plot Selection (left - right) Color
@@ -178,8 +178,8 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.left_right_alpha_entry, 18, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 19, 0, 1, 2)
# Plot Selection (left - right) Color
@@ -220,8 +220,8 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.right_left_alpha_entry, 23, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 24, 0, 1, 2)
# ------------------------------------------------------------------
@@ -252,8 +252,8 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.sel_draw_color_entry, 27, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 28, 0, 1, 2)
# ------------------------------------------------------------------
@@ -327,7 +327,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
def handle_style(style):
# set current style
qsettings = QSettings("Open Source", "FlatCAM")
qsettings.setValue('style', style)
qsettings.setValue('style', str(style))
# This will write the setting to the platform specific storage.
del qsettings

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

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

2
appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel, NumericalEvalTupleEntry, \
NumericalEvalEntry, FCComboBox2

2
appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, RadioSet, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets, QtCore
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import FCLabel, FCComboBox
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

14
appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry, FCColorEntry, RadioSet, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -61,8 +61,8 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.circle_steps_entry, 1, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 9, 0, 1, 2)
self.opt_label = FCLabel("<b>%s:</b>" % _("Path Optimization"))
@@ -107,8 +107,8 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.optimization_time_entry, 14, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 16, 0, 1, 2)
# Fuse Tools
@@ -123,8 +123,8 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.fuse_tools_cb, 20, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 22, 0, 1, 2)
# Geometry Object Color

4
appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
View File

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt
from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCSpinner, FCComboBox, \
NumericalEvalTupleEntry, FCLabel

2
appGUI/preferences/geometry/GeometryPreferencesUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.geometry.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI
from appGUI.preferences.geometry.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI

6
appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -49,8 +49,8 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.aperture_table_visibility_cb, 1, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 2, 0, 1, 2)
# Buffering Type

2
appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCLabel, RadioSet, NumericalEvalTupleEntry
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

10
appGUI/preferences/gerber/GerberExpPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets, QtCore
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -67,11 +67,11 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
_("This numbers signify the number of digits in\n"
"the whole part of Gerber coordinates.")
)
hlay1.addWidget(self.format_whole_entry, QtCore.Qt.AlignLeft)
hlay1.addWidget(self.format_whole_entry, QtCore.Qt.AlignmentFlag.AlignLeft)
gerber_separator_label = FCLabel(':')
gerber_separator_label.setFixedWidth(5)
hlay1.addWidget(gerber_separator_label, QtCore.Qt.AlignLeft)
hlay1.addWidget(gerber_separator_label, QtCore.Qt.AlignmentFlag.AlignLeft)
self.format_dec_entry = FCSpinner()
self.format_dec_entry.set_range(0, 9)
@@ -83,7 +83,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
_("This numbers signify the number of digits in\n"
"the decimal part of Gerber coordinates.")
)
hlay1.addWidget(self.format_dec_entry, QtCore.Qt.AlignLeft)
hlay1.addWidget(self.format_dec_entry, QtCore.Qt.AlignmentFlag.AlignLeft)
hlay1.addStretch()
grid0.addWidget(self.digits_label, 2, 0)
@@ -91,7 +91,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
# Gerber Zeros
self.zeros_label = FCLabel('%s:' % _('Zeros'))
self.zeros_label.setAlignment(QtCore.Qt.AlignLeft)
self.zeros_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.zeros_label.setToolTip(
_("This sets the type of Gerber zeros.\n"
"If LZ then Leading Zeros are removed and\n"

12
appGUI/preferences/gerber/GerberGenPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt6 import QtWidgets, QtCore, QtGui
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCButton, FCSliderWithSpinner, FCColorEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -88,7 +88,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
# Gerber Zeros
self.gerber_zeros_label = FCLabel('%s:' % _('Zeros'))
self.gerber_zeros_label.setAlignment(QtCore.Qt.AlignLeft)
self.gerber_zeros_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
self.gerber_zeros_label.setToolTip(
_("This sets the type of Gerber zeros.\n"
"If LZ then Leading Zeros are removed and\n"
@@ -111,8 +111,8 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.gerber_zeros_radio, 5, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 6, 0, 1, 3)
# Apertures Cleaning
@@ -150,8 +150,8 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.clear_colors_button, 11, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 13, 0, 1, 3)
# Gerber Object Color

6
appGUI/preferences/gerber/GerberOptPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -58,8 +58,8 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
grid1.addWidget(self.noncopper_rounded_cb, 1, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid1.addWidget(separator_line, 2, 0, 1, 2)
# ## Bounding box

2
appGUI/preferences/gerber/GerberPreferencesUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.gerber.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI
from appGUI.preferences.gerber.GerberExpPrefGroupUI import GerberExpPrefGroupUI

2
appGUI/preferences/tools/Plugins2PreferencesUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.tools.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI
from appGUI.preferences.tools.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI

2
appGUI/preferences/tools/PluginsEngravingPreferencesUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI
from appGUI.preferences.tools.ToolsLevelPrefGroupUI import ToolsLevelPrefGroupUI

2
appGUI/preferences/tools/PluginsPreferencesUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI
from appGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI

6
appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -116,8 +116,8 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
grid_lay.addWidget(self.bbox_type_radio, 12, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 14, 0, 1, 2)
# Fill Type

6
appGUI/preferences/tools/Tools2CalPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -46,8 +46,8 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
grid_lay.addWidget(self.cal_source_radio, 1, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 2, 0, 1, 2)
# Travel Z entry

10
appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -82,8 +82,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
grid_lay.addWidget(self.other_cb, 7, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 8, 0, 1, 2)
# Method of extraction
@@ -108,8 +108,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
# grid_lay1.addWidget(FCLabel(''))
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 10, 0, 1, 2)
# Annular Ring

6
appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -91,8 +91,8 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
grid_lay.addWidget(self.pos_radio, 4, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 5, 0, 1, 2)
# Fiducial type #

2
appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

10
appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -82,8 +82,8 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
grid_lay.addWidget(self.other_cb, 7, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 8, 0, 1, 2)
# ## Axis
@@ -110,8 +110,8 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
# grid_lay1.addWidget(FCLabel(''))
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 10, 0, 1, 2)
# Annular Ring

2
appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

6
appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -65,8 +65,8 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 2, 0, 1, 2)
grid0.addWidget(self.mirax_label, 3, 0)

4
appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -112,7 +112,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
self.area_label = FCLabel('%s:' % _("Area"))
self.area_label.setToolTip(_('This is the board area.'))
self.area_entry = FCDoubleSpinner()
self.area_entry.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
self.area_entry.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
self.area_entry.set_precision(self.decimals)
self.area_entry.set_range(0.0, 10000.0000)

2
appGUI/preferences/tools/ToolsCornersPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, FCLabel, OptionalInputSection
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

20
appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
View File

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt
from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel
@@ -203,15 +203,15 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
)
self.pp_excellon_name_cb = FCComboBox()
self.pp_excellon_name_cb.setFocusPolicy(Qt.StrongFocus)
self.pp_excellon_name_cb.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
self.pp_excellon_name_cb.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
self.pp_excellon_name_cb.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
grid0.addWidget(pp_excellon_label, 27, 0)
grid0.addWidget(self.pp_excellon_name_cb, 27, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 29, 0, 1, 3)
# DRILL SLOTS LABEL
@@ -248,8 +248,8 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.last_drill_cb, 37, 0, 1, 3)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 39, 0, 1, 3)
self.exc_label = FCLabel('<b>%s:</b>' % _('Advanced Options'))
@@ -369,8 +369,8 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.fretract_cb, 59, 0, 1, 3)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 61, 0, 1, 3)
# -----------------------------

6
appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry, FCLabel, FCSpinner
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -198,8 +198,8 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.film_mirror_axis, 13, 1)
separator_line3 = QtWidgets.QFrame()
separator_line3.setFrameShape(QtWidgets.QFrame.HLine)
separator_line3.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line3.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line3.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line3, 14, 0, 1, 2)
self.file_type_radio = RadioSet([{'label': _('SVG'), 'value': 'svg'},

14
appGUI/preferences/tools/ToolsISOPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
FCLabel
@@ -140,8 +140,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.newdia_entry, 6, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 7, 0, 1, 3)
# Passes
@@ -212,8 +212,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.iso_type_radio, 12, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 13, 0, 1, 3)
# Rest machining CheckBox
@@ -306,8 +306,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.force_iso_cb, 22, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 24, 0, 1, 3)
# ## Plotting type

6
appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -119,8 +119,8 @@ class ToolsLevelPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.feedrate_probe_entry, 18, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 20, 0, 1, 2)
self.al_controller_label = FCLabel('%s:' % _("Controller"))

20
appGUI/preferences/tools/ToolsMillPrefGroupUI.py
View File

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt
from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry
@@ -263,15 +263,15 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
"the Machine Code (like GCode, RML, HPGL) output.")
)
self.pp_geometry_name_cb = FCComboBox()
self.pp_geometry_name_cb.setFocusPolicy(Qt.StrongFocus)
self.pp_geometry_name_cb.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
self.pp_geometry_name_cb.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
self.pp_geometry_name_cb.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
grid0.addWidget(pp_label, 28, 0)
grid0.addWidget(self.pp_geometry_name_cb, 28, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 30, 0, 1, 2)
# Toolchange X,Y
@@ -390,8 +390,8 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.fplunge_cb, 46, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 48, 0, 1, 2)
# -----------------------------
@@ -450,8 +450,8 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.over_z_entry, 60, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 62, 0, 1, 2)
# -----------------------------

18
appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox2, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -122,8 +122,8 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.newdia_entry, 5, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 6, 0, 1, 2)
# Milling Type Radio Button
@@ -167,8 +167,8 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.ncc_order_radio, 8, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 9, 0, 1, 2)
# Overlap Entry
@@ -271,8 +271,8 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.ncc_offset_spinner, 15, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 16, 0, 1, 2)
# Rest machining CheckBox
@@ -322,8 +322,8 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.area_shape_radio, 19, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 20, 0, 1, 2)
# ## Plotting type

18
appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, NumericalEvalTupleEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -126,8 +126,8 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.newdia_entry, 5, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 6, 0, 1, 2)
self.paint_order_label = FCLabel('%s:' % _('Tool order'))
@@ -146,8 +146,8 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.paint_order_radio, 7, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 8, 0, 1, 2)
# Overlap
@@ -228,8 +228,8 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.contour_cb, 12, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 13, 0, 1, 2)
self.rest_cb = FCCheckBox('%s' % _("Rest"))
@@ -286,8 +286,8 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
grid0.addWidget(self.area_shape_radio, 18, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 19, 0, 1, 2)
# ## Plotting type

2
appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

2
appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets, QtGui
from PyQt6 import QtWidgets, QtGui
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

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

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCButton, FCTextArea, FCEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

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

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import VerticalScrollArea, FCButton, FCTextArea, FCEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -29,7 +29,7 @@ class FAExcPrefGroupUI(OptionsGroupUI):
scroll = VerticalScrollArea()
scroll.setWidget(scroll_widget)
scroll.setWidgetResizable(True)
scroll.setFrameShape(QtWidgets.QFrame.NoFrame)
scroll.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
self.restore_btn = FCButton(_("Restore"))
self.restore_btn.setToolTip(_("Restore the extension list to the default state."))

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

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCButton, FCTextArea, FCEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

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

@@ -1,5 +1,5 @@
from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCButton, FCTextArea, FCEntry, FCLabel
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI

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

@@ -1,4 +1,4 @@
from PyQt5 import QtWidgets
from PyQt6 import QtWidgets
from appGUI.preferences.utilities.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI
from appGUI.preferences.utilities.FAGrbPrefGroupUI import FAGrbPrefGroupUI