- in Preferences, more Plugins preferences UI is upgraded to the new look

- In Paint Plugin fixed the Area select mode to work with Geometry object created by the Geometry Editor
- in Paint Plugin some changes in the way the source object is autoloaded
- in Paint, NCC and Cutout Plugins when using a mode that require to be terminated (by mouse RMB or ESC key) the notebook UI element is disabled until this is done

appGUI/preferences/general/GeneralAPPSetGroupUI.py

@@ -37,7 +37,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         # Grid Settings Frame
         # #############################################################################################################
         # GRID Settings
-        self.grid_label = FCLabel('<span style="color:brown;"><b>%s</b></span>' % _('Grid Settings'))
+        self.grid_label = FCLabel('<span style="color:magenta;"><b>%s</b></span>' % _('Grid Settings'))
         self.layout.addWidget(self.grid_label)
 
         grids_frame = FCFrame()
@@ -90,7 +90,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         # Workspace Frame
         # #############################################################################################################
         # Workspace
-        self.workspace_label = FCLabel('<span style="color:darkorchid;"><b>%s</b></span>' % _('Workspace Settings'))
+        self.workspace_label = FCLabel('<span style="color:brown;"><b>%s</b></span>' % _('Workspace Settings'))
         self.layout.addWidget(self.workspace_label)
 
         wk_frame = FCFrame()
@@ -191,7 +191,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         # Font Frame
         # #############################################################################################################
         # Font Size
-        self.font_size_label = FCLabel('<span style="color:teal;"><b>%s</b></span>' % _('Font Size'))
+        self.font_size_label = FCLabel('<span style="color:green;"><b>%s</b></span>' % _('Font Size'))
         self.layout.addWidget(self.font_size_label)
 
         fnt_frame = FCFrame()
@@ -283,7 +283,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         # Axis Frame
         # #############################################################################################################
         # Axis Size
-        self.axis_label = FCLabel('<span style="color:DarkOrchid;"><b>%s</b></span>' % _('Axis'))
+        self.axis_label = FCLabel('<span style="color:brown;"><b>%s</b></span>' % _('Axis'))
         self.layout.addWidget(self.axis_label)
 
         ax_frame = FCFrame()
@@ -305,7 +305,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         # #############################################################################################################
         # Mouse Frame
         # #############################################################################################################
-        self.mouse_lbl = FCLabel('<span style="color:LightSeaGreen;"><b>%s</b></span>' % _('Mouse Settings'))
+        self.mouse_lbl = FCLabel('<span style="color:darkorange;"><b>%s</b></span>' % _('Mouse Settings'))
         self.layout.addWidget(self.mouse_lbl)
 
         m_frame = FCFrame()
@@ -408,7 +408,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         # #############################################################################################################
         # Parameters Frame
         # #############################################################################################################
-        self.par_label = FCLabel('<b><font color="blue">%s:</font></b>' % _('Parameters'))
+        self.par_label = FCLabel('<b><font color="blue">%s</font></b>' % _('Parameters'))
         self.layout.addWidget(self.par_label)
 
         par_frame = FCFrame()
@@ -477,6 +477,10 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         par_grid.addWidget(self.activity_label, 10, 0)
         par_grid.addWidget(self.activity_combo, 10, 1)
 
+        FCGridLayout.set_common_column_size(
+            [grids_grid, m_grid, par_grid, wk_grid, fnt_grid, ax_grid], 0
+        )
+
         self.layout.addStretch()
 
         self.mouse_cursor_color_cb.stateChanged.connect(self.on_mouse_cursor_color_enable)

appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py

@@ -259,7 +259,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         # #############################################################################################################
         # Robber Bar Parameters Frame
         # #############################################################################################################
-        self.robber_bar_label = FCLabel('<b>%s</b>' % _('Robber Bar Parameters'))
+        self.robber_bar_label = FCLabel('<span style="color:brown;"><b>%s</b></span>' % _('Robber Bar Parameters'))
         self.robber_bar_label.setToolTip(
             _("Parameters used for the robber bar.\n"
               "Robber bar = copper border to help in pattern hole plating.")
@@ -302,7 +302,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         # #############################################################################################################
         # RPattern Plating Mask Parameters Frame
         # #############################################################################################################
-        self.patern_mask_label = FCLabel('<b>%s</b>' % _('Pattern Plating Mask'))
+        self.patern_mask_label = FCLabel('<span style="color:purple;"><b>%s</b></span>' % _('Pattern Plating Mask'))
         self.patern_mask_label.setToolTip(
             _("Generate a mask for pattern plating.")
         )
@@ -346,4 +346,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
         grid_ppm.addWidget(self.ppm_choice_label, 4, 0)
         grid_ppm.addWidget(self.ppm_choice_combo, 4, 1)
 
+        FCGridLayout.set_common_column_size(
+            [grid_par, grid_ppm, grid_line, grid_dots, grid_robber, grid_square], 0)
+
         self.layout.addStretch()

appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py

@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout
+from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -21,24 +21,23 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.decimals = decimals
         self.defaults = defaults
 
-        # ## Grid Layout
-        grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
-        self.layout.addLayout(grid_lay)
-
-        self.param_label = FCLabel('<b>%s:</b>' % _('Parameters'))
-        self.param_label.setToolTip(
-            _("Parameters used for this tool.")
-        )
-        grid_lay.addWidget(self.param_label, 0, 0, 1, 2)
-
-        self.padt_label = FCLabel("%s:" % _("Processed Pads Type"))
+        # #############################################################################################################
+        # PARAMETERS Frame
+        # #############################################################################################################
+        self.padt_label = FCLabel('<span style="color:blue;"><b>%s</b></span>' % _("Processed Pads Type"))
         self.padt_label.setToolTip(
             _("The type of pads shape to be processed.\n"
               "If the PCB has many SMD pads with rectangular pads,\n"
               "disable the Rectangular aperture.")
         )
 
-        grid_lay.addWidget(self.padt_label, 2, 0, 1, 2)
+        self.layout.addWidget(self.padt_label)
+
+        param_frame = FCFrame()
+        self.layout.addWidget(param_frame)
+
+        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_frame.setLayout(param_grid)
 
         # Circular Aperture Selection
         self.circular_cb = FCCheckBox('%s' % _("Circular"))
@@ -46,7 +45,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             _("Process Circular Pads.")
         )
 
-        grid_lay.addWidget(self.circular_cb, 3, 0, 1, 2)
+        param_grid.addWidget(self.circular_cb, 3, 0, 1, 2)
 
         # Oblong Aperture Selection
         self.oblong_cb = FCCheckBox('%s' % _("Oblong"))
@@ -54,7 +53,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             _("Process Oblong Pads.")
         )
 
-        grid_lay.addWidget(self.oblong_cb, 4, 0, 1, 2)
+        param_grid.addWidget(self.oblong_cb, 4, 0, 1, 2)
 
         # Square Aperture Selection
         self.square_cb = FCCheckBox('%s' % _("Square"))
@@ -62,7 +61,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             _("Process Square Pads.")
         )
 
-        grid_lay.addWidget(self.square_cb, 5, 0, 1, 2)
+        param_grid.addWidget(self.square_cb, 5, 0, 1, 2)
 
         # Rectangular Aperture Selection
         self.rectangular_cb = FCCheckBox('%s' % _("Rectangular"))
@@ -70,7 +69,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             _("Process Rectangular Pads.")
         )
 
-        grid_lay.addWidget(self.rectangular_cb, 6, 0, 1, 2)
+        param_grid.addWidget(self.rectangular_cb, 6, 0, 1, 2)
 
         # Others type of Apertures Selection
         self.other_cb = FCCheckBox('%s' % _("Others"))
@@ -78,14 +77,22 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             _("Process pads not in the categories above.")
         )
 
-        grid_lay.addWidget(self.other_cb, 7, 0, 1, 2)
+        param_grid.addWidget(self.other_cb, 7, 0, 1, 2)
 
-        separator_line = QtWidgets.QFrame()
-        separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
-        grid_lay.addWidget(separator_line, 8, 0, 1, 2)
+        # separator_line = QtWidgets.QFrame()
+        # separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        # separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        # param_grid.addWidget(separator_line, 8, 0, 1, 2)
+
+        # #############################################################################################################
+        # Method Frame
+        # #############################################################################################################
+        met_frame = FCFrame()
+        self.layout.addWidget(met_frame)
+
+        met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        met_frame.setLayout(met_grid)
 
-        # Method of extraction
         self.method_radio = RadioSet(
             [
                 {'label': _("Fixed Diameter"), 'value': 'fixed'},
@@ -94,26 +101,32 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             ],
             orientation='vertical',
             compact=True)
-        self.method_label = FCLabel('<b>%s:</b>' % _("Method"))
+        self.method_label = FCLabel('<span style="color:green;"><b>%s:</b></span>' % _("Method"))
         self.method_label.setToolTip(
             _("The method for processing pads. Can be:\n"
               "- Fixed Diameter -> all holes will have a set size\n"
               "- Fixed Annular Ring -> all holes will have a set annular ring\n"
               "- Proportional -> each hole size will be a fraction of the pad size"))
 
-        grid_lay.addWidget(self.method_label, 9, 0)
-        grid_lay.addWidget(self.method_radio, 9, 1)
+        met_grid.addWidget(self.method_label, 0, 0)
+        met_grid.addWidget(self.method_radio, 0, 1)
 
-        # grid_lay1.addWidget(FCLabel(''))
+        # separator_line = QtWidgets.QFrame()
+        # separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        # separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        # param_grid.addWidget(separator_line, 10, 0, 1, 2)
 
-        separator_line = QtWidgets.QFrame()
-        separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
-        grid_lay.addWidget(separator_line, 10, 0, 1, 2)
+        # #############################################################################################################
+        # Fixed Diameter Frame
+        # #############################################################################################################
+        self.fixed_label = FCLabel('<span style="color:teal;"><b>%s</b></span>' % _("Fixed Diameter"))
+        self.layout.addWidget(self.fixed_label)
 
-        # Annular Ring
-        self.fixed_label = FCLabel('<b>%s</b>' % _("Fixed Diameter"))
-        grid_lay.addWidget(self.fixed_label, 11, 0, 1, 2)
+        fix_frame = FCFrame()
+        self.layout.addWidget(fix_frame)
+
+        fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fix_frame.setLayout(fix_grid)
 
         # Diameter value
         self.dia_entry = FCDoubleSpinner()
@@ -125,17 +138,25 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
             _("Fixed hole diameter.")
         )
 
-        grid_lay.addWidget(self.dia_label, 12, 0)
-        grid_lay.addWidget(self.dia_entry, 12, 1)
+        fix_grid.addWidget(self.dia_label, 0, 0)
+        fix_grid.addWidget(self.dia_entry, 0, 1)
 
-        # Annular Ring value
-        self.ring_label = FCLabel('<b>%s</b>' % _("Fixed Annular Ring"))
+        # #############################################################################################################
+        # Annular ring Frame
+        # #############################################################################################################
+        self.ring_label = FCLabel('<span style="color:darkorange;"><b>%s</b></span>' % _("Fixed Annular Ring"))
         self.ring_label.setToolTip(
             _("The size of annular ring.\n"
               "The copper sliver between the hole exterior\n"
               "and the margin of the copper pad.")
         )
-        grid_lay.addWidget(self.ring_label, 13, 0, 1, 2)
+        self.layout.addWidget(self.ring_label)
+
+        ring_frame = FCFrame()
+        self.layout.addWidget(ring_frame)
+
+        ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ring_frame.setLayout(ring_grid)
 
         # Circular Annular Ring Value
         self.circular_ring_label = FCLabel('%s:' % _("Circular"))
@@ -147,8 +168,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.circular_ring_entry.set_precision(self.decimals)
         self.circular_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.circular_ring_label, 14, 0)
-        grid_lay.addWidget(self.circular_ring_entry, 14, 1)
+        ring_grid.addWidget(self.circular_ring_label, 0, 0)
+        ring_grid.addWidget(self.circular_ring_entry, 0, 1)
 
         # Oblong Annular Ring Value
         self.oblong_ring_label = FCLabel('%s:' % _("Oblong"))
@@ -160,8 +181,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.oblong_ring_entry.set_precision(self.decimals)
         self.oblong_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.oblong_ring_label, 15, 0)
-        grid_lay.addWidget(self.oblong_ring_entry, 15, 1)
+        ring_grid.addWidget(self.oblong_ring_label, 2, 0)
+        ring_grid.addWidget(self.oblong_ring_entry, 2, 1)
 
         # Square Annular Ring Value
         self.square_ring_label = FCLabel('%s:' % _("Square"))
@@ -173,8 +194,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.square_ring_entry.set_precision(self.decimals)
         self.square_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.square_ring_label, 16, 0)
-        grid_lay.addWidget(self.square_ring_entry, 16, 1)
+        ring_grid.addWidget(self.square_ring_label, 4, 0)
+        ring_grid.addWidget(self.square_ring_entry, 4, 1)
 
         # Rectangular Annular Ring Value
         self.rectangular_ring_label = FCLabel('%s:' % _("Rectangular"))
@@ -186,8 +207,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.rectangular_ring_entry.set_precision(self.decimals)
         self.rectangular_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.rectangular_ring_label, 17, 0)
-        grid_lay.addWidget(self.rectangular_ring_entry, 17, 1)
+        ring_grid.addWidget(self.rectangular_ring_label, 6, 0)
+        ring_grid.addWidget(self.rectangular_ring_entry, 6, 1)
 
         # Others Annular Ring Value
         self.other_ring_label = FCLabel('%s:' % _("Others"))
@@ -199,11 +220,20 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.other_ring_entry.set_precision(self.decimals)
         self.other_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.other_ring_label, 18, 0)
-        grid_lay.addWidget(self.other_ring_entry, 18, 1)
+        ring_grid.addWidget(self.other_ring_label, 8, 0)
+        ring_grid.addWidget(self.other_ring_entry, 8, 1)
 
-        self.prop_label = FCLabel('<b>%s</b>' % _("Proportional Diameter"))
-        grid_lay.addWidget(self.prop_label, 19, 0, 1, 2)
+        # #############################################################################################################
+        # Proportional Diameter Frame
+        # #############################################################################################################
+        self.prop_label = FCLabel('<span style="color:indigo;"><b>%s</b></span>' % _("Proportional Diameter"))
+        self.layout.addWidget(self.prop_label)
+
+        prop_frame = FCFrame()
+        self.layout.addWidget(prop_frame)
+
+        prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        prop_frame.setLayout(prop_grid)
 
         # Factor value
         self.factor_entry = FCDoubleSpinner(suffix='%')
@@ -217,14 +247,22 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
               "The hole diameter will be a fraction of the pad size.")
         )
 
-        grid_lay.addWidget(self.factor_label, 20, 0)
-        grid_lay.addWidget(self.factor_entry, 20, 1)
+        prop_grid.addWidget(self.factor_label, 0, 0)
+        prop_grid.addWidget(self.factor_entry, 0, 1)
 
-        # EXTRACT SOLDERMASK
-        self.extract_sm_label = FCLabel('<b>%s</b>' % _("Extract Soldermask"))
+        # #############################################################################################################
+        # Extract Soldermask Frame
+        # #############################################################################################################
+        self.extract_sm_label = FCLabel('<span style="color:magenta;"><b>%s</b></span>' % _("Extract Soldermask"))
         self.extract_sm_label.setToolTip(
             _("Extract soldermask from a given Gerber file."))
-        grid_lay.addWidget(self.extract_sm_label, 22, 0, 1, 2)
+        self.layout.addWidget(self.extract_sm_label)
+
+        solder_frame = FCFrame()
+        self.layout.addWidget(solder_frame)
+
+        solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        solder_frame.setLayout(solder_grid)
 
         # CLEARANCE soldermask extraction
         self.clearance_label = FCLabel('%s:' % _("Clearance"))
@@ -237,14 +275,22 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.clearance_entry.set_precision(self.decimals)
         self.clearance_entry.setSingleStep(0.1)
 
-        grid_lay.addWidget(self.clearance_label, 24, 0)
-        grid_lay.addWidget(self.clearance_entry, 24, 1)
+        solder_grid.addWidget(self.clearance_label, 0, 0)
+        solder_grid.addWidget(self.clearance_entry, 0, 1)
 
-        # EXTRACT CUTOUT
-        self.extract_cut_label = FCLabel('<b>%s</b>' % _("Extract Cutout"))
+        # #############################################################################################################
+        # Extract CutOut Frame
+        # #############################################################################################################
+        self.extract_cut_label = FCLabel('<span style="color:brown;"><b>%s</b></span>' % _("Extract Cutout"))
         self.extract_cut_label.setToolTip(
             _("Extract a cutout from a given Gerber file."))
-        grid_lay.addWidget(self.extract_cut_label, 26, 0, 1, 2)
+        self.layout.addWidget(self.extract_cut_label)
+
+        ecut_frame = FCFrame()
+        self.layout.addWidget(ecut_frame)
+
+        ecut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ecut_frame.setLayout(ecut_grid)
 
         # Margin Cutout
         self.margin_cut_label = FCLabel('%s:' % _("Margin"))
@@ -258,8 +304,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.margin_cut_entry.set_precision(self.decimals)
         self.margin_cut_entry.setSingleStep(0.1)
 
-        grid_lay.addWidget(self.margin_cut_label, 28, 0)
-        grid_lay.addWidget(self.margin_cut_entry, 28, 1)
+        ecut_grid.addWidget(self.margin_cut_label, 0, 0)
+        ecut_grid.addWidget(self.margin_cut_entry, 0, 1)
 
         # Thickness Cutout
         self.thick_cut_label = FCLabel('%s:' % _("Thickness"))
@@ -271,7 +317,10 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
         self.thick_cut_entry.set_precision(self.decimals)
         self.thick_cut_entry.setSingleStep(0.1)
 
-        grid_lay.addWidget(self.thick_cut_label, 30, 0)
-        grid_lay.addWidget(self.thick_cut_entry, 30, 1)
-        
+        ecut_grid.addWidget(self.thick_cut_label, 2, 0)
+        ecut_grid.addWidget(self.thick_cut_entry, 2, 1)
+
+        FCGridLayout.set_common_column_size(
+            [param_grid, ring_grid, fix_grid, prop_grid, met_grid, solder_grid, ecut_grid], 0)
+
         self.layout.addStretch()

appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py

@@ -141,4 +141,6 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
         grid_sel.addWidget(self.mode_label, 0, 0)
         grid_sel.addWidget(self.mode_radio, 0, 1)
 
+        FCGridLayout.set_common_column_size([grid_par, grid_sel], 0)
+
         self.layout.addStretch(1)

appGUI/preferences/tools/Tools2InvertPrefGroupUI.py

@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout
+from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -21,17 +21,21 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
         self.decimals = decimals
         self.defaults = defaults
 
-        # ## Subtractor Tool Parameters
-        self.sublabel = FCLabel("<b>%s:</b>" % _("Parameters"))
+        # #############################################################################################################
+        # PARAMETERS Frame
+        # #############################################################################################################
+        self.sublabel = FCLabel('<span style="color:blue;"><b>%s</b></span>' % _("Parameters"))
         self.sublabel.setToolTip(
             _("A tool to invert Gerber geometry from positive to negative\n"
               "and in revers.")
         )
         self.layout.addWidget(self.sublabel)
 
-        # Grid Layout
-        grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
-        self.layout.addLayout(grid0)
+        param_frame = FCFrame()
+        self.layout.addWidget(param_frame)
+
+        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_frame.setLayout(param_grid)
 
         # Margin
         self.margin_label = FCLabel('%s:' % _('Margin'))
@@ -44,10 +48,13 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
         self.margin_entry.set_range(0.0000, 10000.0000)
         self.margin_entry.setObjectName(_("Margin"))
 
-        grid0.addWidget(self.margin_label, 2, 0, 1, 2)
-        grid0.addWidget(self.margin_entry, 3, 0, 1, 2)
+        param_grid.addWidget(self.margin_label, 0, 0)
+        param_grid.addWidget(self.margin_entry, 0, 1)
 
-        self.join_label = FCLabel('%s:' % _("Lines Join Style"))
+        # #############################################################################################################
+        # Line Join Frame
+        # #############################################################################################################
+        self.join_label = FCLabel('<span style="color:tomato;"><b>%s</b></span>' % _("Lines Join Style"))
         self.join_label.setToolTip(
             _("The way that the lines in the object outline will be joined.\n"
               "Can be:\n"
@@ -55,13 +62,25 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
               "- square -> the lines meet in 90 degrees angle\n"
               "- bevel -> the lines are joined by a third line")
         )
+        self.layout.addWidget(self.join_label)
+
+        join_frame = FCFrame()
+        self.layout.addWidget(join_frame)
+
+        join_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        join_frame.setLayout(join_grid)
+
+        line_join_lbl = FCLabel('%s:' % _("Value"))
+
         self.join_radio = RadioSet([
             {'label': _('Rounded'), 'value': 'r'},
             {'label': _('Square'), 'value': 's'},
             {'label': _('Bevel'), 'value': 'b'}
-        ], orientation='vertical', compact=True)
+        ], orientation='vertical')
 
-        grid0.addWidget(self.join_label, 5, 0, 1, 2)
-        grid0.addWidget(self.join_radio, 7, 0, 1, 2)
+        join_grid.addWidget(line_join_lbl, 0, 0)
+        join_grid.addWidget(self.join_radio, 0, 1)
+
+        FCGridLayout.set_common_column_size([param_grid, join_grid], 0)
 
         self.layout.addStretch()

appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py

@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout
+from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -21,24 +21,23 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         self.decimals = decimals
         self.defaults = defaults
 
-        # ## Grid Layout
-        grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
-        self.layout.addLayout(grid_lay)
-
-        self.param_label = FCLabel('<b>%s:</b>' % _('Parameters'))
-        self.param_label.setToolTip(
-            _("Parameters used for this tool.")
-        )
-        grid_lay.addWidget(self.param_label, 0, 0, 1, 2)
-
-        self.padt_label = FCLabel("<b>%s:</b>" % _("Processed Pads Type"))
+        # #############################################################################################################
+        # Processed Pads Frame
+        # #############################################################################################################
+        self.padt_label = FCLabel('<span style="color:blue;"><b>%s</b></span>' % _("Processed Pads Type"))
         self.padt_label.setToolTip(
             _("The type of pads shape to be processed.\n"
               "If the PCB has many SMD pads with rectangular pads,\n"
               "disable the Rectangular aperture.")
         )
 
-        grid_lay.addWidget(self.padt_label, 2, 0, 1, 2)
+        self.layout.addWidget(self.padt_label)
+
+        param_frame = FCFrame()
+        self.layout.addWidget(param_frame)
+
+        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        param_frame.setLayout(param_grid)
 
         # Circular Aperture Selection
         self.circular_cb = FCCheckBox('%s' % _("Circular"))
@@ -46,7 +45,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             _("Process Circular Pads.")
         )
 
-        grid_lay.addWidget(self.circular_cb, 3, 0, 1, 2)
+        param_grid.addWidget(self.circular_cb, 3, 0, 1, 2)
 
         # Oblong Aperture Selection
         self.oblong_cb = FCCheckBox('%s' % _("Oblong"))
@@ -54,7 +53,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             _("Process Oblong Pads.")
         )
 
-        grid_lay.addWidget(self.oblong_cb, 4, 0, 1, 2)
+        param_grid.addWidget(self.oblong_cb, 4, 0, 1, 2)
 
         # Square Aperture Selection
         self.square_cb = FCCheckBox('%s' % _("Square"))
@@ -62,7 +61,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             _("Process Square Pads.")
         )
 
-        grid_lay.addWidget(self.square_cb, 5, 0, 1, 2)
+        param_grid.addWidget(self.square_cb, 5, 0, 1, 2)
 
         # Rectangular Aperture Selection
         self.rectangular_cb = FCCheckBox('%s' % _("Rectangular"))
@@ -70,7 +69,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             _("Process Rectangular Pads.")
         )
 
-        grid_lay.addWidget(self.rectangular_cb, 6, 0, 1, 2)
+        param_grid.addWidget(self.rectangular_cb, 6, 0, 1, 2)
 
         # Others type of Apertures Selection
         self.other_cb = FCCheckBox('%s' % _("Others"))
@@ -78,14 +77,22 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             _("Process pads not in the categories above.")
         )
 
-        grid_lay.addWidget(self.other_cb, 7, 0, 1, 2)
+        param_grid.addWidget(self.other_cb, 7, 0, 1, 2)
 
-        separator_line = QtWidgets.QFrame()
-        separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
-        grid_lay.addWidget(separator_line, 8, 0, 1, 2)
+        # separator_line = QtWidgets.QFrame()
+        # separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        # separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        # param_grid.addWidget(separator_line, 8, 0, 1, 2)
+
+        # #############################################################################################################
+        # Method Frame
+        # #############################################################################################################
+        met_frame = FCFrame()
+        self.layout.addWidget(met_frame)
+
+        met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        met_frame.setLayout(met_grid)
 
-        # ## Axis
         self.hole_size_radio = RadioSet(
             [
                 {'label': _("Excellon"), 'value': 'exc'},
@@ -95,7 +102,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             ],
             orientation='vertical',
             compact=True)
-        self.hole_size_label = FCLabel('<b>%s:</b>' % _("Method"))
+        self.hole_size_label = FCLabel('<span style="color:green;"><b>%s:</b></span>' % _("Method"))
         self.hole_size_label.setToolTip(
             _("The punch hole source can be:\n"
               "- Excellon Object-> the Excellon object drills center will serve as reference.\n"
@@ -103,19 +110,20 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
               "- Fixed Annular Ring -> will try to keep a set annular ring.\n"
               "- Proportional -> will make a Gerber punch hole having the diameter a percentage of the pad diameter.")
         )
-        grid_lay.addWidget(self.hole_size_label, 9, 0)
-        grid_lay.addWidget(self.hole_size_radio, 9, 1)
+        met_grid.addWidget(self.hole_size_label, 9, 0)
+        met_grid.addWidget(self.hole_size_radio, 9, 1)
 
-        # grid_lay1.addWidget(FCLabel(''))
+        # #############################################################################################################
+        # Fixed Diameter Frame
+        # #############################################################################################################
+        self.fixed_label = FCLabel('<span style="color:teal;"><b>%s</b></span>' % _("Fixed Diameter"))
+        self.layout.addWidget(self.fixed_label)
 
-        separator_line = QtWidgets.QFrame()
-        separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
-        grid_lay.addWidget(separator_line, 10, 0, 1, 2)
+        fix_frame = FCFrame()
+        self.layout.addWidget(fix_frame)
 
-        # Annular Ring
-        self.fixed_label = FCLabel('<b>%s</b>' % _("Fixed Diameter"))
-        grid_lay.addWidget(self.fixed_label, 11, 0, 1, 2)
+        fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        fix_frame.setLayout(fix_grid)
 
         # Diameter value
         self.dia_entry = FCDoubleSpinner()
@@ -127,17 +135,25 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
             _("Fixed hole diameter.")
         )
 
-        grid_lay.addWidget(self.dia_label, 12, 0)
-        grid_lay.addWidget(self.dia_entry, 12, 1)
+        fix_grid.addWidget(self.dia_label, 0, 0)
+        fix_grid.addWidget(self.dia_entry, 0, 1)
 
-        # Annular Ring value
-        self.ring_label = FCLabel('<b>%s</b>' % _("Fixed Annular Ring"))
+        # #############################################################################################################
+        # Annular ring Frame
+        # #############################################################################################################
+        self.ring_label = FCLabel('<span style="color:darkorange;"><b>%s</b></span>' % _("Fixed Annular Ring"))
         self.ring_label.setToolTip(
             _("The size of annular ring.\n"
               "The copper sliver between the hole exterior\n"
               "and the margin of the copper pad.")
         )
-        grid_lay.addWidget(self.ring_label, 13, 0, 1, 2)
+        self.layout.addWidget(self.ring_label)
+
+        ring_frame = FCFrame()
+        self.layout.addWidget(ring_frame)
+
+        ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        ring_frame.setLayout(ring_grid)
 
         # Circular Annular Ring Value
         self.circular_ring_label = FCLabel('%s:' % _("Circular"))
@@ -149,8 +165,8 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         self.circular_ring_entry.set_precision(self.decimals)
         self.circular_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.circular_ring_label, 14, 0)
-        grid_lay.addWidget(self.circular_ring_entry, 14, 1)
+        ring_grid.addWidget(self.circular_ring_label, 0, 0)
+        ring_grid.addWidget(self.circular_ring_entry, 0, 1)
 
         # Oblong Annular Ring Value
         self.oblong_ring_label = FCLabel('%s:' % _("Oblong"))
@@ -162,8 +178,8 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         self.oblong_ring_entry.set_precision(self.decimals)
         self.oblong_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.oblong_ring_label, 15, 0)
-        grid_lay.addWidget(self.oblong_ring_entry, 15, 1)
+        ring_grid.addWidget(self.oblong_ring_label, 2, 0)
+        ring_grid.addWidget(self.oblong_ring_entry, 2, 1)
 
         # Square Annular Ring Value
         self.square_ring_label = FCLabel('%s:' % _("Square"))
@@ -175,8 +191,8 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         self.square_ring_entry.set_precision(self.decimals)
         self.square_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.square_ring_label, 16, 0)
-        grid_lay.addWidget(self.square_ring_entry, 16, 1)
+        ring_grid.addWidget(self.square_ring_label, 4, 0)
+        ring_grid.addWidget(self.square_ring_entry, 4, 1)
 
         # Rectangular Annular Ring Value
         self.rectangular_ring_label = FCLabel('%s:' % _("Rectangular"))
@@ -188,8 +204,8 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         self.rectangular_ring_entry.set_precision(self.decimals)
         self.rectangular_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.rectangular_ring_label, 17, 0)
-        grid_lay.addWidget(self.rectangular_ring_entry, 17, 1)
+        ring_grid.addWidget(self.rectangular_ring_label, 6, 0)
+        ring_grid.addWidget(self.rectangular_ring_entry, 6, 1)
 
         # Others Annular Ring Value
         self.other_ring_label = FCLabel('%s:' % _("Others"))
@@ -201,11 +217,20 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
         self.other_ring_entry.set_precision(self.decimals)
         self.other_ring_entry.set_range(0.0000, 10000.0000)
 
-        grid_lay.addWidget(self.other_ring_label, 18, 0)
-        grid_lay.addWidget(self.other_ring_entry, 18, 1)
+        ring_grid.addWidget(self.other_ring_label, 8, 0)
+        ring_grid.addWidget(self.other_ring_entry, 8, 1)
 
-        self.prop_label = FCLabel('<b>%s</b>' % _("Proportional Diameter"))
-        grid_lay.addWidget(self.prop_label, 19, 0, 1, 2)
+        # #############################################################################################################
+        # Proportional Diameter Frame
+        # #############################################################################################################
+        self.prop_label = FCLabel('<span style="color:indigo;"><b>%s</b></span>' % _("Proportional Diameter"))
+        self.layout.addWidget(self.prop_label)
+
+        prop_frame = FCFrame()
+        self.layout.addWidget(prop_frame)
+
+        prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        prop_frame.setLayout(prop_grid)
 
         # Factor value
         self.factor_entry = FCDoubleSpinner(suffix='%')
@@ -219,7 +244,10 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
               "The hole diameter will be a fraction of the pad size.")
         )
 
-        grid_lay.addWidget(self.factor_label, 20, 0)
-        grid_lay.addWidget(self.factor_entry, 20, 1)
+        prop_grid.addWidget(self.factor_label, 0, 0)
+        prop_grid.addWidget(self.factor_entry, 0, 1)
+
+        FCGridLayout.set_common_column_size(
+            [param_grid, ring_grid, prop_grid, met_grid, fix_grid], 0)
 
         self.layout.addStretch()

appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py

@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets
 
-from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, FCGridLayout
+from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, FCGridLayout, FCFrame
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 
 import gettext
@@ -21,17 +21,22 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.decimals = decimals
         self.defaults = defaults
 
-        # ## Parameters
-        self.qrlabel = FCLabel("<b>%s:</b>" % _("Parameters"))
+        # #############################################################################################################
+        # Parameters Frame
+        # #############################################################################################################
+        self.qrlabel = FCLabel('<span style="color:blue;"><b>%s</b></span>' % _("Parameters"))
         self.qrlabel.setToolTip(
             _("A tool to create a QRCode that can be inserted\n"
               "into a selected Gerber file, or it can be exported as a file.")
         )
         self.layout.addWidget(self.qrlabel)
 
+        par_frame = FCFrame()
+        self.layout.addWidget(par_frame)
+
         # ## Grid Layout
-        grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
-        self.layout.addLayout(grid_lay)
+        param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
+        par_frame.setLayout(param_grid)
 
         # VERSION #
         self.version_label = FCLabel('%s:' % _("Version"))
@@ -43,8 +48,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.version_entry.set_range(1, 40)
         self.version_entry.setWrapping(True)
 
-        grid_lay.addWidget(self.version_label, 1, 0)
-        grid_lay.addWidget(self.version_entry, 1, 1)
+        param_grid.addWidget(self.version_label, 0, 0)
+        param_grid.addWidget(self.version_entry, 0, 1)
 
         # ERROR CORRECTION #
         self.error_label = FCLabel('%s:' % _("Error correction"))
@@ -66,8 +71,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
               "Q = maximum 25%% errors can be corrected\n"
               "H = maximum 30%% errors can be corrected.")
         )
-        grid_lay.addWidget(self.error_label, 2, 0)
-        grid_lay.addWidget(self.error_radio, 2, 1)
+        param_grid.addWidget(self.error_label, 2, 0)
+        param_grid.addWidget(self.error_radio, 2, 1)
 
         # BOX SIZE #
         self.bsize_label = FCLabel('%s:' % _("Box Size"))
@@ -79,8 +84,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.bsize_entry.set_range(1, 9999)
         self.bsize_entry.setWrapping(True)
 
-        grid_lay.addWidget(self.bsize_label, 3, 0)
-        grid_lay.addWidget(self.bsize_entry, 3, 1)
+        param_grid.addWidget(self.bsize_label, 4, 0)
+        param_grid.addWidget(self.bsize_entry, 4, 1)
 
         # BORDER SIZE #
         self.border_size_label = FCLabel('%s:' % _("Border Size"))
@@ -92,8 +97,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.border_size_entry.set_range(1, 9999)
         self.border_size_entry.setWrapping(True)
 
-        grid_lay.addWidget(self.border_size_label, 4, 0)
-        grid_lay.addWidget(self.border_size_entry, 4, 1)
+        param_grid.addWidget(self.border_size_label, 6, 0)
+        param_grid.addWidget(self.border_size_entry, 6, 1)
 
         # Text box
         self.text_label = FCLabel('%s:' % _("QRCode Data"))
@@ -104,8 +109,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.text_data.setPlaceholderText(
             _("Add here the text to be included in the QRCode...")
         )
-        grid_lay.addWidget(self.text_label, 5, 0)
-        grid_lay.addWidget(self.text_data, 6, 0, 1, 2)
+        param_grid.addWidget(self.text_label, 8, 0)
+        param_grid.addWidget(self.text_data, 10, 0, 1, 2)
 
         # POLARITY CHOICE #
         self.pol_label = FCLabel('%s:' % _("Polarity"))
@@ -122,8 +127,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
               "be added as positive. If it is added to a Copper Gerber\n"
               "file then perhaps the QRCode can be added as negative.")
         )
-        grid_lay.addWidget(self.pol_label, 7, 0)
-        grid_lay.addWidget(self.pol_radio, 7, 1)
+        param_grid.addWidget(self.pol_label, 12, 0)
+        param_grid.addWidget(self.pol_radio, 12, 1)
 
         # BOUNDING BOX TYPE #
         self.bb_label = FCLabel('%s:' % _("Bounding Box"))
@@ -137,8 +142,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
             _("The bounding box, meaning the empty space that surrounds\n"
               "the QRCode geometry, can have a rounded or a square shape.")
         )
-        grid_lay.addWidget(self.bb_label, 8, 0)
-        grid_lay.addWidget(self.bb_radio, 8, 1)
+        param_grid.addWidget(self.bb_label, 14, 0)
+        param_grid.addWidget(self.bb_radio, 14, 1)
 
         # FILL COLOR #
         self.fill_color_label = FCLabel('%s:' % _('Fill Color'))
@@ -147,8 +152,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         )
         self.fill_color_entry = FCColorEntry()
 
-        grid_lay.addWidget(self.fill_color_label, 9, 0)
-        grid_lay.addWidget(self.fill_color_entry, 9, 1)
+        param_grid.addWidget(self.fill_color_label, 16, 0)
+        param_grid.addWidget(self.fill_color_entry, 16, 1)
 
         # BACK COLOR #
         self.back_color_label = FCLabel('%s:' % _('Back Color'))
@@ -157,8 +162,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         )
         self.back_color_entry = FCColorEntry()
 
-        grid_lay.addWidget(self.back_color_label, 10, 0)
-        grid_lay.addWidget(self.back_color_entry, 10, 1)
+        param_grid.addWidget(self.back_color_label, 18, 0)
+        param_grid.addWidget(self.back_color_entry, 18, 1)
 
         # Selection Limit
         self.sel_limit_label = FCLabel('%s:' % _("Selection limit"))
@@ -172,8 +177,8 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
         self.sel_limit_entry = FCSpinner()
         self.sel_limit_entry.set_range(0, 9999)
 
-        grid_lay.addWidget(self.sel_limit_label, 11, 0)
-        grid_lay.addWidget(self.sel_limit_entry, 11, 1)
+        param_grid.addWidget(self.sel_limit_label, 20, 0)
+        param_grid.addWidget(self.sel_limit_entry, 20, 1)
         # self.layout.addStretch()
 
         # QRCode Tool