- some reformatting and class rename

- when clicking the coordinates toolbars in the status bar now the Distance Plugin is shown and if already displayed, it is closed (toggle action)
2022-04-03 15:06:36 +03:00
parent 1b9e2feb75
commit a59f996819
90 changed files with 569 additions and 470 deletions
--- a/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets

-from appGUI.GUIElements import FCCheckBox, FCLabel, 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
--- a/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets

-from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, 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()
--- a/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets, QtCore

-from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, 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
--- a/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
@@ -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()

--- a/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
+++ b/appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
@@ -1,6 +1,6 @@
 from PyQt6 import QtWidgets

-from appGUI.GUIElements import FCDoubleSpinner, FCLabel, 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 ## ##