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

- some reformatting and class rename

Browse Source 
- when clicking the coordinates toolbars in the status bar now the Distance Plugin is shown and if already displayed, it is closed (toggle action)
This commit is contained in:
Marius Stanciu
2022-04-03 15:06:36 +03:00
committed by Marius
parent 1b9e2feb75
commit a59f996819
90 changed files with 569 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

4
appGUI/preferences/OptionsGroupUI.py
View File

@@ -14,7 +14,7 @@ import appTranslation as fcTranslate
import builtins
from appGUI.preferences.OptionUI import OptionUI
from appGUI.GUIElements import FCGridLayout
from appGUI.GUIElements import GLay
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
@@ -48,7 +48,7 @@ class OptionsGroupUI2(OptionsGroupUI):
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.grid = GLay(v_spacing=5, h_spacing=3)
self.layout.addLayout(self.grid)
self.options = self.build_options()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtGui
from appGUI.GUIElements import FCSpinner, FCColorEntry, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, FCColorEntry, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Annotation Font Size

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

@@ -1,7 +1,7 @@
from PyQt6 import QtGui
from appGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCSliderWithSpinner, FCColorEntry, \
FCLabel, FCGridLayout, FCFrame
FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -30,7 +30,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
plot_frame = FCFrame()
self.layout.addWidget(plot_frame)
plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
plot_grid = GLay(v_spacing=5, h_spacing=3)
plot_frame.setLayout(plot_grid)
# Plot CB
@@ -76,7 +76,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
dec_frame = FCFrame()
self.layout.addWidget(dec_frame)
dec_grid = FCGridLayout(v_spacing=5, h_spacing=3)
dec_grid = GLay(v_spacing=5, h_spacing=3)
dec_frame.setLayout(dec_grid)
# Number of decimals to use in GCODE coordinates
@@ -147,7 +147,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
travel_frame = FCFrame()
self.layout.addWidget(travel_frame)
travel_grid = FCGridLayout(v_spacing=5, h_spacing=3)
travel_grid = GLay(v_spacing=5, h_spacing=3)
travel_frame.setLayout(travel_grid)
# Plot Line Color
@@ -196,7 +196,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
obj_frame = FCFrame()
self.layout.addWidget(obj_frame)
obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
obj_grid = GLay(v_spacing=5, h_spacing=3)
obj_frame.setLayout(obj_grid)
# Plot Line Color
@@ -221,7 +221,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI):
obj_grid.addWidget(self.fill_color_label, 2, 0)
obj_grid.addWidget(self.fill_color_entry, 2, 1)
FCGridLayout.set_common_column_size([plot_grid, dec_grid, travel_grid, obj_grid], 0)
GLay.set_common_column_size([plot_grid, dec_grid, travel_grid, obj_grid], 0)
self.layout.addStretch()

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

@@ -1,7 +1,7 @@
from PyQt6 import QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import RadioSet, FCCheckBox, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -43,7 +43,7 @@ class CNCJobOptPrefGroupUI(OptionsGroupUI):
gcode_frame = FCFrame()
self.layout.addWidget(gcode_frame)
gcode_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gcode_grid = GLay(v_spacing=5, h_spacing=3)
gcode_frame.setLayout(gcode_grid)
# Plot Kind

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -31,7 +31,7 @@ class CNCJobPPGroupUI(OptionsGroupUI):
comp_frame = FCFrame()
self.layout.addWidget(comp_frame)
comp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
comp_grid = GLay(v_spacing=5, h_spacing=3)
comp_frame.setLayout(comp_grid)
# Bed Size X

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -35,7 +35,7 @@ class ExcellonAdvOptPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Table Visibility CB

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -32,7 +32,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Selection Limit
@@ -85,7 +85,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
lin_frame = FCFrame()
self.layout.addWidget(lin_frame)
lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
lin_grid = GLay(v_spacing=5, h_spacing=3)
lin_frame.setLayout(lin_grid)
# Linear Drill Array direction
@@ -140,7 +140,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
circ_frame = FCFrame()
self.layout.addWidget(circ_frame)
circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
circ_grid = GLay(v_spacing=5, h_spacing=3)
circ_frame.setLayout(circ_grid)
# Circular Drill Array direction
@@ -179,7 +179,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
slots_frame = FCFrame()
self.layout.addWidget(slots_frame)
slots_grid = FCGridLayout(v_spacing=5, h_spacing=3)
slots_grid = GLay(v_spacing=5, h_spacing=3)
slots_frame.setLayout(slots_grid)
# Slot length
@@ -242,7 +242,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
slot_array_frame = FCFrame()
self.layout.addWidget(slot_array_frame)
slot_array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
slot_array_grid = GLay(v_spacing=5, h_spacing=3)
slot_array_frame.setLayout(slot_array_grid)
# Number of slot holes in a drill array
@@ -312,7 +312,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
circ_slot_frame = FCFrame()
self.layout.addWidget(circ_slot_frame)
circ_slot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
circ_slot_grid = GLay(v_spacing=5, h_spacing=3)
circ_slot_frame.setLayout(circ_slot_grid)
# Circular Slot Array direction
@@ -342,7 +342,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
circ_slot_grid.addWidget(self.slot_array_circular_angle_label, 2, 0)
circ_slot_grid.addWidget(self.slot_array_circular_angle_entry, 2, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, lin_grid, circ_grid, slots_grid, slot_array_grid, circ_slot_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
exp_frame = FCFrame()
self.layout.addWidget(exp_frame)
exp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
exp_grid = GLay(v_spacing=5, h_spacing=3)
exp_frame.setLayout(exp_grid)
# Excellon Units

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

@@ -3,7 +3,7 @@ import platform
from PyQt6 import QtWidgets, QtCore, QtGui
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCSliderWithSpinner, FCColorEntry, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
plot_frame = FCFrame()
self.layout.addWidget(plot_frame)
plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
plot_grid = GLay(v_spacing=5, h_spacing=3)
plot_frame.setLayout(plot_grid)
# Plot CB
@@ -105,7 +105,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
format_frame = FCFrame()
self.layout.addWidget(format_frame)
format_grid = FCGridLayout(v_spacing=5, h_spacing=3)
format_grid = GLay(v_spacing=5, h_spacing=3)
format_frame.setLayout(format_grid)
self.excellon_format_in_label = FCLabel('%s:' % _("INCH"))
@@ -226,7 +226,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
opt_frame = FCFrame()
self.layout.addWidget(opt_frame)
opt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
opt_grid = GLay(v_spacing=5, h_spacing=3)
opt_frame.setLayout(opt_grid)
self.excellon_optimization_label = FCLabel(_('Algorithm:'))
@@ -278,7 +278,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
fuse_frame = FCFrame()
self.layout.addWidget(fuse_frame)
fuse_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fuse_grid = GLay(v_spacing=5, h_spacing=3)
fuse_frame.setLayout(fuse_grid)
self.fuse_tools_cb = FCCheckBox(_("Fuse Tools"))
@@ -297,7 +297,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
obj_frame = FCFrame()
self.layout.addWidget(obj_frame)
obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
obj_grid = GLay(v_spacing=5, h_spacing=3)
obj_frame.setLayout(obj_grid)
# Plot Line Color
@@ -332,7 +332,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
obj_grid.addWidget(self.excellon_alpha_label, 4, 0)
obj_grid.addWidget(self.excellon_alpha_entry, 4, 1)
FCGridLayout.set_common_column_size([plot_grid, format_grid, opt_grid, obj_grid, fuse_grid], 0)
GLay.set_common_column_size([plot_grid, format_grid, opt_grid, obj_grid, fuse_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -34,7 +34,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# ### Milling Holes ## ##

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

@@ -2,7 +2,7 @@ from PyQt6 import QtCore, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \
FCColorEntry, FCLabel, FCGridLayout, FCFrame
FCColorEntry, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -44,7 +44,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.layout.addWidget(grids_frame)
# Create a grid layout for the Application general settings
grids_grid = FCGridLayout(v_spacing=5, h_spacing=3)
grids_grid = GLay(v_spacing=5, h_spacing=3)
grids_frame.setLayout(grids_grid)
# Grid X Entry
@@ -96,7 +96,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
wk_frame = FCFrame()
self.layout.addWidget(wk_frame)
wk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
wk_grid = GLay(v_spacing=5, h_spacing=3)
wk_frame.setLayout(wk_grid)
self.workspace_cb = FCCheckBox('%s' % _('Active'))
@@ -197,7 +197,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
fnt_frame = FCFrame()
self.layout.addWidget(fnt_frame)
fnt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fnt_grid = GLay(v_spacing=5, h_spacing=3)
fnt_frame.setLayout(fnt_grid)
# Notebook Font Size
@@ -289,7 +289,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
ax_frame = FCFrame()
self.layout.addWidget(ax_frame)
ax_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ax_grid = GLay(v_spacing=5, h_spacing=3)
ax_frame.setLayout(ax_grid)
# Axis Color
@@ -311,7 +311,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
m_frame = FCFrame()
self.layout.addWidget(m_frame)
m_grid = FCGridLayout(v_spacing=5, h_spacing=3)
m_grid = GLay(v_spacing=5, h_spacing=3)
m_frame.setLayout(m_grid)
# Mouse Cursor Shape
@@ -414,7 +414,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Delete confirmation
@@ -477,7 +477,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
par_grid.addWidget(self.activity_label, 10, 0)
par_grid.addWidget(self.activity_combo, 10, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[grids_grid, m_grid, par_grid, wk_grid, fnt_grid, ax_grid], 0
)

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

@@ -3,7 +3,7 @@ import sys
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
FCDoubleSpinner, FCLabel, FCGridLayout, RadioSetDefaults, FCFrame, FCComboBox2
FCDoubleSpinner, FCLabel, GLay, RadioSetDefaults, FCFrame, FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -37,7 +37,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid0_frame = FCFrame()
self.layout.addWidget(grid0_frame)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = GLay(v_spacing=5, h_spacing=3)
grid0_frame.setLayout(grid0)
# Units for FlatCAM
@@ -85,7 +85,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid1_frame = FCFrame()
self.layout.addWidget(grid1_frame)
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1 = GLay(v_spacing=5, h_spacing=3)
grid1_frame.setLayout(grid1)
# Graphic Engine for FlatCAM
@@ -177,7 +177,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid2_frame = FCFrame()
self.layout.addWidget(grid2_frame)
grid2 = FCGridLayout(v_spacing=5, h_spacing=3)
grid2 = GLay(v_spacing=5, h_spacing=3)
grid2_frame.setLayout(grid2)
# Application Level for FlatCAM
@@ -196,7 +196,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid3_frame = FCFrame()
self.layout.addWidget(grid3_frame)
grid3 = FCGridLayout(v_spacing=5, h_spacing=3)
grid3 = GLay(v_spacing=5, h_spacing=3)
grid3_frame.setLayout(grid3)
self.language_combo = FCComboBox()
@@ -222,7 +222,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid4_frame = FCFrame()
self.layout.addWidget(grid4_frame)
grid4 = FCGridLayout(v_spacing=5, h_spacing=3)
grid4 = GLay(v_spacing=5, h_spacing=3)
grid4_frame.setLayout(grid4)
# Splash Screen
@@ -293,7 +293,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid6_frame = FCFrame()
self.layout.addWidget(grid6_frame)
grid6 = FCGridLayout(v_spacing=5, h_spacing=3)
grid6 = GLay(v_spacing=5, h_spacing=3)
grid6_frame.setLayout(grid6)
# Save compressed project CB
@@ -358,7 +358,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
grid7_frame = FCFrame()
self.layout.addWidget(grid7_frame)
grid7 = FCGridLayout(v_spacing=5, h_spacing=3)
grid7 = GLay(v_spacing=5, h_spacing=3)
grid7_frame.setLayout(grid7)
# Top Margin value
@@ -415,7 +415,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
self.layout.addStretch()
FCGridLayout.set_common_column_size([grid0, grid1, grid6, grid7], 0)
GLay.set_common_column_size([grid0, grid1, grid6, grid7], 0)
if sys.platform != 'win32':
self.portability_cb.hide()

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

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore, QtGui
from PyQt6.QtCore import QSettings
from appGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry, FCLabel, \
FCGridLayout, FCFrame, FCComboBox2
GLay, FCFrame, FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -31,7 +31,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(grid0)
# Theme selection
@@ -152,7 +152,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
color_frame = FCFrame()
self.layout.addWidget(color_frame)
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1 = GLay(v_spacing=5, h_spacing=3)
color_frame.setLayout(grid1)
# Plot Selection (left - right) Color
@@ -296,7 +296,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
grid1.addWidget(self.proj_color_dis_label, 32, 0)
grid1.addWidget(self.proj_color_dis_entry, 32, 1)
FCGridLayout.set_common_column_size([grid0, grid1], 0)
GLay.set_common_column_size([grid0, grid1], 0)
# Project autohide CB
self.project_autohide_cb = FCCheckBox(label=_('Project AutoHide'))

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI):
adv_frame = FCFrame()
self.layout.addWidget(adv_frame)
adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adv_grid = GLay(v_spacing=5, h_spacing=3)
adv_frame.setLayout(adv_grid)
# 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, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class GeometryEditorPrefGroupUI(OptionsGroupUI):
editor_frame = FCFrame()
self.layout.addWidget(editor_frame)
editor_grid = FCGridLayout(v_spacing=5, h_spacing=3)
editor_grid = GLay(v_spacing=5, h_spacing=3)
editor_frame.setLayout(editor_grid)
# 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, FCGridLayout, FCFrame
from appGUI.GUIElements import FCLabel, FCComboBox, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import appTranslation as fcTranslate
@@ -33,7 +33,7 @@ class GeometryExpPrefGroupUI(OptionsGroupUI):
export_frame = FCFrame()
self.layout.addWidget(export_frame)
export_grid = FCGridLayout(v_spacing=5, h_spacing=3)
export_grid = GLay(v_spacing=5, h_spacing=3)
export_frame.setLayout(export_grid)
# Excellon non-decimal format

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

@@ -1,6 +1,6 @@
from PyQt6 import QtGui
from appGUI.GUIElements import FCCheckBox, FCSpinner, FCColorEntry, RadioSet, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, FCSpinner, FCColorEntry, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import platform
@@ -32,7 +32,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
plot_frame = FCFrame()
self.layout.addWidget(plot_frame)
plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
plot_grid = GLay(v_spacing=5, h_spacing=3)
plot_frame.setLayout(plot_grid)
# Plot CB
@@ -75,7 +75,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
opt_frame = FCFrame()
self.layout.addWidget(opt_frame)
opt_grid = FCGridLayout(v_spacing=5, h_spacing=3)
opt_grid = GLay(v_spacing=5, h_spacing=3)
opt_frame.setLayout(opt_grid)
self.opt_algorithm_label = FCLabel(_('Algorithm:'))
@@ -125,7 +125,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
fuse_frame = FCFrame()
self.layout.addWidget(fuse_frame)
fuse_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fuse_grid = GLay(v_spacing=5, h_spacing=3)
fuse_frame.setLayout(fuse_grid)
self.fuse_tools_cb = FCCheckBox(_("Fuse Tools"))
@@ -144,7 +144,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
obj_frame = FCFrame()
self.layout.addWidget(obj_frame)
obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
obj_grid = GLay(v_spacing=5, h_spacing=3)
obj_frame.setLayout(obj_grid)
# Plot Line Color
@@ -157,7 +157,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
obj_grid.addWidget(self.line_color_label, 0, 0)
obj_grid.addWidget(self.line_color_entry, 0, 1)
FCGridLayout.set_common_column_size([plot_grid, opt_grid, obj_grid, fuse_grid], 0)
GLay.set_common_column_size([plot_grid, opt_grid, obj_grid, fuse_grid], 0)
self.layout.addStretch(1)

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from PyQt6.QtCore import Qt
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -31,7 +31,7 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Cut Z

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, FCGridLayout, \
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection, GLay, \
FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -28,7 +28,7 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI):
adv_frame = FCFrame()
self.layout.addWidget(adv_frame)
adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adv_grid = GLay(v_spacing=5, h_spacing=3)
adv_frame.setLayout(adv_grid)
# Follow Attribute

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCLabel, RadioSet, NumericalEvalTupleEntry, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# Selection Limit
@@ -125,7 +125,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(lin_frame)
# ## Grid Layout
lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
lin_grid = GLay(v_spacing=5, h_spacing=3)
lin_frame.setLayout(lin_grid)
# Linear Pad Array direction
@@ -179,7 +179,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(circ_frame)
# ## Grid Layout
circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
circ_grid = GLay(v_spacing=5, h_spacing=3)
circ_frame.setLayout(circ_grid)
# Circular Pad Array direction
@@ -219,7 +219,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(buff_frame)
# ## Grid Layout
buf_grid = FCGridLayout(v_spacing=5, h_spacing=3)
buf_grid = GLay(v_spacing=5, h_spacing=3)
buff_frame.setLayout(buf_grid)
# Buffer Distance
@@ -244,7 +244,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(scale_frame)
# ## Grid Layout
scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
scale_grid = GLay(v_spacing=5, h_spacing=3)
scale_frame.setLayout(scale_grid)
# Scale Factor
@@ -269,7 +269,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(ma_frame)
# ## Grid Layout
ma_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ma_grid = GLay(v_spacing=5, h_spacing=3)
ma_frame.setLayout(ma_grid)
# Mark area Tool low threshold
@@ -296,6 +296,6 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
ma_grid.addWidget(self.grb_ma_high_label, 2, 0)
ma_grid.addWidget(self.grb_ma_high_entry, 2, 1)
FCGridLayout.set_common_column_size([param_grid, lin_grid, circ_grid, buf_grid, scale_grid, ma_grid], 0)
GLay.set_common_column_size([param_grid, lin_grid, circ_grid, buf_grid, scale_grid, ma_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(exp_frame)
# ## Grid Layout
exp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
exp_grid = GLay(v_spacing=5, h_spacing=3)
exp_frame.setLayout(exp_grid)
# Gerber Units

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

@@ -1,7 +1,7 @@
from PyQt6 import QtCore, QtGui, QtWidgets
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCButton, FCSliderWithSpinner, FCLabel, \
FCGridLayout, FCFrame, FCTable, FCColorEntry, OptionalInputSection
GLay, FCFrame, FCTable, FCColorEntry, OptionalInputSection
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
from copy import deepcopy
@@ -36,7 +36,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(plot_frame)
# ## Grid Layout
plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
plot_grid = GLay(v_spacing=5, h_spacing=3)
plot_frame.setLayout(plot_grid)
# Plot CB
@@ -89,7 +89,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(def_frame)
# ## Grid Layout
def_grid = FCGridLayout(v_spacing=5, h_spacing=3)
def_grid = GLay(v_spacing=5, h_spacing=3)
def_frame.setLayout(def_grid)
# Gerber Units
@@ -141,7 +141,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(par_frame)
# ## Grid Layout
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# Apertures Cleaning
@@ -180,7 +180,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(layers_frame)
# ## Grid Layout
layers_grid = FCGridLayout(v_spacing=5, h_spacing=3)
layers_grid = GLay(v_spacing=5, h_spacing=3)
layers_frame.setLayout(layers_grid)
# Store colors
@@ -227,7 +227,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(obj_frame)
# ## Grid Layout
obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
obj_grid = GLay(v_spacing=5, h_spacing=3)
obj_frame.setLayout(obj_grid)
# Enable Outline plotting
@@ -272,7 +272,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
obj_grid.addWidget(self.gerber_alpha_label, 6, 0)
obj_grid.addWidget(self.gerber_alpha_entry, 6, 1, 1, 2)
FCGridLayout.set_common_column_size([plot_grid, param_grid, def_grid, obj_grid], 0)
GLay.set_common_column_size([plot_grid, param_grid, def_grid, obj_grid], 0)
self.layout.addStretch()
@@ -362,7 +362,7 @@ class ColorsManager(QtWidgets.QDialog):
layers_frame.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
self.layout.addWidget(layers_frame)
layers_grid = FCGridLayout(v_spacing=5, h_spacing=3)
layers_grid = GLay(v_spacing=5, h_spacing=3)
layers_frame.setLayout(layers_grid)
# Layers Colors Table
@@ -406,7 +406,7 @@ class ColorsManager(QtWidgets.QDialog):
# #############################################################################################################
# ######################################## Button Grid ########################################################
# #############################################################################################################
button_grid = FCGridLayout(h_spacing=5, v_spacing=5)
button_grid = GLay(h_spacing=5, v_spacing=5)
self.layout.addLayout(button_grid)
self.button_box = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.StandardButton.Ok |

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -39,7 +39,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(ncc_frame)
# ## Grid Layout
ncc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ncc_grid = GLay(v_spacing=5, h_spacing=3)
ncc_frame.setLayout(ncc_grid)
# Margin
@@ -74,7 +74,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
bb_frame = FCFrame()
self.layout.addWidget(bb_frame)
bb_grid = FCGridLayout(v_spacing=5, h_spacing=3)
bb_grid = GLay(v_spacing=5, h_spacing=3)
bb_frame.setLayout(bb_grid)
bbmargin = FCLabel('%s:' % _('Boundary Margin'))
@@ -99,6 +99,6 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
)
bb_grid.addWidget(self.bbrounded_cb, 2, 0, 1, 2)
FCGridLayout.set_common_column_size([ncc_grid, bb_grid], 0)
GLay.set_common_column_size([ncc_grid, bb_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, FCGridLayout, FCFrame, \
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, GLay, FCFrame, \
FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -36,7 +36,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(par_frame)
# ## Grid Layout
grid_par = FCGridLayout(v_spacing=5, h_spacing=3)
grid_par = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(grid_par)
# CIRCLE STEPS - to be used when buffering
@@ -149,7 +149,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(dots_frame)
# ## Grid Layout
grid_dots = FCGridLayout(v_spacing=5, h_spacing=3)
grid_dots = GLay(v_spacing=5, h_spacing=3)
dots_frame.setLayout(grid_dots)
# Dot diameter #
@@ -188,7 +188,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(square_frame)
# ## Grid Layout
grid_square = FCGridLayout(v_spacing=5, h_spacing=3)
grid_square = GLay(v_spacing=5, h_spacing=3)
square_frame.setLayout(grid_square)
# Square Size #
@@ -227,7 +227,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(line_frame)
# ## Grid Layout
grid_line = FCGridLayout(v_spacing=5, h_spacing=3)
grid_line = GLay(v_spacing=5, h_spacing=3)
line_frame.setLayout(grid_line)
# Line Size #
@@ -270,7 +270,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(rob_frame)
# ## Grid Layout
grid_robber = FCGridLayout(v_spacing=5, h_spacing=3)
grid_robber = GLay(v_spacing=5, h_spacing=3)
rob_frame.setLayout(grid_robber)
# ROBBER BAR MARGIN #
@@ -312,7 +312,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(ppm_frame)
# ## Grid Layout
grid_ppm = FCGridLayout(v_spacing=5, h_spacing=3)
grid_ppm = GLay(v_spacing=5, h_spacing=3)
ppm_frame.setLayout(grid_ppm)
# Use Only Pads
@@ -346,7 +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(
GLay.set_common_column_size(
[grid_par, grid_ppm, grid_line, grid_dots, grid_robber, grid_square], 0)
self.layout.addStretch()

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
param_grid.addWidget(self.param_label, 0, 0, 1, 2)
@@ -116,7 +116,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
tc_frame = FCFrame()
self.layout.addWidget(tc_frame)
tc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tc_grid = GLay(v_spacing=5, h_spacing=3)
tc_frame.setLayout(tc_grid)
# Toolchange X-Y entry
@@ -146,6 +146,6 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
tc_grid.addWidget(toolchangez_lbl, 2, 0)
tc_grid.addWidget(self.toolchangez_entry, 2, 1)
FCGridLayout.set_common_column_size([param_grid, tc_grid], 0)
GLay.set_common_column_size([param_grid, tc_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -36,7 +36,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Circular Aperture Selection
@@ -90,7 +90,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
met_frame = FCFrame()
self.layout.addWidget(met_frame)
met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
met_grid = GLay(v_spacing=5, h_spacing=3)
met_frame.setLayout(met_grid)
self.method_radio = RadioSet(
@@ -125,7 +125,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
fix_frame = FCFrame()
self.layout.addWidget(fix_frame)
fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fix_grid = GLay(v_spacing=5, h_spacing=3)
fix_frame.setLayout(fix_grid)
# Diameter value
@@ -155,7 +155,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
ring_frame = FCFrame()
self.layout.addWidget(ring_frame)
ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ring_grid = GLay(v_spacing=5, h_spacing=3)
ring_frame.setLayout(ring_grid)
# Circular Annular Ring Value
@@ -232,7 +232,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
prop_frame = FCFrame()
self.layout.addWidget(prop_frame)
prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
prop_grid = GLay(v_spacing=5, h_spacing=3)
prop_frame.setLayout(prop_grid)
# Factor value
@@ -261,7 +261,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
solder_frame = FCFrame()
self.layout.addWidget(solder_frame)
solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
solder_grid = GLay(v_spacing=5, h_spacing=3)
solder_frame.setLayout(solder_grid)
# CLEARANCE soldermask extraction
@@ -289,7 +289,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
ecut_frame = FCFrame()
self.layout.addWidget(ecut_frame)
ecut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ecut_grid = GLay(v_spacing=5, h_spacing=3)
ecut_frame.setLayout(ecut_grid)
# Margin Cutout
@@ -320,7 +320,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
ecut_grid.addWidget(self.thick_cut_label, 2, 0)
ecut_grid.addWidget(self.thick_cut_entry, 2, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, ring_grid, fix_grid, prop_grid, met_grid, solder_grid, ecut_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCComboBox2, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCComboBox2, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# DIAMETER #
@@ -124,7 +124,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(s_frame)
# Grid Layout
grid_sel = FCGridLayout(v_spacing=5, h_spacing=3)
grid_sel = GLay(v_spacing=5, h_spacing=3)
s_frame.setLayout(grid_sel)
# Mode #
@@ -140,6 +140,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([param_grid, grid_sel], 0)
GLay.set_common_column_size([param_grid, grid_sel], 0)
self.layout.addStretch(1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Margin
@@ -67,7 +67,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
join_frame = FCFrame()
self.layout.addWidget(join_frame)
join_grid = FCGridLayout(v_spacing=5, h_spacing=3)
join_grid = GLay(v_spacing=5, h_spacing=3)
join_frame.setLayout(join_grid)
line_join_lbl = FCLabel('%s:' % _("Value"))
@@ -81,6 +81,6 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
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)
GLay.set_common_column_size([param_grid, join_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class Tools2OptimalPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
self.precision_sp = FCSpinner()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -36,7 +36,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Circular Aperture Selection
@@ -90,7 +90,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
met_frame = FCFrame()
self.layout.addWidget(met_frame)
met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
met_grid = GLay(v_spacing=5, h_spacing=3)
met_frame.setLayout(met_grid)
self.hole_size_radio = RadioSet(
@@ -122,7 +122,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
fix_frame = FCFrame()
self.layout.addWidget(fix_frame)
fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fix_grid = GLay(v_spacing=5, h_spacing=3)
fix_frame.setLayout(fix_grid)
# Diameter value
@@ -152,7 +152,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
ring_frame = FCFrame()
self.layout.addWidget(ring_frame)
ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ring_grid = GLay(v_spacing=5, h_spacing=3)
ring_frame.setLayout(ring_grid)
# Circular Annular Ring Value
@@ -229,7 +229,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
prop_frame = FCFrame()
self.layout.addWidget(prop_frame)
prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
prop_grid = GLay(v_spacing=5, h_spacing=3)
prop_frame.setLayout(prop_grid)
# Factor value
@@ -247,7 +247,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
prop_grid.addWidget(self.factor_label, 0, 0)
prop_grid.addWidget(self.factor_entry, 0, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, ring_grid, prop_grid, met_grid, fix_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtGui
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):
self.layout.addWidget(par_frame)
# ## Grid Layout
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# VERSION #

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
copper_frame = FCFrame()
self.layout.addWidget(copper_frame)
self.copper_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.copper_grid = GLay(v_spacing=5, h_spacing=3)
copper_frame.setLayout(self.copper_grid)
# Trace size
@@ -133,7 +133,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
silk_frame = FCFrame()
self.layout.addWidget(silk_frame)
self.silk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.silk_grid = GLay(v_spacing=5, h_spacing=3)
silk_frame.setLayout(self.silk_grid)
# Silkscreen2silkscreen clearance
@@ -211,7 +211,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
solder_frame = FCFrame()
self.layout.addWidget(solder_frame)
self.solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.solder_grid = GLay(v_spacing=5, h_spacing=3)
solder_frame.setLayout(self.solder_grid)
# Soldermask2soldermask clearance
@@ -246,7 +246,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
holes_frame = FCFrame()
self.layout.addWidget(holes_frame)
self.holes_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.holes_grid = GLay(v_spacing=5, h_spacing=3)
holes_frame.setLayout(self.holes_grid)
# Hole2Hole clearance

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# ## Drill diameter for alignment holes
@@ -95,7 +95,7 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
mirror_frame = FCFrame()
self.layout.addWidget(mirror_frame)
mirror_grid = FCGridLayout(v_spacing=5, h_spacing=3)
mirror_grid = GLay(v_spacing=5, h_spacing=3)
mirror_frame.setLayout(mirror_grid)
mirror_grid.addWidget(self.mirax_label, 0, 0)
@@ -122,6 +122,6 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
mirror_grid.addWidget(self.axloc_label, 2, 0)
mirror_grid.addWidget(self.axis_location_radio, 2, 1)
FCGridLayout.set_common_column_size([param_grid, mirror_grid], 0)
GLay.set_common_column_size([param_grid, mirror_grid], 0)
# self.layout.addStretch(1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
v_frame = FCFrame()
self.layout.addWidget(v_frame)
v_grid = FCGridLayout(v_spacing=5, h_spacing=3)
v_grid = GLay(v_spacing=5, h_spacing=3)
v_frame.setLayout(v_grid)
# ## Tip Diameter
@@ -93,7 +93,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
el_frame = FCFrame()
self.layout.addWidget(el_frame)
el_grid = FCGridLayout(v_spacing=5, h_spacing=3)
el_grid = GLay(v_spacing=5, h_spacing=3)
el_frame.setLayout(el_grid)
# ## PCB Length
@@ -155,6 +155,6 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
el_grid.addWidget(self.growth_label, 8, 0)
el_grid.addWidget(self.growth_entry, 8, 1)
FCGridLayout.set_common_column_size([v_grid, el_grid], 0)
GLay.set_common_column_size([v_grid, el_grid], 0)
self.layout.addStretch()

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, FCLabel, OptionalInputSection, \
FCGridLayout, FCFrame, FCComboBox2
GLay, FCFrame, FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -37,7 +37,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
tool_par_frame = FCFrame()
self.layout.addWidget(tool_par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
tool_par_frame.setLayout(param_grid)
# Tool Diameter
@@ -143,7 +143,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(gaps_frame)
# Grid Layout
gaps_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gaps_grid = GLay(v_spacing=5, h_spacing=3)
gaps_frame.setLayout(gaps_grid)
# Gap Size
@@ -271,7 +271,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.drill_cut_frame)
# Grid Layout
drill_cut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
drill_cut_grid = GLay(v_spacing=5, h_spacing=3)
self.drill_cut_frame.setLayout(drill_cut_grid)
# Drill Tool Diameter
@@ -314,7 +314,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
drill_cut_grid.addWidget(self.drill_margin_label, 4, 0)
drill_cut_grid.addWidget(self.drill_margin_entry, 4, 1)
FCGridLayout.set_common_column_size([param_grid, drill_cut_grid, gaps_grid], 0)
GLay.set_common_column_size([param_grid, drill_cut_grid, gaps_grid], 0)
# self.layout.addStretch()

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

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel, FCGridLayout, FCComboBox2, FCFrame
OptionalInputSection, NumericalEvalEntry, FCLabel, GLay, FCComboBox2, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Tool order Radio Button
@@ -232,7 +232,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
ds_frame = FCFrame()
self.layout.addWidget(ds_frame)
ds_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ds_grid = GLay(v_spacing=5, h_spacing=3)
ds_frame.setLayout(ds_grid)
# Drill slots
@@ -281,7 +281,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
adv_frame = FCFrame()
self.layout.addWidget(adv_frame)
adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adv_grid = GLay(v_spacing=5, h_spacing=3)
adv_frame.setLayout(adv_grid)
# Offset Z
@@ -426,7 +426,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
area_frame = FCFrame()
self.layout.addWidget(area_frame)
area_grid = FCGridLayout(v_spacing=5, h_spacing=3)
area_grid = GLay(v_spacing=5, h_spacing=3)
area_frame.setLayout(area_grid)
# Exclusion Area CB
@@ -475,6 +475,6 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
area_grid.addWidget(self.over_z_label, 6, 0)
area_grid.addWidget(self.over_z_entry, 6, 1, 1, 2)
FCGridLayout.set_common_column_size([param_grid, ds_grid, adv_grid, area_grid], 0)
GLay.set_common_column_size([param_grid, ds_grid, adv_grid, area_grid], 0)
self.layout.addStretch()

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

@@ -1,7 +1,7 @@
from PyQt6 import QtGui
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry, FCLabel, FCSpinner, \
FCGridLayout, FCComboBox2, FCFrame
GLay, FCComboBox2, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
adj_frame = FCFrame()
self.layout.addWidget(adj_frame)
adj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adj_grid = GLay(v_spacing=5, h_spacing=3)
adj_frame.setLayout(adj_grid)
# Scale Geometry
@@ -55,7 +55,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
scale_frame = FCFrame()
adj_grid.addWidget(scale_frame, 4, 0, 1, 2)
grid_scale = FCGridLayout(v_spacing=5, h_spacing=3)
grid_scale = GLay(v_spacing=5, h_spacing=3)
scale_frame.setLayout(grid_scale)
# Scale Type
@@ -120,7 +120,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
skew_frame = FCFrame()
adj_grid.addWidget(skew_frame, 10, 0, 1, 2)
grid_skew = FCGridLayout(v_spacing=5, h_spacing=3)
grid_skew = GLay(v_spacing=5, h_spacing=3)
skew_frame.setLayout(grid_skew)
self.film_skew_type_lbl = FCLabel('%s:' % _("Type"))
@@ -205,7 +205,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
grid_par = FCGridLayout()
grid_par = GLay()
par_frame.setLayout(grid_par)
# Convex Shape
@@ -393,7 +393,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
# self.layout.addStretch(1)
FCGridLayout.set_common_column_size([adj_grid, grid_par, grid_skew, grid_scale], 0)
GLay.set_common_column_size([adj_grid, grid_par, grid_skew, grid_scale], 0)
# Film Tool
self.film_color_entry.editingFinished.connect(self.on_film_color_entry)

10
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, FCGridLayout, FCFrame
FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Tool Dias
@@ -141,7 +141,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
tt_frame = FCFrame()
self.layout.addWidget(tt_frame)
tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tool_grid = GLay(v_spacing=5, h_spacing=3)
tt_frame.setLayout(tool_grid)
# Shape
@@ -254,7 +254,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
gp_frame = FCFrame()
self.layout.addWidget(gp_frame)
gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gen_grid = GLay(v_spacing=5, h_spacing=3)
gp_frame.setLayout(gen_grid)
# Rest machining CheckBox
@@ -371,6 +371,6 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
gen_grid.addWidget(plotting_label, 14, 0)
gen_grid.addWidget(self.plotting_radio, 14, 1, 1, 2)
FCGridLayout.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
GLay.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
self.layout.addStretch(1)

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, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class ToolsLevelPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Probe points mode

8
appGUI/preferences/tools/ToolsMarkersPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Type of Marker
@@ -111,7 +111,7 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
off_frame = FCFrame()
self.layout.addWidget(off_frame)
off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
off_grid = GLay(v_spacing=5, h_spacing=3)
off_frame.setLayout(off_grid)
off_grid.addWidget(self.ref_label, 0, 0)
@@ -143,6 +143,6 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
off_grid.addWidget(self.offset_y_label, 3, 0)
off_grid.addWidget(self.offset_y_entry, 3, 1)
FCGridLayout.set_common_column_size([param_grid, off_grid], 0)
GLay.set_common_column_size([param_grid, off_grid], 0)
self.layout.addStretch()

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

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, FCGridLayout, FCFrame
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Tooldia
@@ -298,7 +298,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
adv_frame = FCFrame()
self.layout.addWidget(adv_frame)
adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adv_grid = GLay(v_spacing=5, h_spacing=3)
adv_frame.setLayout(adv_grid)
# Toolchange X,Y
@@ -446,7 +446,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
area_frame = FCFrame()
self.layout.addWidget(area_frame)
area_grid = FCGridLayout(v_spacing=5, h_spacing=3)
area_grid = GLay(v_spacing=5, h_spacing=3)
area_frame.setLayout(area_grid)
# Exclusion Area CB
@@ -513,7 +513,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
polish_frame = FCFrame()
self.layout.addWidget(polish_frame)
polish_grid = FCGridLayout(v_spacing=5, h_spacing=3)
polish_grid = GLay(v_spacing=5, h_spacing=3)
polish_frame.setLayout(polish_grid)
# Polish Margin
@@ -571,7 +571,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
excellon_mill_frame = FCFrame()
self.layout.addWidget(excellon_mill_frame)
excellon_mill_grid = FCGridLayout(v_spacing=5, h_spacing=3)
excellon_mill_grid = GLay(v_spacing=5, h_spacing=3)
excellon_mill_frame.setLayout(excellon_mill_grid)
# Milling Type
@@ -639,6 +639,6 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
excellon_mill_grid.addWidget(self.connect_cb, 8, 0, 1, 2)
FCGridLayout.set_common_column_size([param_grid, adv_grid, area_grid, polish_grid, excellon_mill_grid], 0)
GLay.set_common_column_size([param_grid, adv_grid, area_grid, polish_grid, excellon_mill_grid], 0)
self.layout.addStretch()

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox2, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -36,7 +36,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Tools Diameters
@@ -161,7 +161,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
tt_frame = FCFrame()
self.layout.addWidget(tt_frame)
tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tool_grid = GLay(v_spacing=5, h_spacing=3)
tt_frame.setLayout(tool_grid)
# Overlap Entry
@@ -280,7 +280,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
gp_frame = FCFrame()
self.layout.addWidget(gp_frame)
gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gen_grid = GLay(v_spacing=5, h_spacing=3)
gp_frame.setLayout(gen_grid)
# Rest machining CheckBox
@@ -355,6 +355,6 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
gen_grid.addWidget(self.valid_cb, 10, 0, 1, 2)
FCGridLayout.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
GLay.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
self.layout.addStretch(1)

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -38,7 +38,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# Tool dia
@@ -144,7 +144,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
tt_frame = FCFrame()
self.layout.addWidget(tt_frame)
tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tool_grid = GLay(v_spacing=5, h_spacing=3)
tt_frame.setLayout(tool_grid)
# Overlap
@@ -237,7 +237,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
gp_frame = FCFrame()
self.layout.addWidget(gp_frame)
gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gen_grid = GLay(v_spacing=5, h_spacing=3)
gp_frame.setLayout(gen_grid)
self.rest_cb = FCCheckBox('%s' % _("Rest"))
@@ -310,6 +310,6 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
gen_grid.addWidget(plotting_label, 8, 0)
gen_grid.addWidget(self.paint_plotting_radio, 8, 1)
FCGridLayout.set_common_column_size([tool_grid, param_grid, gen_grid], 0)
GLay.set_common_column_size([tool_grid, param_grid, gen_grid], 0)
self.layout.addStretch(1)

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, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsPanelizePrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# ## Spacing Columns

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

@@ -1,6 +1,6 @@
from PyQt6 import QtCore
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, FCGridLayout, \
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, GLay, \
FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -35,7 +35,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Nozzle Tool Diameters

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

@@ -1,4 +1,4 @@
from appGUI.GUIElements import FCCheckBox, FCLabel, FCFrame, FCGridLayout
from appGUI.GUIElements import FCCheckBox, FCLabel, FCFrame, GLay
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -31,7 +31,7 @@ class ToolsSubPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
self.close_paths_cb = FCCheckBox(_("Close paths"))

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets, QtGui
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Reference Type
@@ -91,7 +91,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
rot_frame = FCFrame()
self.layout.addWidget(rot_frame)
rot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
rot_grid = GLay(v_spacing=5, h_spacing=3)
rot_frame.setLayout(rot_grid)
self.rotate_entry = FCDoubleSpinner()
@@ -132,7 +132,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
skew_frame = FCFrame()
self.layout.addWidget(skew_frame)
skew_grid = FCGridLayout(v_spacing=5, h_spacing=3)
skew_grid = GLay(v_spacing=5, h_spacing=3)
skew_frame.setLayout(skew_grid)
self.skewx_entry = FCDoubleSpinner()
@@ -183,7 +183,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
scale_frame = FCFrame()
self.layout.addWidget(scale_frame)
scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
scale_grid = GLay(v_spacing=5, h_spacing=3)
scale_frame.setLayout(scale_grid)
self.scalex_entry = FCDoubleSpinner()
@@ -220,7 +220,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
off_frame = FCFrame()
self.layout.addWidget(off_frame)
off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
off_grid = GLay(v_spacing=5, h_spacing=3)
off_frame.setLayout(off_grid)
self.offx_entry = FCDoubleSpinner()
@@ -273,7 +273,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
buff_frame = FCFrame()
self.layout.addWidget(buff_frame)
buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
buff_grid = GLay(v_spacing=5, h_spacing=3)
buff_frame.setLayout(buff_grid)
self.buffer_label = FCLabel('%s:' % _("Distance"))
@@ -311,7 +311,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
buff_grid.addWidget(self.buffer_factor_label, 4, 0)
buff_grid.addWidget(self.buffer_factor_entry, 4, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, rot_grid, skew_grid, scale_grid, off_grid, buff_grid], 0)
self.layout.addStretch()