From 900059bc99620db052bac941d656146a71893f0b Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Tue, 5 May 2020 13:45:48 -0500
Subject: [PATCH] Path: Integrate unified `Profile` operation into PathWB

Remove Contour, Profile Faces, and Profile Edges icons from PathWB GUI.  Files are still fully in tact and available.
---
 src/Mod/Path/CMakeLists.txt                |  2 ++
 src/Mod/Path/InitGui.py                    |  3 ++-
 src/Mod/Path/PathScripts/PathGuiInit.py    |  7 ++++---
 src/Mod/Path/PathScripts/PathProfileGui.py | 14 +++++++-------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt
index 78415e1e32..73958e64d0 100644
--- a/src/Mod/Path/CMakeLists.txt
+++ b/src/Mod/Path/CMakeLists.txt
@@ -87,6 +87,7 @@ SET(PathScripts_SRCS
     PathScripts/PathPreferencesPathJob.py
 	PathScripts/PathProbe.py
 	PathScripts/PathProbeGui.py
+    PathScripts/PathProfile.py
     PathScripts/PathProfileBase.py
     PathScripts/PathProfileBaseGui.py
     PathScripts/PathProfileContour.py
@@ -95,6 +96,7 @@ SET(PathScripts_SRCS
     PathScripts/PathProfileEdgesGui.py
     PathScripts/PathProfileFaces.py
     PathScripts/PathProfileFacesGui.py
+    PathScripts/PathProfileGui.py
     PathScripts/PathSanity.py
     PathScripts/PathSelection.py
     PathScripts/PathSetupSheet.py
diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py
index 6fabab05f0..4546a78136 100644
--- a/src/Mod/Path/InitGui.py
+++ b/src/Mod/Path/InitGui.py
@@ -90,7 +90,8 @@ class PathWorkbench (Workbench):
         projcmdlist = ["Path_Job", "Path_Post"]
         toolcmdlist = ["Path_Inspect", "Path_Simulator", "Path_ToolLibraryEdit", "Path_SelectLoop", "Path_OpActiveToggle"]
         prepcmdlist = ["Path_Fixture", "Path_Comment", "Path_Stop", "Path_Custom", "Path_Probe"]
-        twodopcmdlist = ["Path_Contour", "Path_Profile_Faces", "Path_Profile_Edges", "Path_Pocket_Shape", "Path_Drilling", "Path_MillFace", "Path_Helix", "Path_Adaptive"]
+        # twodopcmdlist = ["Path_Profile", "Path_Contour", "Path_Profile_Faces", "Path_Profile_Edges", "Path_Pocket_Shape", "Path_Drilling", "Path_MillFace", "Path_Helix", "Path_Adaptive"]
+        twodopcmdlist = ["Path_Profile", "Path_Pocket_Shape", "Path_Drilling", "Path_MillFace", "Path_Helix", "Path_Adaptive"]
         threedopcmdlist = ["Path_Pocket_3D"]
         engravecmdlist = ["Path_Engrave", "Path_Deburr"]
         modcmdlist = ["Path_OperationCopy", "Path_Array", "Path_SimpleCopy"]
diff --git a/src/Mod/Path/PathScripts/PathGuiInit.py b/src/Mod/Path/PathScripts/PathGuiInit.py
index 52116e608b..21aadba1d5 100644
--- a/src/Mod/Path/PathScripts/PathGuiInit.py
+++ b/src/Mod/Path/PathScripts/PathGuiInit.py
@@ -64,9 +64,10 @@ def Startup():
         from PathScripts import PathPocketShapeGui
         from PathScripts import PathPost
         from PathScripts import PathProbeGui
-        from PathScripts import PathProfileContourGui
-        from PathScripts import PathProfileEdgesGui
-        from PathScripts import PathProfileFacesGui
+        # from PathScripts import PathProfileContourGui
+        # from PathScripts import PathProfileEdgesGui
+        # from PathScripts import PathProfileFacesGui
+        from PathScripts import PathProfileGui
         from PathScripts import PathSanity
         from PathScripts import PathSetupSheetGui
         from PathScripts import PathSimpleCopy
diff --git a/src/Mod/Path/PathScripts/PathProfileGui.py b/src/Mod/Path/PathScripts/PathProfileGui.py
index 5ddd8e872b..756ff2bd30 100644
--- a/src/Mod/Path/PathScripts/PathProfileGui.py
+++ b/src/Mod/Path/PathScripts/PathProfileGui.py
@@ -26,7 +26,7 @@ import FreeCAD
 import FreeCADGui
 import PathScripts.PathGui as PathGui
 import PathScripts.PathOpGui as PathOpGui
-import PathScripts.PathProfileFaces as PathProfileFaces
+import PathScripts.PathProfile as PathProfile
 
 from PySide import QtCore
 
@@ -162,12 +162,12 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 # Eclass
 
 
-Command = PathOpGui.SetupOperation('Profile Faces',
-        PathProfileFaces.Create,
+Command = PathOpGui.SetupOperation('Profile',
+        PathProfile.Create,
         TaskPanelOpPage,
-        'Path-Profile-Face',
-        QtCore.QT_TRANSLATE_NOOP("PathProfile", "Face Profile"),
-        QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile based on face or faces"),
-        PathProfileFaces.SetupProperties)
+        'Path-Contour',
+        QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile"),
+        QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile entire model, selected face(s) or selected edge(s)"),
+        PathProfile.SetupProperties)
 
 FreeCAD.Console.PrintLog("Loading PathProfileFacesGui... done\n")