From 202473b287609d292e3b1231c2f55d9c3750aed0 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Mon, 1 Apr 2024 10:09:54 -0500 Subject: [PATCH 1/2] fixes #13207 --- src/Mod/CAM/Gui/Command.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/CAM/Gui/Command.cpp b/src/Mod/CAM/Gui/Command.cpp index d31526b160..fa5deb9a6b 100644 --- a/src/Mod/CAM/Gui/Command.cpp +++ b/src/Mod/CAM/Gui/Command.cpp @@ -43,7 +43,7 @@ CmdPathArea::CmdPathArea() :Command("CAM_Area") { sAppModule = "Path"; - sGroup = QT_TR_NOOP("Path"); + sGroup = QT_TR_NOOP("CAM"); sMenuText = QT_TR_NOOP("Area"); sToolTipText = QT_TR_NOOP("Creates a feature area from selected objects"); sWhatsThis = "CAM_Area"; @@ -125,7 +125,7 @@ CmdPathAreaWorkplane::CmdPathAreaWorkplane() :Command("CAM_Area_Workplane") { sAppModule = "Path"; - sGroup = QT_TR_NOOP("Path"); + sGroup = QT_TR_NOOP("CAM"); sMenuText = QT_TR_NOOP("Area workplane"); sToolTipText = QT_TR_NOOP("Select a workplane for a FeatureArea"); sWhatsThis = "CAM_Area_Workplane"; @@ -215,7 +215,7 @@ CmdPathCompound::CmdPathCompound() :Command("CAM_Compound") { sAppModule = "Path"; - sGroup = QT_TR_NOOP("Path"); + sGroup = QT_TR_NOOP("CAM"); sMenuText = QT_TR_NOOP("Compound"); sToolTipText = QT_TR_NOOP("Creates a compound from selected toolpaths"); sWhatsThis = "CAM_Compound"; @@ -267,7 +267,7 @@ CmdPathShape::CmdPathShape() :Command("CAM_Shape") { sAppModule = "Path"; - sGroup = QT_TR_NOOP("Path"); + sGroup = QT_TR_NOOP("CAM"); sMenuText = QT_TR_NOOP("From Shape"); sToolTipText = QT_TR_NOOP("Creates a toolpath from a selected shape"); sWhatsThis = "CAM_Shape"; From 6f3cd260aeb5c42925e41c5b919a3fc9771bdaeb Mon Sep 17 00:00:00 2001 From: sliptonic Date: Mon, 1 Apr 2024 17:03:57 -0500 Subject: [PATCH 2/2] fixes #13206 --- src/Mod/CAM/Init.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/Mod/CAM/Init.py b/src/Mod/CAM/Init.py index 28d09d051d..b6ed99fad8 100644 --- a/src/Mod/CAM/Init.py +++ b/src/Mod/CAM/Init.py @@ -21,6 +21,23 @@ # * * # *************************************************************************** +# This code handles parameter groups following the CAM workbench renaming +# (PATH -> CAM). This code can be removed after the 1.0 release. + + +ParGrp = App.ParamGet("System parameter:Modules").GetGroup("Path") +if ParGrp.HasGroup("CAM"): + pass +elif ParGrp.HasGroup("Path"): + ParGrp.RenameGroup("Path", "CAM") + +ParGrp = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") +parent = ParGrp.Parent() +if parent.HasGroup("CAM"): + pass +elif parent.HasGroup("Path"): + result = parent.RenameGroup("Path", "CAM") + # Get the Parameter Group of this module ParGrp = App.ParamGet("System parameter:Modules").GetGroup("Path")