- 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

2021-08-07 11:46:45 +03:00
parent 3c06280d3d
commit 461aa763ad
88 changed files with 325 additions and 281 deletions
--- a/appGUI/preferences/OptionUI.py
+++ b/appGUI/preferences/OptionUI.py
@@ -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
--- a/appGUI/preferences/OptionsGroupUI.py
+++ b/appGUI/preferences/OptionsGroupUI.py
@@ -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)
--- a/appGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
+++ b/appGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/general/GeneralAPPSetGroupUI.py
+++ b/appGUI/preferences/general/GeneralAPPSetGroupUI.py
@@ -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)
--- a/appGUI/preferences/general/GeneralAppPrefGroupUI.py
+++ b/appGUI/preferences/general/GeneralAppPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/general/GeneralGUIPrefGroupUI.py
+++ b/appGUI/preferences/general/GeneralGUIPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryExpPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
+++ b/appGUI/preferences/geometry/GeometryOptPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/gerber/GerberExpPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberExpPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/gerber/GerberGenPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberGenPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/gerber/GerberOptPrefGroupUI.py
+++ b/appGUI/preferences/gerber/GerberOptPrefGroupUI.py
@@ -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'))
--- a/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/ToolsCornersPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCornersPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
@@ -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'))
--- a/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
@@ -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'},
--- a/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
@@ -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
--- a/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
@@ -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'))
--- a/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
@@ -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)
--- a/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
@@ -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
--- a/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
@@ -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)