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

- created a new custom layout based on the Grid Layout where I can set the horizontal and vertical spacings between grid items and used it throughout the app

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-07 11:46:45 +03:00
committed by Marius
parent 3c06280d3d
commit 461aa763ad
88 changed files with 325 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
appGUI/GUIElements.py
View File

@@ -2200,7 +2200,8 @@ class FCComboBox(QtWidgets.QComboBox):
self._obj_type = None
if policy is True:
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.Preferred)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored,
QtWidgets.QSizePolicy.Policy.Preferred)
self.setSizePolicy(sizePolicy)
# the callback() will be called on customcontextmenu event and will be be passed 2 parameters:
@@ -3204,7 +3205,8 @@ class FCDetachableTab(QtWidgets.QTabWidget):
"""
# Determine if the current movement is detected as a drag
if not self.dragStartPos.isNull() and (
(event.position().toPoint() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()):
((event.position().toPoint() - self.dragStartPos).manhattanLength()) <
QtWidgets.QApplication.startDragDistance()):
self.dragInitiated = True
# If the current movement is a drag initiated by the left button
@@ -4244,7 +4246,8 @@ class _ExpandableTextEdit(FCTextEdit):
if line_count <= 1:
self.historyPrev.emit()
return
elif event.matches(QKeySequence.StandardKey.MoveToNextPage) or event.matches(QKeySequence.StandardKey.MoveToPreviousPage):
elif event.matches(QKeySequence.StandardKey.MoveToNextPage) or \
event.matches(QKeySequence.StandardKey.MoveToPreviousPage):
return self._termWidget.browser().keyPressEvent(event)
elif event.key() == QtCore.Qt.Key.Key_Escape:
self.on_escape_key()
@@ -4727,7 +4730,7 @@ class FCJog(QtWidgets.QFrame):
self.setLineWidth(1)
# JOG axes
grbl_jog_grid = QtWidgets.QGridLayout()
grbl_jog_grid = FCGridLayout(v_spacing=3)
grbl_jog_grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
grbl_jog_grid.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetMinimumSize)
grbl_jog_grid.setContentsMargins(2, 4, 2, 4)
@@ -4806,7 +4809,7 @@ class FCZeroAxes(QtWidgets.QFrame):
self.setLineWidth(1)
# Zero the axes
grbl_zero_grid = QtWidgets.QGridLayout()
grbl_zero_grid = FCGridLayout(v_spacing=3)
grbl_zero_grid.setContentsMargins(2, 4, 2, 4)
grbl_zero_grid.setColumnStretch(0, 0)
grbl_zero_grid.setColumnStretch(1, 0)
@@ -4844,7 +4847,8 @@ class FCZeroAxes(QtWidgets.QFrame):
# Zeroo all axes
self.grbl_zero_all_button = QtWidgets.QToolButton()
self.grbl_zero_all_button.setText(_("All"))
self.grbl_zero_all_button.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
self.grbl_zero_all_button.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum,
QtWidgets.QSizePolicy.Policy.Expanding)
self.grbl_zero_all_button.setToolTip(
_("Zero all CNC axes at current position.")
@@ -4883,11 +4887,11 @@ class RotatedToolButton(QtWidgets.QToolButton):
size = options.rect.size()
size.transpose()
options.rect.setSize(size)
options.features = QtWidgets.QStyleOptionButton.None_
options.features = QtWidgets.QStyleOptionButton.ButtonFeature.None_
# if self.isFlat():
# options.features |= QtWidgets.QStyleOptionButton.Flat
if self.menu():
options.features |= QtWidgets.QStyleOptionButton.HasMenu
options.features |= QtWidgets.QStyleOptionButton.ButtonFeature.HasMenu
# if self.autoDefault() or self.isDefault():
# options.features |= QtWidgets.QStyleOptionButton.AutoDefaultButton
# if self.isDefault():
@@ -4936,15 +4940,15 @@ class RotatedButton(QtWidgets.QPushButton):
size = options.rect.size()
size.transpose()
options.rect.setSize(size)
options.features = QtWidgets.QStyleOptionButton.None_
options.features = QtWidgets.QStyleOptionButton.ButtonFeature.None_
if self.isFlat():
options.features |= QtWidgets.QStyleOptionButton.Flat
options.features |= QtWidgets.QStyleOptionButton.ButtonFeature.Flat
if self.menu():
options.features |= QtWidgets.QStyleOptionButton.HasMenu
options.features |= QtWidgets.QStyleOptionButton.ButtonFeature.HasMenu
if self.autoDefault() or self.isDefault():
options.features |= QtWidgets.QStyleOptionButton.AutoDefaultButton
options.features |= QtWidgets.QStyleOptionButton.ButtonFeature.AutoDefaultButton
if self.isDefault():
options.features |= QtWidgets.QStyleOptionButton.DefaultButton
options.features |= QtWidgets.QStyleOptionButton.ButtonFeature.DefaultButton
if self.isDown() or (self.menu() and self.menu().isVisible()):
options.state |= QtWidgets.QStyle.State_Sunken
if self.isChecked():
@@ -5113,7 +5117,7 @@ class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):
menu = QtWidgets.QMenu(parent)
menu_runscript = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/script14.png'),
'%s' % _('Run Script ...'), self)
'%s' % _('Run Script ...'), self)
menu_runscript.setToolTip(
_("Will run the opened Tcl Script thus\n"
"enabling the automation of certain\n"
@@ -5128,23 +5132,23 @@ class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):
# Open Project ...
menu_openproject = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/folder16.png'),
'%s ...' % _('Open Project'), self)
'%s ...' % _('Open Project'), self)
self.menu_open.addAction(menu_openproject)
self.menu_open.addSeparator()
# Open Gerber ...
menu_opengerber = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/flatcam_icon24.png'),
'%s ...\t%s' % (_('Open Gerber'), _('Ctrl+G')), self)
'%s ...\t%s' % (_('Open Gerber'), _('Ctrl+G')), self)
self.menu_open.addAction(menu_opengerber)
# Open Excellon ...
menu_openexcellon = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'),
'%s ...\t%s' % (_('Open Excellon'), _('Ctrl+E')), self)
'%s ...\t%s' % (_('Open Excellon'), _('Ctrl+E')), self)
self.menu_open.addAction(menu_openexcellon)
# Open G-Code ...
menu_opengcode = QtGui.QAction(QtGui.QIcon(self.app.resource_location + '/code.png'),
'%s ...' % _('Open G-Code'), self)
'%s ...' % _('Open G-Code'), self)
self.menu_open.addAction(menu_opengcode)
self.menu_open.addSeparator()
@@ -5164,6 +5168,28 @@ class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):
exitAction.triggered.connect(self.app.final_save)
class FCGridLayout(QtWidgets.QGridLayout):
"""
This class create the Sys Tray icon for the app
"""
def __init__(self, v_spacing=None, h_spacing=None, margins=None, *args, parent=None):
"""
Class that makes a custom grid layout
:param parent:
"""
super().__init__(*args, parent=parent)
if h_spacing is not None:
self.setHorizontalSpacing(h_spacing)
if v_spacing is not None:
self.setVerticalSpacing(v_spacing)
if margins is not None:
self.setContentsMargins(margins[0], margins[1], margins[2], margins[3])
def message_dialog(title, message, kind="info", parent=None):
"""
Builds and show a custom QMessageBox to be used in FlatCAM.

24
appGUI/ObjectUI.py
View File

@@ -86,7 +86,7 @@ class ObjectUI(QtWidgets.QWidget):
# ## Common to all objects ##
# ###########################
if common is True:
self.common_grid = QtWidgets.QGridLayout()
self.common_grid = FCGridLayout(v_spacing=3)
self.common_grid.setColumnStretch(0, 1)
self.common_grid.setColumnStretch(1, 0)
layout.addLayout(self.common_grid)
@@ -178,7 +178,7 @@ class GerberObjectUI(ObjectUI):
ObjectUI.__init__(self, title=_('Gerber Object'), parent=parent, app=self.app)
# Plot options
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
self.custom_box.addLayout(grid0)
grid0.setColumnStretch(0, 0)
@@ -425,7 +425,7 @@ class GerberObjectUI(ObjectUI):
self.util_frame.setLayout(self.util_box)
self.util_frame.hide()
util_grid = QtWidgets.QGridLayout()
util_grid = FCGridLayout(v_spacing=3)
util_grid.setColumnStretch(0, 0)
util_grid.setColumnStretch(1, 1)
self.util_box.addLayout(util_grid)
@@ -540,7 +540,7 @@ class ExcellonObjectUI(ObjectUI):
parent=parent,
app=self.app)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
@@ -706,7 +706,7 @@ class ExcellonObjectUI(ObjectUI):
# ########## TOOLS GRID ###########################################
# #################################################################
grid2 = QtWidgets.QGridLayout()
grid2 = FCGridLayout(v_spacing=3)
grid2.setColumnStretch(0, 0)
grid2.setColumnStretch(1, 1)
grid0.addLayout(grid2, 12, 0, 1, 3)
@@ -773,7 +773,7 @@ class ExcellonObjectUI(ObjectUI):
self.util_frame.setLayout(self.util_box)
self.util_frame.hide()
util_grid = QtWidgets.QGridLayout()
util_grid = FCGridLayout(v_spacing=3)
util_grid.setColumnStretch(0, 0)
util_grid.setColumnStretch(1, 1)
self.util_box.addLayout(util_grid)
@@ -868,7 +868,7 @@ class GeometryObjectUI(ObjectUI):
)
# Plot options
grid_header = QtWidgets.QGridLayout()
grid_header = FCGridLayout(v_spacing=3)
grid_header.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter)
self.custom_box.addLayout(grid_header)
grid_header.setColumnStretch(0, 0)
@@ -958,7 +958,7 @@ class GeometryObjectUI(ObjectUI):
self.geo_table_box.setContentsMargins(0, 0, 0, 0)
self.geo_table_frame.setLayout(self.geo_table_box)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.geo_table_box.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
@@ -1029,7 +1029,7 @@ class GeometryObjectUI(ObjectUI):
_("Plot column. It is visible only for MultiGeo Geometry objects.\n"
"Enable plot for the selected tool geometry."))
self.grid4 = QtWidgets.QGridLayout()
self.grid4 = FCGridLayout(v_spacing=3)
self.grid4.setColumnStretch(0, 0)
self.grid4.setColumnStretch(1, 1)
self.geo_tools_box.addLayout(self.grid4)
@@ -1109,7 +1109,7 @@ class GeometryObjectUI(ObjectUI):
self.util_frame.setLayout(self.util_box)
self.util_frame.hide()
util_grid = QtWidgets.QGridLayout()
util_grid = FCGridLayout(v_spacing=3)
util_grid.setColumnStretch(0, 0)
util_grid.setColumnStretch(1, 1)
self.util_box.addLayout(util_grid)
@@ -1209,7 +1209,7 @@ class CNCObjectUI(ObjectUI):
for i in range(0, self.common_grid.count()):
self.common_grid.itemAt(i).widget().hide()
f_lay = QtWidgets.QGridLayout()
f_lay = FCGridLayout(v_spacing=3)
f_lay.setColumnStretch(0, 0)
f_lay.setColumnStretch(1, 1)
self.custom_box.addLayout(f_lay)
@@ -1599,7 +1599,7 @@ class DocumentObjectUI(ObjectUI):
# ############ Grid LAYOUT #####################################
# ##############################################################
self.grid0 = QtWidgets.QGridLayout()
self.grid0 = FCGridLayout(v_spacing=3)
self.grid0.setColumnStretch(0, 0)
self.grid0.setColumnStretch(1, 1)
self.grid0.setColumnStretch(2, 0)

2
appGUI/preferences/OptionUI.py
View File

@@ -4,7 +4,7 @@ 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
FCSliderWithSpinner, FCDoubleSpinner, FloatEntry, FCTextArea, FCLabel, FCGridLayout
import gettext
import appTranslation as fcTranslate

3
appGUI/preferences/OptionsGroupUI.py
View File

@@ -14,6 +14,7 @@ import appTranslation as fcTranslate
import builtins
from appGUI.preferences.OptionUI import OptionUI
from appGUI.GUIElements import FCGridLayout
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
@@ -47,7 +48,7 @@ class OptionsGroupUI2(OptionsGroupUI):
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.grid = QtWidgets.QGridLayout()
self.grid = FCGridLayout(v_spacing=3)
self.layout.addLayout(self.grid)
self.grid.setColumnStretch(0, 0)
self.grid.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCComboBox, FCSpinner, FCColorEntry, FCLabel, FCDoubleSpinner, RadioSet
from appGUI.GUIElements import FCComboBox, FCSpinner, FCColorEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -19,7 +19,7 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI):
self.setTitle(str(_("CNC Job Adv. Options")))
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCSliderWithSpinner, FCColorEntry, \
FCLabel
FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -24,7 +24,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
self.plot_options_label = FCLabel("<b>%s:</b>" % _("Plot Options"))
self.layout.addWidget(self.plot_options_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel
from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -37,7 +37,7 @@ class CNCJobOptPrefGroupUI(OptionsGroupUI):
font = QtGui.QFont()
font.setPointSize(tb_fsize)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCLabel
from appGUI.GUIElements import FCCheckBox, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -32,7 +32,7 @@ class ExcellonAdvOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.exc_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -26,7 +26,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.param_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Selection Limit

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -27,7 +27,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.export_options_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -2,7 +2,7 @@ import platform
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCSliderWithSpinner, FCColorEntry, FCLabel
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCSliderWithSpinner, FCColorEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -26,7 +26,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
self.plot_options_label = FCLabel("<b>%s:</b>" % _("Plot Options"))
self.layout.addWidget(self.plot_options_label)
grid1 = QtWidgets.QGridLayout()
grid1 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid1)
# Plot CB
@@ -55,7 +55,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid1.addWidget(separator_line, 1, 0, 1, 3)
grid2 = QtWidgets.QGridLayout()
grid2 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid2)
grid2.setColumnStretch(0, 0)
grid2.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -28,7 +28,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.cncjob_label)
grid2 = QtWidgets.QGridLayout()
grid2 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid2)
grid2.setColumnStretch(0, 0)
grid2.setColumnStretch(1, 1)

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

@@ -2,7 +2,7 @@ from PyQt6 import QtCore, QtWidgets
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \
FCColorEntry, FCLabel
FCColorEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.resource_loc = 'assets/resources'
# Create a grid layout for the Application general settings
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -4,7 +4,7 @@ from PyQt6 import QtWidgets
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
FCDoubleSpinner, FCLabel
FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -24,7 +24,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# Create a form layout for the Application general settings
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -1,7 +1,8 @@
from PyQt6 import QtWidgets, QtCore
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry, FCLabel
from appGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry, FCLabel, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,7 +22,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# Create a grid layout for the Application general settings
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel, NumericalEvalTupleEntry, \
NumericalEvalEntry, FCComboBox2
NumericalEvalEntry, FCComboBox2, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -32,7 +32,7 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.geo_label)
grid1 = QtWidgets.QGridLayout()
grid1 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid1)
# Size of trace segment on X axis

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, RadioSet, FCLabel
from appGUI.GUIElements import FCSpinner, RadioSet, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -27,7 +27,7 @@ class GeometryEditorPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.param_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Selection Limit

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import FCLabel, FCComboBox
from appGUI.GUIElements import FCLabel, FCComboBox, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -27,7 +27,7 @@ class GeometryExpPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.export_options_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry, FCColorEntry, RadioSet, FCLabel
from appGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry, FCColorEntry, RadioSet, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import platform
@@ -43,7 +43,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
)
plot_hlay.addWidget(self.multicolored_cb)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCSpinner, FCComboBox, \
NumericalEvalTupleEntry, FCLabel
NumericalEvalTupleEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.cncjob_label)
grid1 = QtWidgets.QGridLayout()
grid1 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid1)
grid1.setColumnStretch(0, 0)
grid1.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -29,7 +29,7 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.adv_param_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Follow Attribute

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

@@ -1,6 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCLabel, RadioSet, NumericalEvalTupleEntry
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCLabel, RadioSet, NumericalEvalTupleEntry, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -27,7 +28,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.param_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Selection Limit

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.export_options_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,7 @@
from PyQt6 import QtWidgets, QtCore, QtGui
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCButton, FCSliderWithSpinner, FCColorEntry, FCLabel
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCButton, FCSliderWithSpinner, FCColorEntry, FCLabel, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -24,7 +25,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.plot_options_label = FCLabel("<b>%s:</b>" % _("Plot Options"))
self.layout.addWidget(self.plot_options_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Plot CB

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -32,7 +32,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.clearcopper_label)
grid1 = QtWidgets.QGridLayout()
grid1 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid1)
# Margin
@@ -66,7 +66,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
self.boundingbox_label = FCLabel('<b>%s:</b>' % _('Bounding Box'))
self.layout.addWidget(self.boundingbox_label)
grid2 = QtWidgets.QGridLayout()
grid2 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid2)
bbmargin = FCLabel('%s:' % _('Boundary Margin'))

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,7 +21,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# ## Grid Layout
grid_lay = QtWidgets.QGridLayout()
grid_lay = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid_lay)
grid_lay.setColumnStretch(0, 0)
grid_lay.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,7 +21,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# ## Grid Layout
grid_lay = QtWidgets.QGridLayout()
grid_lay = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid_lay)
grid_lay.setColumnStretch(0, 0)
grid_lay.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,7 +21,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# ## Grid Layout
grid_lay = QtWidgets.QGridLayout()
grid_lay = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid_lay)
grid_lay.setColumnStretch(0, 0)
grid_lay.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,7 +21,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# ## Grid Layout
grid_lay = QtWidgets.QGridLayout()
grid_lay = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid_lay)
grid_lay.setColumnStretch(0, 0)
grid_lay.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -29,7 +29,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.sublabel)
# Grid Layout
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCLabel
from appGUI.GUIElements import FCSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class Tools2OptimalPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.optlabel)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,7 +21,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
# ## Grid Layout
grid_lay = QtWidgets.QGridLayout()
grid_lay = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid_lay)
grid_lay.setColumnStretch(0, 0)
grid_lay.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -29,7 +29,7 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.qrlabel)
# ## Grid Layout
grid_lay = QtWidgets.QGridLayout()
grid_lay = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid_lay)
grid_lay.setColumnStretch(0, 0)
grid_lay.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.crlabel)
# Form Layout
self.grid0 = QtWidgets.QGridLayout()
self.grid0 = FCGridLayout(v_spacing=3)
self.grid0.setColumnStretch(0, 0)
self.grid0.setColumnStretch(1, 1)
self.layout.addLayout(self.grid0)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.dblsided_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# ## Drill diameter for alignment holes

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -29,7 +29,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.vshape_tool_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -20,7 +20,7 @@ class ToolsCornersPrefGroupUI(OptionsGroupUI):
self.setTitle(str(_("Corner Markers Options")))
self.decimals = decimals
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, FCLabel, OptionalInputSection
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, FCLabel, OptionalInputSection, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -29,7 +30,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.board_cutout_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
tdclabel = FCLabel('%s:' % _('Tool Diameter'))

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

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel
OptionalInputSection, NumericalEvalEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.drill_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Tool order Radio Button

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

@@ -1,6 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry, FCLabel, FCSpinner
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry, FCLabel, FCSpinner, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +29,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.film_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
self.film_type_radio = RadioSet([{'label': 'Pos', 'value': 'pos'},

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
FCLabel
FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.iso_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Tool Dias

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class ToolsLevelPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.levelling_label)
# Grid Layout
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.mill_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Tooldia

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

@@ -1,6 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox2, FCLabel
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox2, FCLabel, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +29,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.clearcopper_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
ncctdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))

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

@@ -1,6 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, NumericalEvalTupleEntry, FCLabel
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -30,7 +31,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.paint_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)
self.layout.addLayout(grid0)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -29,7 +29,7 @@ class ToolsPanelizePrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.panelize_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.solderpastelabel)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
# Nozzle Tool Diameters

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtGui
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox, FCLabel
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox, FCLabel, FCGridLayout
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
)
self.layout.addWidget(self.transform_label)
grid0 = QtWidgets.QGridLayout()
grid0 = FCGridLayout(v_spacing=3)
self.layout.addLayout(grid0)
grid0.setColumnStretch(0, 0)
grid0.setColumnStretch(1, 1)