- created a new category in Preferences where only the Engraving Related preferences are located

- added a new set of options in the Preferences for the Milling Plugin by taking them out of the Geometry section
2021-03-28 16:57:57 +03:00
parent 77cdf798ab
commit b790f36282
35 changed files with 1355 additions and 1233 deletions
--- a/appGUI/preferences/tools/Plugins2PreferencesUI.py
+++ b/appGUI/preferences/tools/Plugins2PreferencesUI.py
@@ -18,7 +18,7 @@ fcTranslate.apply_language('strings')
 if '_' not in builtins.__dict__:
    _ = gettext.gettext

-class Tools2PreferencesUI(QtWidgets.QWidget):
+class Plugins2PreferencesUI(QtWidgets.QWidget):

    def __init__(self, decimals, parent=None):
        QtWidgets.QWidget.__init__(self, parent=parent)
--- a/appGUI/preferences/tools/PluginsEngravingPreferencesUI.py
+++ b/appGUI/preferences/tools/PluginsEngravingPreferencesUI.py
@@ -0,0 +1,60 @@
+from PyQt5 import QtWidgets
+
+from appGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI
+from appGUI.preferences.tools.ToolsLevelPrefGroupUI import ToolsLevelPrefGroupUI
+
+from appGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI
+from appGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI
+from appGUI.preferences.tools.ToolsISOPrefGroupUI import ToolsISOPrefGroupUI
+
+import gettext
+import appTranslation as fcTranslate
+import builtins
+
+fcTranslate.apply_language('strings')
+if '_' not in builtins.__dict__:
+    _ = gettext.gettext
+
+
+class PluginsEngravingPreferencesUI(QtWidgets.QWidget):
+
+    def __init__(self, decimals, parent=None):
+        QtWidgets.QWidget.__init__(self, parent=parent)
+        self.layout = QtWidgets.QHBoxLayout()
+        self.setLayout(self.layout)
+        self.decimals = decimals
+
+        self.tools_iso_group = ToolsISOPrefGroupUI(decimals=self.decimals)
+        self.tools_iso_group.setMinimumWidth(220)
+
+        self.tools_ncc_group = ToolsNCCPrefGroupUI(decimals=self.decimals)
+        self.tools_ncc_group.setMinimumWidth(220)
+
+        self.tools_paint_group = ToolsPaintPrefGroupUI(decimals=self.decimals)
+        self.tools_paint_group.setMinimumWidth(220)
+
+        self.tools_2sided_group = Tools2sidedPrefGroupUI(decimals=self.decimals)
+        self.tools_2sided_group.setMinimumWidth(220)
+
+        self.tools_level_group = ToolsLevelPrefGroupUI(decimals=self.decimals)
+        self.tools_level_group.setMinimumWidth(220)
+
+        self.vlay = QtWidgets.QVBoxLayout()
+        self.vlay.addWidget(self.tools_iso_group)
+
+        self.vlay1 = QtWidgets.QVBoxLayout()
+        self.vlay1.addWidget(self.tools_ncc_group)
+
+        self.vlay2 = QtWidgets.QVBoxLayout()
+        self.vlay2.addWidget(self.tools_paint_group)
+
+        self.vlay3 = QtWidgets.QVBoxLayout()
+        self.vlay3.addWidget(self.tools_2sided_group)
+        self.vlay3.addWidget(self.tools_level_group)
+
+        self.layout.addLayout(self.vlay)
+        self.layout.addLayout(self.vlay1)
+        self.layout.addLayout(self.vlay2)
+        self.layout.addLayout(self.vlay3)
+
+        self.layout.addStretch()
--- a/appGUI/preferences/tools/PluginsPreferencesUI.py
+++ b/appGUI/preferences/tools/PluginsPreferencesUI.py
@@ -3,20 +3,16 @@ from PyQt5 import QtWidgets
 from appGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI
 from appGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI
 from appGUI.preferences.tools.ToolsCornersPrefGroupUI import ToolsCornersPrefGroupUI
+
 from appGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI
 from appGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI
+
 from appGUI.preferences.tools.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI
 from appGUI.preferences.tools.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI
-from appGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI
-
-from appGUI.preferences.tools.ToolsLevelPrefGroupUI import ToolsLevelPrefGroupUI

 from appGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI
-from appGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI
-from appGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI
-from appGUI.preferences.tools.ToolsISOPrefGroupUI import ToolsISOPrefGroupUI
 from appGUI.preferences.tools.ToolsDrillPrefGroupUI import ToolsDrillPrefGroupUI
-
+from appGUI.preferences.tools.ToolsMillPrefGroupUI import ToolsMillPrefGroupUI
 import gettext
 import appTranslation as fcTranslate
 import builtins
@@ -26,7 +22,7 @@ if '_' not in builtins.__dict__:
    _ = gettext.gettext


-class ToolsPreferencesUI(QtWidgets.QWidget):
+class PluginsPreferencesUI(QtWidgets.QWidget):

    def __init__(self, decimals, parent=None):
        QtWidgets.QWidget.__init__(self, parent=parent)
@@ -34,27 +30,15 @@ class ToolsPreferencesUI(QtWidgets.QWidget):
        self.setLayout(self.layout)
        self.decimals = decimals

-        self.tools_iso_group = ToolsISOPrefGroupUI(decimals=self.decimals)
-        self.tools_iso_group.setMinimumWidth(220)
-
        self.tools_drill_group = ToolsDrillPrefGroupUI(decimals=self.decimals)
        self.tools_drill_group.setMinimumWidth(220)

-        self.tools_ncc_group = ToolsNCCPrefGroupUI(decimals=self.decimals)
-        self.tools_ncc_group.setMinimumWidth(220)
-
-        self.tools_paint_group = ToolsPaintPrefGroupUI(decimals=self.decimals)
-        self.tools_paint_group.setMinimumWidth(220)
+        self.tools_mill_group = ToolsMillPrefGroupUI(decimals=self.decimals)
+        self.tools_mill_group.setMinimumWidth(220)

        self.tools_cutout_group = ToolsCutoutPrefGroupUI(decimals=self.decimals)
        self.tools_cutout_group.setMinimumWidth(220)

-        self.tools_2sided_group = Tools2sidedPrefGroupUI(decimals=self.decimals)
-        self.tools_2sided_group.setMinimumWidth(220)
-
-        self.tools_level_group = ToolsLevelPrefGroupUI(decimals=self.decimals)
-        self.tools_level_group.setMinimumWidth(220)
-
        self.tools_film_group = ToolsFilmPrefGroupUI(decimals=self.decimals)
        self.tools_film_group.setMinimumWidth(220)

@@ -77,19 +61,14 @@ class ToolsPreferencesUI(QtWidgets.QWidget):
        self.tools_sub_group.setMinimumWidth(200)

        self.vlay = QtWidgets.QVBoxLayout()
-
-        self.vlay.addWidget(self.tools_iso_group)
-        self.vlay.addWidget(self.tools_level_group)
-        self.vlay.addWidget(self.tools_cutout_group)
+        self.vlay.addWidget(self.tools_drill_group)

        self.vlay1 = QtWidgets.QVBoxLayout()
-        self.vlay1.addWidget(self.tools_drill_group)
-        self.vlay1.addWidget(self.tools_panelize_group)
+        self.vlay1.addWidget(self.tools_mill_group)

        self.vlay2 = QtWidgets.QVBoxLayout()
-        self.vlay2.addWidget(self.tools_ncc_group)
-        self.vlay2.addWidget(self.tools_paint_group)
-        self.vlay2.addWidget(self.tools_2sided_group)
+        self.vlay2.addWidget(self.tools_cutout_group)
+        self.vlay2.addWidget(self.tools_panelize_group)

        self.vlay3 = QtWidgets.QVBoxLayout()
        self.vlay3.addWidget(self.tools_film_group)
--- a/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):

        super(Tools2CThievingPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Copper Thieving Tool Options")))
+        self.setTitle(str(_("Copper Thieving Plugin")))
        self.decimals = decimals

        # ## Grid Layout
--- a/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2CalPrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):

        super(Tools2CalPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Calibration Tool Options")))
+        self.setTitle(str(_("Calibration Plugin")))
        self.decimals = decimals

        # ## Grid Layout
--- a/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):

        super(Tools2FiducialsPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Fiducials Tool Options")))
+        self.setTitle(str(_("Fiducials Plugin")))
        self.decimals = decimals

        # ## Grid Layout
--- a/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2InvertPrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):

        super(Tools2InvertPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Invert Gerber Tool Options")))
+        self.setTitle(str(_("Invert Gerber Plugin")))
        self.decimals = decimals

        # ## Subtractor Tool Parameters
--- a/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2OptimalPrefGroupUI(OptionsGroupUI):

        super(Tools2OptimalPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Optimal Tool Options")))
+        self.setTitle(str(_("Optimal Plugin")))
        self.decimals = decimals

        # ## Parameters
--- a/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI):

        super(Tools2QRCodePrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("QRCode Tool Options")))
+        self.setTitle(str(_("QRCode Plugin")))
        self.decimals = decimals

        # ## Parameters
--- a/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
@@ -17,7 +17,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):

        super(Tools2RulesCheckPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Check Rules Tool Options")))
+        self.setTitle(str(_("Check Rules Plugin")))
        self.decimals = decimals

        self.crlabel = FCLabel("<b>%s:</b>" % _("Parameters"))
--- a/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
+++ b/appGUI/preferences/tools/Tools2sidedPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class Tools2sidedPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "2sided Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "2sided Plugin", parent=parent)
        super(Tools2sidedPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("2-Sided Tool Options")))
+        self.setTitle(str(_("2-Sided Plugin")))
        self.decimals = decimals

        # ## Board cuttout
--- a/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Calculators Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Calculators Plugin", parent=parent)
        super(ToolsCalculatorsPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Calculators Tool Options")))
+        self.setTitle(str(_("Calculators Plugin")))
        self.decimals = decimals

        # ## V-shape Calculator Tool
--- a/appGUI/preferences/tools/ToolsCornersPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCornersPrefGroupUI.py
@@ -14,7 +14,7 @@ if '_' not in builtins.__dict__:

 class ToolsCornersPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Calculators Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Calculators Plugin", parent=parent)
        super(ToolsCornersPrefGroupUI, self).__init__(self, parent=parent)

        self.setTitle(str(_("Corner Markers Options")))
--- a/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsCutoutPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Cutout Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Cutout Plugin", parent=parent)
        super(ToolsCutoutPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Cutout Tool Options")))
+        self.setTitle(str(_("Cutout Plugin")))
        self.decimals = decimals

        # ## Board cutout
--- a/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
@@ -18,7 +18,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
        super(ToolsDrillPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Drilling Tool Options")))
+        self.setTitle(str(_("Drilling Plugin")))
        self.decimals = decimals

        # ## Clear non-copper regions
--- a/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsFilmPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Cutout Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Cutout Plugin", parent=parent)
        super(ToolsFilmPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Film Tool Options")))
+        self.setTitle(str(_("Film Plugin")))
        self.decimals = decimals

        # ## Parameters
--- a/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsISOPrefGroupUI.py
@@ -17,7 +17,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
        super(ToolsISOPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Isolation Tool Options")))
+        self.setTitle(str(_("Isolation Plugin")))
        self.decimals = decimals

        # ## Clear non-copper regions
--- a/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsLevelPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Cutout Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Cutout Plugin", parent=parent)
        super(ToolsLevelPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Levelling Tool Options")))
+        self.setTitle(str(_("Levelling Plugin")))
        self.decimals = decimals

        # ## Board cuttout
--- a/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsMillPrefGroupUI.py
@@ -0,0 +1,526 @@
+from PyQt5 import QtWidgets
+from PyQt5.QtCore import Qt
+
+from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
+    OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry
+from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
+
+import gettext
+import appTranslation as fcTranslate
+import builtins
+
+fcTranslate.apply_language('strings')
+if '_' not in builtins.__dict__:
+    _ = gettext.gettext
+
+
+class ToolsMillPrefGroupUI(OptionsGroupUI):
+    def __init__(self, decimals=4, parent=None):
+        super(ToolsMillPrefGroupUI, self).__init__(self, parent=parent)
+
+        self.setTitle(str(_("Milling Plugin")))
+        self.decimals = decimals
+
+        # ## Clear non-copper regions
+        self.mill_label = FCLabel("<b>%s:</b>" % _("Parameters"))
+        self.mill_label.setToolTip(
+            _("Create CNCJob with toolpaths for milling either Geometry or drill holes.")
+        )
+        self.layout.addWidget(self.mill_label)
+
+        grid0 = QtWidgets.QGridLayout()
+        self.layout.addLayout(grid0)
+
+        # Tooldia
+        tdlabel = FCLabel('<b><font color="green">%s:</font></b>' % _('Tools Dia'))
+        tdlabel.setToolTip(
+            _("Diameters of the tools, separated by comma.\n"
+              "The value of the diameter has to use the dot decimals separator.\n"
+              "Valid values: 0.3, 1.0")
+        )
+        self.cnctooldia_entry = FCEntry()
+
+        grid0.addWidget(tdlabel, 0, 0)
+        grid0.addWidget(self.cnctooldia_entry, 0, 1)
+
+        # Cut Z
+        cutzlabel = FCLabel('%s:' % _('Cut Z'))
+        cutzlabel.setToolTip(
+            _("Cutting depth (negative)\n"
+              "below the copper surface.")
+        )
+        self.cutz_entry = FCDoubleSpinner()
+        self.cutz_entry.set_range(-10000.0000, 10000.0000)
+
+        self.cutz_entry.set_precision(self.decimals)
+        self.cutz_entry.setSingleStep(0.1)
+        self.cutz_entry.setWrapping(True)
+
+        grid0.addWidget(cutzlabel, 1, 0)
+        grid0.addWidget(self.cutz_entry, 1, 1)
+
+        # Multidepth CheckBox
+        self.multidepth_cb = FCCheckBox(label=_('Multi-Depth'))
+        self.multidepth_cb.setToolTip(
+            _(
+                "Use multiple passes to limit\n"
+                "the cut depth in each pass. Will\n"
+                "cut multiple times until Cut Z is\n"
+                "reached."
+            )
+        )
+        grid0.addWidget(self.multidepth_cb, 2, 0)
+
+        # Depth/pass
+        dplabel = FCLabel('%s:' % _('Depth/Pass'))
+        dplabel.setToolTip(
+            _("The depth to cut on each pass,\n"
+              "when multidepth is enabled.\n"
+              "It has positive value although\n"
+              "it is a fraction from the depth\n"
+              "which has negative value.")
+        )
+
+        self.depthperpass_entry = FCDoubleSpinner()
+        self.depthperpass_entry.set_range(0, 99999)
+        self.depthperpass_entry.set_precision(self.decimals)
+        self.depthperpass_entry.setSingleStep(0.1)
+        self.depthperpass_entry.setWrapping(True)
+
+        grid0.addWidget(dplabel, 4, 0)
+        grid0.addWidget(self.depthperpass_entry, 4, 1)
+
+        self.ois_multidepth = OptionalInputSection(self.multidepth_cb, [self.depthperpass_entry])
+
+        # Travel Z
+        travelzlabel = FCLabel('%s:' % _('Travel Z'))
+        travelzlabel.setToolTip(
+            _("Height of the tool when\n"
+              "moving without cutting.")
+        )
+        self.travelz_entry = FCDoubleSpinner()
+        self.travelz_entry.set_range(-10000.0000, 10000.0000)
+
+        self.travelz_entry.set_precision(self.decimals)
+        self.travelz_entry.setSingleStep(0.1)
+        self.travelz_entry.setWrapping(True)
+
+        grid0.addWidget(travelzlabel, 6, 0)
+        grid0.addWidget(self.travelz_entry, 6, 1)
+
+        # Tool change:
+        self.toolchange_cb = FCCheckBox('%s' % _("Tool change"))
+        self.toolchange_cb.setToolTip(
+            _(
+                "Include tool-change sequence\n"
+                "in the Machine Code (Pause for tool change)."
+            )
+        )
+        grid0.addWidget(self.toolchange_cb, 8, 0, 1, 2)
+
+        # Toolchange Z
+        toolchangezlabel = FCLabel('%s:' % _('Toolchange Z'))
+        toolchangezlabel.setToolTip(
+            _(
+                "Z-axis position (height) for\n"
+                "tool change."
+            )
+        )
+        self.toolchangez_entry = FCDoubleSpinner()
+        self.toolchangez_entry.set_range(-10000.0000, 10000.0000)
+
+        self.toolchangez_entry.set_precision(self.decimals)
+        self.toolchangez_entry.setSingleStep(0.1)
+        self.toolchangez_entry.setWrapping(True)
+
+        grid0.addWidget(toolchangezlabel, 10, 0)
+        grid0.addWidget(self.toolchangez_entry, 10, 1)
+
+        # End move Z
+        endz_label = FCLabel('%s:' % _('End move Z'))
+        endz_label.setToolTip(
+            _("Height of the tool after\n"
+              "the last move at the end of the job.")
+        )
+        self.endz_entry = FCDoubleSpinner()
+        self.endz_entry.set_range(-10000.0000, 10000.0000)
+
+        self.endz_entry.set_precision(self.decimals)
+        self.endz_entry.setSingleStep(0.1)
+        self.endz_entry.setWrapping(True)
+
+        grid0.addWidget(endz_label, 12, 0)
+        grid0.addWidget(self.endz_entry, 12, 1)
+
+        # End Move X,Y
+        endmove_xy_label = FCLabel('%s:' % _('End move X,Y'))
+        endmove_xy_label.setToolTip(
+            _("End move X,Y position. In format (x,y).\n"
+              "If no value is entered then there is no move\n"
+              "on X,Y plane at the end of the job.")
+        )
+        self.endxy_entry = NumericalEvalTupleEntry(border_color='#0069A9')
+
+        grid0.addWidget(endmove_xy_label, 14, 0)
+        grid0.addWidget(self.endxy_entry, 14, 1)
+
+        # Feedrate X-Y
+        frlabel = FCLabel('%s:' % _('Feedrate X-Y'))
+        frlabel.setToolTip(
+            _("Cutting speed in the XY\n"
+              "plane in units per minute")
+        )
+        self.cncfeedrate_entry = FCDoubleSpinner()
+        self.cncfeedrate_entry.set_range(0, 910000.0000)
+        self.cncfeedrate_entry.set_precision(self.decimals)
+        self.cncfeedrate_entry.setSingleStep(0.1)
+        self.cncfeedrate_entry.setWrapping(True)
+
+        grid0.addWidget(frlabel, 16, 0)
+        grid0.addWidget(self.cncfeedrate_entry, 16, 1)
+
+        # Feedrate Z (Plunge)
+        frz_label = FCLabel('%s:' % _('Feedrate Z'))
+        frz_label.setToolTip(
+            _("Cutting speed in the XY\n"
+              "plane in units per minute.\n"
+              "It is called also Plunge.")
+        )
+        self.feedrate_z_entry = FCDoubleSpinner()
+        self.feedrate_z_entry.set_range(0, 910000.0000)
+        self.feedrate_z_entry.set_precision(self.decimals)
+        self.feedrate_z_entry.setSingleStep(0.1)
+        self.feedrate_z_entry.setWrapping(True)
+
+        grid0.addWidget(frz_label, 18, 0)
+        grid0.addWidget(self.feedrate_z_entry, 18, 1)
+
+        # Spindle Speed
+        spdlabel = FCLabel('%s:' % _('Spindle speed'))
+        spdlabel.setToolTip(
+            _(
+                "Speed of the spindle in RPM (optional).\n"
+                "If LASER preprocessor is used,\n"
+                "this value is the power of laser."
+            )
+        )
+        self.cncspindlespeed_entry = FCSpinner()
+        self.cncspindlespeed_entry.set_range(0, 1000000)
+        self.cncspindlespeed_entry.set_step(100)
+
+        grid0.addWidget(spdlabel, 20, 0)
+        grid0.addWidget(self.cncspindlespeed_entry, 20, 1)
+
+        # Dwell
+        self.dwell_cb = FCCheckBox(label='%s' % _('Enable Dwell'))
+        self.dwell_cb.setToolTip(
+            _("Pause to allow the spindle to reach its\n"
+              "speed before cutting.")
+        )
+        dwelltime = FCLabel('%s:' % _('Duration'))
+        dwelltime.setToolTip(
+            _("Number of time units for spindle to dwell.")
+        )
+        self.dwelltime_entry = FCDoubleSpinner()
+        self.dwelltime_entry.set_range(0, 99999)
+        self.dwelltime_entry.set_precision(self.decimals)
+        self.dwelltime_entry.setSingleStep(0.1)
+        self.dwelltime_entry.setWrapping(True)
+
+        grid0.addWidget(self.dwell_cb, 22, 0)
+        grid0.addWidget(dwelltime, 24, 0)
+        grid0.addWidget(self.dwelltime_entry, 24, 1)
+
+        self.ois_dwell = OptionalInputSection(self.dwell_cb, [self.dwelltime_entry])
+
+        # preprocessor selection
+        pp_label = FCLabel('%s:' % _("Preprocessor"))
+        pp_label.setToolTip(
+            _("The Preprocessor file that dictates\n"
+              "the Machine Code (like GCode, RML, HPGL) output.")
+        )
+        self.pp_geometry_name_cb = FCComboBox()
+        self.pp_geometry_name_cb.setFocusPolicy(Qt.StrongFocus)
+        self.pp_geometry_name_cb.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+
+        grid0.addWidget(pp_label, 26, 0)
+        grid0.addWidget(self.pp_geometry_name_cb, 26, 1)
+
+        separator_line = QtWidgets.QFrame()
+        separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+        separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        grid0.addWidget(separator_line, 28, 0, 1, 2)
+
+        # Toolchange X,Y
+        toolchange_xy_label = FCLabel('%s:' % _('Toolchange X-Y'))
+        toolchange_xy_label.setToolTip(
+            _("Toolchange X,Y position.")
+        )
+        self.toolchangexy_entry = NumericalEvalTupleEntry(border_color='#0069A9')
+
+        grid0.addWidget(toolchange_xy_label, 30, 0)
+        grid0.addWidget(self.toolchangexy_entry, 30, 1)
+
+        # Start move Z
+        startzlabel = FCLabel('%s:' % _('Start Z'))
+        startzlabel.setToolTip(
+            _("Height of the tool just after starting the work.\n"
+              "Delete the value if you don't need this feature.")
+        )
+        self.gstartz_entry = NumericalEvalEntry(border_color='#0069A9')
+
+        grid0.addWidget(startzlabel, 32, 0)
+        grid0.addWidget(self.gstartz_entry, 32, 1)
+
+        # Feedrate rapids
+        fr_rapid_label = FCLabel('%s:' % _('Feedrate Rapids'))
+        fr_rapid_label.setToolTip(
+            _("Cutting speed in the XY plane\n"
+              "(in units per minute).\n"
+              "This is for the rapid move G00.\n"
+              "It is useful only for Marlin,\n"
+              "ignore for any other cases.")
+        )
+        self.feedrate_rapid_entry = FCDoubleSpinner()
+        self.feedrate_rapid_entry.set_range(0, 910000.0000)
+        self.feedrate_rapid_entry.set_precision(self.decimals)
+        self.feedrate_rapid_entry.setSingleStep(0.1)
+        self.feedrate_rapid_entry.setWrapping(True)
+
+        grid0.addWidget(fr_rapid_label, 34, 0)
+        grid0.addWidget(self.feedrate_rapid_entry, 34, 1)
+
+        # End move extra cut
+        self.extracut_cb = FCCheckBox('%s' % _('Re-cut'))
+        self.extracut_cb.setToolTip(
+            _("In order to remove possible\n"
+              "copper leftovers where first cut\n"
+              "meet with last cut, we generate an\n"
+              "extended cut over the first cut section.")
+        )
+
+        self.e_cut_entry = FCDoubleSpinner()
+        self.e_cut_entry.set_range(0, 99999)
+        self.e_cut_entry.set_precision(self.decimals)
+        self.e_cut_entry.setSingleStep(0.1)
+        self.e_cut_entry.setWrapping(True)
+        self.e_cut_entry.setToolTip(
+            _("In order to remove possible\n"
+              "copper leftovers where first cut\n"
+              "meet with last cut, we generate an\n"
+              "extended cut over the first cut section.")
+        )
+        grid0.addWidget(self.extracut_cb, 36, 0)
+        grid0.addWidget(self.e_cut_entry, 36, 1)
+
+        # Probe depth
+        self.pdepth_label = FCLabel('%s:' % _("Probe Z depth"))
+        self.pdepth_label.setToolTip(
+            _("The maximum depth that the probe is allowed\n"
+              "to probe. Negative value, in current units.")
+        )
+        self.pdepth_entry = FCDoubleSpinner()
+        self.pdepth_entry.set_range(-99999, 0.0000)
+        self.pdepth_entry.set_precision(self.decimals)
+        self.pdepth_entry.setSingleStep(0.1)
+        self.pdepth_entry.setWrapping(True)
+
+        grid0.addWidget(self.pdepth_label, 38, 0)
+        grid0.addWidget(self.pdepth_entry, 38, 1)
+
+        # Probe feedrate
+        self.feedrate_probe_label = FCLabel('%s:' % _("Feedrate Probe"))
+        self.feedrate_probe_label.setToolTip(
+            _("The feedrate used while the probe is probing.")
+        )
+        self.feedrate_probe_entry = FCDoubleSpinner()
+        self.feedrate_probe_entry.set_range(0, 910000.0000)
+        self.feedrate_probe_entry.set_precision(self.decimals)
+        self.feedrate_probe_entry.setSingleStep(0.1)
+        self.feedrate_probe_entry.setWrapping(True)
+
+        grid0.addWidget(self.feedrate_probe_label, 40, 0)
+        grid0.addWidget(self.feedrate_probe_entry, 40, 1)
+
+        # Spindle direction
+        spindle_dir_label = FCLabel('%s:' % _('Spindle direction'))
+        spindle_dir_label.setToolTip(
+            _("This sets the direction that the spindle is rotating.\n"
+              "It can be either:\n"
+              "- CW = clockwise or\n"
+              "- CCW = counter clockwise")
+        )
+
+        self.spindledir_radio = RadioSet([{'label': _('CW'), 'value': 'CW'},
+                                          {'label': _('CCW'), 'value': 'CCW'}])
+        grid0.addWidget(spindle_dir_label, 42, 0)
+        grid0.addWidget(self.spindledir_radio, 42, 1)
+
+        # Fast Move from Z Toolchange
+        self.fplunge_cb = FCCheckBox('%s' % _('Fast Plunge'))
+        self.fplunge_cb.setToolTip(
+            _("By checking this, the vertical move from\n"
+              "Z_Toolchange to Z_move is done with G0,\n"
+              "meaning the fastest speed available.\n"
+              "WARNING: the move is done at Toolchange X,Y coords.")
+        )
+        grid0.addWidget(self.fplunge_cb, 44, 0, 1, 2)
+
+        separator_line = QtWidgets.QFrame()
+        separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+        separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        grid0.addWidget(separator_line, 50, 0, 1, 2)
+
+        # -----------------------------
+        # --- Area Exclusion ----------
+        # -----------------------------
+        self.area_exc_label = FCLabel('<b>%s:</b>' % _('Area Exclusion'))
+        self.area_exc_label.setToolTip(
+            _("Area exclusion parameters.")
+        )
+        grid0.addWidget(self.area_exc_label, 52, 0, 1, 2)
+
+        # Exclusion Area CB
+        self.exclusion_cb = FCCheckBox('%s' % _("Exclusion areas"))
+        self.exclusion_cb.setToolTip(
+            _(
+                "Include exclusion areas.\n"
+                "In those areas the travel of the tools\n"
+                "is forbidden."
+            )
+        )
+        grid0.addWidget(self.exclusion_cb, 54, 0, 1, 2)
+
+        # Area Selection shape
+        self.area_shape_label = FCLabel('%s:' % _("Shape"))
+        self.area_shape_label.setToolTip(
+            _("The kind of selection shape used for area selection.")
+        )
+
+        self.area_shape_radio = RadioSet([{'label': _("Square"), 'value': 'square'},
+                                          {'label': _("Polygon"), 'value': 'polygon'}])
+
+        grid0.addWidget(self.area_shape_label, 56, 0)
+        grid0.addWidget(self.area_shape_radio, 56, 1)
+
+        # Chose Strategy
+        self.strategy_label = FCLabel('%s:' % _("Strategy"))
+        self.strategy_label.setToolTip(_("The strategy followed when encountering an exclusion area.\n"
+                                         "Can be:\n"
+                                         "- Over -> when encountering the area, the tool will go to a set height\n"
+                                         "- Around -> will avoid the exclusion area by going around the area"))
+        self.strategy_radio = RadioSet([{'label': _('Over'), 'value': 'over'},
+                                        {'label': _('Around'), 'value': 'around'}])
+
+        grid0.addWidget(self.strategy_label, 58, 0)
+        grid0.addWidget(self.strategy_radio, 58, 1)
+
+        # Over Z
+        self.over_z_label = FCLabel('%s:' % _("Over Z"))
+        self.over_z_label.setToolTip(_("The height Z to which the tool will rise in order to avoid\n"
+                                       "an interdiction area."))
+        self.over_z_entry = FCDoubleSpinner()
+        self.over_z_entry.set_range(-10000.000, 10000.0000)
+        self.over_z_entry.set_precision(self.decimals)
+
+        grid0.addWidget(self.over_z_label, 60, 0)
+        grid0.addWidget(self.over_z_entry, 60, 1)
+
+        separator_line = QtWidgets.QFrame()
+        separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+        separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        grid0.addWidget(separator_line, 62, 0, 1, 2)
+
+        # -----------------------------
+        # --- Area POLISH ----------
+        # -----------------------------
+        # Add Polish
+        self.polish_cb = FCCheckBox(label=_('Add Polish'))
+        self.polish_cb.setToolTip(_(
+            "Will add a Paint section at the end of the GCode.\n"
+            "A metallic brush will clean the material after milling."))
+        grid0.addWidget(self.polish_cb, 64, 0, 1, 2)
+
+        # Polish Tool Diameter
+        self.polish_dia_lbl = FCLabel('%s:' % _('Tool Dia'))
+        self.polish_dia_lbl.setToolTip(
+            _("Diameter for the polishing tool.")
+        )
+        self.polish_dia_entry = FCDoubleSpinner()
+        self.polish_dia_entry.set_precision(self.decimals)
+        self.polish_dia_entry.set_range(-10000.000, 10000.0000)
+
+        grid0.addWidget(self.polish_dia_lbl, 66, 0)
+        grid0.addWidget(self.polish_dia_entry, 66, 1)
+
+        # Polish Travel Z
+        self.polish_travelz_lbl = FCLabel('%s:' % _('Travel Z'))
+        self.polish_travelz_lbl.setToolTip(
+            _("Height of the tool when\n"
+              "moving without cutting.")
+        )
+        self.polish_travelz_entry = FCDoubleSpinner()
+        self.polish_travelz_entry.set_precision(self.decimals)
+        self.polish_travelz_entry.set_range(0.00000, 10000.00000)
+        self.polish_travelz_entry.setSingleStep(0.1)
+
+        grid0.addWidget(self.polish_travelz_lbl, 68, 0)
+        grid0.addWidget(self.polish_travelz_entry, 68, 1)
+
+        # Polish Pressure
+        self.polish_pressure_lbl = FCLabel('%s:' % _('Pressure'))
+        self.polish_pressure_lbl.setToolTip(
+            _("Negative value. The higher the absolute value\n"
+              "the stronger the pressure of the brush on the material.")
+        )
+        self.polish_pressure_entry = FCDoubleSpinner()
+        self.polish_pressure_entry.set_precision(self.decimals)
+        self.polish_pressure_entry.set_range(-10000.0000, 10000.0000)
+
+        grid0.addWidget(self.polish_pressure_lbl, 70, 0)
+        grid0.addWidget(self.polish_pressure_entry, 70, 1)
+
+        # Polish Margin
+        self.polish_margin_lbl = FCLabel('%s:' % _('Margin'))
+        self.polish_margin_lbl.setToolTip(
+            _("Bounding box margin.")
+        )
+        self.polish_margin_entry = FCDoubleSpinner()
+        self.polish_margin_entry.set_precision(self.decimals)
+        self.polish_margin_entry.set_range(-10000.0000, 10000.0000)
+
+        grid0.addWidget(self.polish_margin_lbl, 72, 0)
+        grid0.addWidget(self.polish_margin_entry, 72, 1)
+
+        # Polish Overlap
+        self.polish_over_lbl = FCLabel('%s:' % _('Overlap'))
+        self.polish_over_lbl.setToolTip(
+            _("How much (percentage) of the tool width to overlap each tool pass.")
+        )
+        self.polish_over_entry = FCDoubleSpinner(suffix='%')
+        self.polish_over_entry.set_precision(self.decimals)
+        self.polish_over_entry.setWrapping(True)
+        self.polish_over_entry.set_range(0.0000, 99.9999)
+        self.polish_over_entry.setSingleStep(0.1)
+
+        grid0.addWidget(self.polish_over_lbl, 74, 0)
+        grid0.addWidget(self.polish_over_entry, 74, 1)
+
+        # Polish Method
+        self.polish_method_lbl = FCLabel('%s:' % _('Method'))
+        self.polish_method_lbl.setToolTip(
+            _("Algorithm for polishing:\n"
+              "- Standard: Fixed step inwards.\n"
+              "- Seed-based: Outwards from seed.\n"
+              "- Line-based: Parallel lines.")
+        )
+
+        self.polish_method_combo = FCComboBox2()
+        self.polish_method_combo.addItems(
+            [_("Standard"), _("Seed"), _("Lines")]
+        )
+
+        grid0.addWidget(self.polish_method_lbl, 76, 0)
+        grid0.addWidget(self.polish_method_combo, 76, 1)
+
+        self.layout.addStretch()
--- a/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsNCCPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "NCC Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "NCC Plugin", parent=parent)
        super(ToolsNCCPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("NCC Tool Options")))
+        self.setTitle(str(_("NCC Plugin")))
        self.decimals = decimals

        # ## Clear non-copper regions
--- a/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsPaintPrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Paint Area Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Paint Area Plugin", parent=parent)
        super(ToolsPaintPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Paint Tool Options")))
+        self.setTitle(str(_("Paint Plugin")))
        self.decimals = decimals

        # ------------------------------
--- a/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
@@ -14,10 +14,10 @@ if '_' not in builtins.__dict__:

 class ToolsPanelizePrefGroupUI(OptionsGroupUI):
    def __init__(self, decimals=4, parent=None):
-        # OptionsGroupUI.__init__(self, "Cutout Tool Options", parent=parent)
+        # OptionsGroupUI.__init__(self, "Cutout Plugin", parent=parent)
        super(ToolsPanelizePrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Panelize Tool Options")))
+        self.setTitle(str(_("Panelize Plugin")))
        self.decimals = decimals

        # ## Board cuttout
--- a/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
@@ -17,7 +17,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):

        super(ToolsSolderpastePrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("SolderPaste Tool Options")))
+        self.setTitle(str(_("SolderPaste Plugin")))
        self.decimals = decimals

        # ## Solder Paste Dispensing
--- a/appGUI/preferences/tools/ToolsSubPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsSubPrefGroupUI.py
@@ -14,7 +14,7 @@ class ToolsSubPrefGroupUI(OptionsGroupUI):

        super(ToolsSubPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Substractor Tool Options")))
+        self.setTitle(str(_("Substractor Plugin")))
        self.decimals = decimals

        # ## Subtractor Tool Parameters
--- a/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
+++ b/appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
@@ -17,7 +17,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):

        super(ToolsTransformPrefGroupUI, self).__init__(self, parent=parent)

-        self.setTitle(str(_("Transform Tool Options")))
+        self.setTitle(str(_("Transform Plugin")))
        self.decimals = decimals

        # ## Transformations