From 315e18c78ae9aa1eda1d4112ea3bf491fb9a78ad Mon Sep 17 00:00:00 2001
From: sliptonic <shopinthewoods@gmail.com>
Date: Sat, 19 Sep 2020 10:03:09 -0500
Subject: [PATCH] Path: Vcarve fixes formatting fixes remove reference to old
 ToolType

---
 src/Mod/Path/Gui/Resources/Path.qrc           |  4 +--
 .../Path/Gui/Resources/icons/Path-Vcarve.svg  | 28 ++++++++++++++-----
 src/Mod/Path/PathScripts/PathVcarve.py        |  6 ----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc
index 44b066cd0c..2e0873a2be 100644
--- a/src/Mod/Path/Gui/Resources/Path.qrc
+++ b/src/Mod/Path/Gui/Resources/Path.qrc
@@ -66,7 +66,7 @@
         <file>icons/Path-ToolController.svg</file>
         <file>icons/Path-Toolpath.svg</file>
         <file>icons/Path-ToolTable.svg</file>
-	<file>icons/Path-Vcarve.svg</file>
+        <file>icons/Path-Vcarve.svg</file>
         <file>icons/Path-Waterline.svg</file>
         <file>icons/arrow-ccw.svg</file>
         <file>icons/arrow-cw.svg</file>
@@ -112,7 +112,7 @@
         <file>panels/PageOpSlotEdit.ui</file>
         <file>panels/PageOpSurfaceEdit.ui</file>
         <file>panels/PageOpWaterlineEdit.ui</file>
-	<file>panels/PageOpVcarveEdit.ui</file>
+        <file>panels/PageOpVcarveEdit.ui</file>
         <file>panels/PathEdit.ui</file>
         <file>panels/PointEdit.ui</file>
         <file>panels/SetupGlobal.ui</file>
diff --git a/src/Mod/Path/Gui/Resources/icons/Path-Vcarve.svg b/src/Mod/Path/Gui/Resources/icons/Path-Vcarve.svg
index 0cf0716a94..87788da135 100644
--- a/src/Mod/Path/Gui/Resources/icons/Path-Vcarve.svg
+++ b/src/Mod/Path/Gui/Resources/icons/Path-Vcarve.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="Path-Vcarve.svg">
   <defs
      id="defs2818">
@@ -566,10 +566,10 @@
      inkscape:snap-bbox-midpoints="true"
      inkscape:object-paths="true"
      inkscape:object-nodes="true"
-     inkscape:window-width="1165"
-     inkscape:window-height="1047"
-     inkscape:window-x="1829"
-     inkscape:window-y="1050"
+     inkscape:window-width="1076"
+     inkscape:window-height="605"
+     inkscape:window-x="0"
+     inkscape:window-y="1287"
      inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -595,7 +595,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:title>Path-Engrave</dc:title>
         <dc:date>2016-02-24</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
@@ -610,13 +610,27 @@
             <dc:title>FreeCAD LGPL2+</dc:title>
           </cc:Agent>
         </dc:rights>
-        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/4.0/">https://www.gnu.org/copyleft/lesser.html</cc:license>
         <dc:contributor>
           <cc:Agent>
             <dc:title>[agryson] Alexander Gryson</dc:title>
           </cc:Agent>
         </dc:contributor>
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
diff --git a/src/Mod/Path/PathScripts/PathVcarve.py b/src/Mod/Path/PathScripts/PathVcarve.py
index e4f30fe78c..29e81523ed 100644
--- a/src/Mod/Path/PathScripts/PathVcarve.py
+++ b/src/Mod/Path/PathScripts/PathVcarve.py
@@ -230,12 +230,6 @@ class ObjectVcarve(PathEngraveBase.ObjectOp):
         '''opExecute(obj) ... process engraving operation'''
         PathLog.track()
 
-        if obj.ToolController.Tool.ToolType != 'Engraver':
-            FreeCAD.Console.PrintError(
-                translate("Path_Vcarve",
-                    "This operation requires an engraver tool.") + "\n")
-            return
-
         if obj.ToolController.Tool.CuttingEdgeAngle >= 180.0:
             FreeCAD.Console.PrintError(
                 translate("Path_Vcarve",